diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
index da23a8911..24d5040c7 100644
--- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
+++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
@@ -454,7 +454,7 @@
{{$t('overall.preview')}}
+
logsLogsArrAdd
{{configsCopyValue}}
@@ -784,6 +784,18 @@ export default {
pipeline.labels = this.labelsToJson(pipeline.labels)
}
})
+ if (item.type === 'file') {
+ delete item.unit
+ delete item.appName
+ delete item.listenAddress
+ } else if (item.type === 'journal') {
+ delete item.fileName
+ delete item.appName
+ delete item.listenAddress
+ } else if (item.type === 'syslog') {
+ delete item.fileName
+ delete item.unit
+ }
})
params.configs = JSON.stringify(params.configs)
this.$nextTick(() => {
@@ -883,6 +895,9 @@ export default {
this.editEndpoint.configs[1].config.push({
type: 'file',
fileName: '',
+ unit: '',
+ appName: '',
+ listenAddress: '',
labels: '',
labelModule: [{ key: '', value: '' }],
pipeline: []
@@ -894,23 +909,10 @@ export default {
}
},
logsBasicTypeChange (i) {
- const type = this.editEndpoint.configs[1].config[i].type
- if (type === 'file') {
- this.editEndpoint.configs[1].config[i].fileName = ''
- delete this.editEndpoint.configs[1].config[i].unit
- delete this.editEndpoint.configs[1].config[i].appName
- delete this.editEndpoint.configs[1].config[i].listenAddress
- } else if (type === 'journal') {
- delete this.editEndpoint.configs[1].config[i].fileName
- this.editEndpoint.configs[1].config[i].unit = ''
- delete this.editEndpoint.configs[1].config[i].appName
- delete this.editEndpoint.configs[1].config[i].listenAddress
- } else if (type === 'syslog') {
- delete this.editEndpoint.configs[1].config[i].fileName
- delete this.editEndpoint.configs[1].config[i].unit
- this.editEndpoint.configs[1].config[i].appName = ''
- this.editEndpoint.configs[1].config[i].listenAddress = ''
- }
+ this.editEndpoint.configs[1].config[i].fileName = ''
+ this.editEndpoint.configs[1].config[i].unit = ''
+ this.editEndpoint.configs[1].config[i].appName = ''
+ this.editEndpoint.configs[1].config[i].listenAddress = ''
},
/* 获取project列表 */
getProjectList () {
@@ -1243,6 +1245,18 @@ export default {
item.labels = this.labelsToJson(item.labelModule)
delete item.labelModule
}
+ if (item.type === 'file') {
+ delete item.unit
+ delete item.appName
+ delete item.listenAddress
+ } else if (item.type === 'journal') {
+ delete item.fileName
+ delete item.appName
+ delete item.listenAddress
+ } else if (item.type === 'syslog') {
+ delete item.fileName
+ delete item.unit
+ }
})
this.configsCopyValue = JSON.stringify(params, null, 2)
}
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
index 9320de695..a0ce9e60a 100644
--- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue
@@ -762,6 +762,18 @@ export default {
pipeline.labels = this.labelsToJson(pipeline.labels)
}
})
+ if (item.type === 'file') {
+ delete item.unit
+ delete item.appName
+ delete item.listenAddress
+ } else if (item.type === 'journal') {
+ delete item.fileName
+ delete item.appName
+ delete item.listenAddress
+ } else if (item.type === 'syslog') {
+ delete item.fileName
+ delete item.unit
+ }
})
params.configs = JSON.stringify(params.configs)
this.$refs.moduleForm.validate((valid, errorKey) => {
@@ -943,6 +955,9 @@ export default {
this.editModule.configs[1].config.push({
type: 'file',
fileName: '',
+ unit: '',
+ appName: '',
+ listenAddress: '',
labels: '',
labelModule: [{ key: '', value: '' }],
pipeline: []
@@ -954,23 +969,10 @@ export default {
}
},
logsBasicTypeChange (i) {
- const type = this.editModule.configs[1].config[i].type
- if (type === 'file') {
- this.editModule.configs[1].config[i].fileName = ''
- delete this.editModule.configs[1].config[i].unit
- delete this.editModule.configs[1].config[i].appName
- delete this.editModule.configs[1].config[i].listenAddress
- } else if (type === 'journal') {
- delete this.editModule.configs[1].config[i].fileName
- this.editModule.configs[1].config[i].unit = ''
- delete this.editModule.configs[1].config[i].appName
- delete this.editModule.configs[1].config[i].listenAddress
- } else if (type === 'syslog') {
- delete this.editModule.configs[1].config[i].fileName
- delete this.editModule.configs[1].config[i].unit
- this.editModule.configs[1].config[i].appName = ''
- this.editModule.configs[1].config[i].listenAddress = ''
- }
+ this.editModule.configs[1].config[i].fileName = ''
+ this.editModule.configs[1].config[i].unit = ''
+ this.editModule.configs[1].config[i].appName = ''
+ this.editModule.configs[1].config[i].listenAddress = ''
},
copyValue () {
const domUrl = document.createElement('input')
@@ -1179,6 +1181,18 @@ export default {
item.labels = this.labelsToJson(item.labelModule)
delete item.labelModule
}
+ if (item.type === 'file') {
+ delete item.unit
+ delete item.appName
+ delete item.listenAddress
+ } else if (item.type === 'journal') {
+ delete item.fileName
+ delete item.appName
+ delete item.listenAddress
+ } else if (item.type === 'syslog') {
+ delete item.fileName
+ delete item.unit
+ }
})
this.configsCopyValue = JSON.stringify(params, null, 2)
}
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 0b2cb439c..708cdafcb 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -193,6 +193,9 @@ export default {
config: [{
type: 'file',
fileName: '',
+ unit: '',
+ appName: '',
+ listenAddress: '',
labels: '',
labelModule: [{ key: '', value: '' }],
pipeline: []
@@ -356,6 +359,18 @@ export default {
pipeline.labels = labelsArr
}
})
+ if (item.type === 'file') {
+ item.unit = ''
+ item.appName = ''
+ item.listenAddress = ''
+ } else if (item.type === 'journal') {
+ item.fileName = ''
+ item.appName = ''
+ item.listenAddress = ''
+ } else if (item.type === 'syslog') {
+ item.fileName = ''
+ item.unit = ''
+ }
})
this.object.configs = [this.object.configs[0], this.object.configs[1]]
if (JSON.stringify(this.object.configs[0].config.labels) !== '{}' && this.object.configs[0].config.labels) {
@@ -475,7 +490,7 @@ export default {
]
this.titleSearchList.type.children = [
{ key: 'Metrics', value: 'metrics', name: 'Metrics' },
- { key: 'Logs', value: 'logs', name: 'Logs' },
+ { key: 'Logs', value: 'logs', name: 'Logs' }
]
this.titleSearchList.state.show = true
},
diff --git a/nezha-fronted/src/components/page/monitor/module/moduleList.vue b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
index 937dec0e1..4cfb7a9fe 100644
--- a/nezha-fronted/src/components/page/monitor/module/moduleList.vue
+++ b/nezha-fronted/src/components/page/monitor/module/moduleList.vue
@@ -127,6 +127,9 @@ export default {
config: [{
type: 'file',
fileName: '',
+ unit: '',
+ appName: '',
+ listenAddress: '',
labels: '',
labelModule: [{ key: '', value: '' }],
pipeline: []
@@ -218,6 +221,18 @@ export default {
pipeline.labels = labelsArr
}
})
+ if (item.type === 'file') {
+ item.unit = ''
+ item.appName = ''
+ item.listenAddress = ''
+ } else if (item.type === 'journal') {
+ item.fileName = ''
+ item.appName = ''
+ item.listenAddress = ''
+ } else if (item.type === 'syslog') {
+ item.fileName = ''
+ item.unit = ''
+ }
})
if (JSON.stringify(this.object.configs[0].config.labels) !== '{}' && this.object.configs[0].config.labels) {
Object.keys(this.object.configs[0].config.labels).forEach(key => {