gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-2263 fix：当log type = kubernetes时，不显示labels配置项

Browse Source
This commit is contained in:
zyh
2022-10-18 10:18:40 +08:00
parent 3526f41fac
commit 0a3b55215b
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
View File

@@ -526,15 +526,15 @@
</div> </div>
</el-tab-pane> </el-tab-pane>
<!-- Labels --> <!-- Labels -->
<el-tab-pane :label="$t('project.endpoint.labels2')" name="Labels"> <el-tab-pane v-if="item.type!=='kubernetes'" :label="$t('project.endpoint.labels2')" name="Labels">
<div id="module-box-logs-labels" ref="labelBoxScrollbar" style="height: 100%; overflow: auto;"> <div id="module-box-logs-labels" ref="labelBoxScrollbar" style="height: 100%; overflow: auto;">
<div v-for="(item1, i) in item.labelModule" :key="i" class="param-box-row"> <div v-for="(item1, i) in item.labelModule" :key="i" class="param-box-row">
<el-form-item :prop="'configs.1.config.'+ index +'.labelModule.' + i + '.key'" :rules="[{ pattern: /[a-zA-Z_][a-zA-Z0-9_]*/, message: $t('overall.ASCIIKey') ,trigger: 'blur'}]" class="param-box-row-key"> <el-form-item :prop="'configs.1.config.'+ index +'.labelModule.' + i + '.key'" :rules="[{ pattern: /[a-zA-Z_][a-zA-Z0-9_]*/, message: $t('overall.ASCIIKey') ,trigger: 'blur'}]" class="param-box-row-key">
<el-input v-model="item1.key" placeholder="key" size="mini" @input="$forceUpdate()"></el-input> <el-input v-model="item1.key" placeholder="key" size="mini"></el-input>
</el-form-item> </el-form-item>
<span class="param-box-row-eq">=</span> <span class="param-box-row-eq">=</span>
<el-form-item class="param-box-row-value"> <el-form-item class="param-box-row-value">
<el-input v-model="item1.value" placeholder="value" size="mini" @input="$forceUpdate()"></el-input> <el-input v-model="item1.value" placeholder="value" size="mini"></el-input>
</el-form-item> </el-form-item>
<span :id="'moduel-remove-label-'+i" class="param-box-row-symbol" @click="removeLogsLabel(index, i)" :title="$t('overall.delete')"><i class="nz-icon nz-icon-shanchu1" style="color:#666;"></i></span> <span :id="'moduel-remove-label-'+i" class="param-box-row-symbol" @click="removeLogsLabel(index, i)" :title="$t('overall.delete')"><i class="nz-icon nz-icon-shanchu1" style="color:#666;"></i></span>
</div> </div>
@@ -1302,6 +1302,7 @@ export default {
if (val === 'kubernetes') { if (val === 'kubernetes') {
item.apiServer = '127.0.0.1' item.apiServer = '127.0.0.1'
item.role = 'pod' item.role = 'pod'
item.labelModule = [{ key: '', value: '' }] // 当log type = kubernetes时，不显示labels配置项
} else { } else {
item.bearer_token = '' item.bearer_token = ''
item.basic_auth = { item.basic_auth = {
@@ -1612,7 +1613,7 @@ export default {
} }
}) })
this.editEndpoint.configs[1].config.forEach(item => { this.editEndpoint.configs[1].config.forEach(item => {
item.labelModule = [] this.$set(item, 'labelModule', [])
if (JSON.stringify(item.labels) !== '{}' && item.labels) { if (JSON.stringify(item.labels) !== '{}' && item.labels) {
Object.keys(item.labels).forEach(key => { Object.keys(item.labels).forEach(key => {
item.labelModule.push({ key, value: item.labels[key] }) item.labelModule.push({ key, value: item.labels[key] })

2
nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
View File

@@ -529,7 +529,7 @@ export default {
this.$set(item, 'tags', '') this.$set(item, 'tags', '')
}) })
this.object.configs[1].config.forEach(item => { this.object.configs[1].config.forEach(item => {
item.labelModule = [] this.$set(item, 'labelModule', [])
if (JSON.stringify(item.labels) !== '{}' && item.labels) { if (JSON.stringify(item.labels) !== '{}' && item.labels) {
Object.keys(item.labels).forEach(key => { Object.keys(item.labels).forEach(key => {
item.labelModule.push({ key, value: item.labels[key] }) item.labelModule.push({ key, value: item.labels[key] })

2
nezha-fronted/src/components/page/monitor/module/moduleList.vue
View File

@@ -338,7 +338,7 @@ export default {
}) })
this.object.configs[1].config.forEach(item => { this.object.configs[1].config.forEach(item => {
item.labelModule = [] this.$set(item, 'labelModule', [])
if (JSON.stringify(item.labels) !== '{}' && item.labels) { if (JSON.stringify(item.labels) !== '{}' && item.labels) {
Object.keys(item.labels).forEach(key => { Object.keys(item.labels).forEach(key => {
item.labelModule.push({ key, value: item.labels[key] }) item.labelModule.push({ key, value: item.labels[key] })