diff --git a/nezha-fronted/src/components/charts/logs.vue b/nezha-fronted/src/components/charts/logs.vue index 70ff5f11d..03de41c9f 100644 --- a/nezha-fronted/src/components/charts/logs.vue +++ b/nezha-fronted/src/components/charts/logs.vue @@ -483,7 +483,6 @@ export default { }) } }).catch(e => { - console.log(e) this.isError = true this.errorContent = this.$t('terminallog.statusItem.unknownError') // this.$message.error(this.$t('terminallog.statusItem.unknownError')) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue index 1ef390343..d068335b0 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogTab.vue @@ -99,7 +99,7 @@ export default { disabled: false }, { id: 17, - name: this.$t('config.terminallog.status'), + name: this.$t('config.terminallog.stat us'), type: 'terminalStatus', label: 'state', readonly: true, diff --git a/nezha-fronted/src/components/common/mixin/promqlInput.js b/nezha-fronted/src/components/common/mixin/promqlInput.js new file mode 100644 index 000000000..df005758f --- /dev/null +++ b/nezha-fronted/src/components/common/mixin/promqlInput.js @@ -0,0 +1,81 @@ +export default { + data () { + return { + metricOptions: [], + showTemp: true + } + }, + methods: { + queryMetrics () { + this.metricOptions = [] + const metricsList = [] + this.$get('prom/api/v1/label/__name__/values').then(response => { + if (response.status == 'success') { + const metrics = response.data.sort() + const metricMap = new Map() + metrics.forEach((item) => { + let key = '' + if (/^[a-zA-Z]+?_[a-zA-Z]*/.test(item)) { + key = item.split('_')[0] + } else if (/^_\w*/.test(item)) { + key = ' ' + } else { + key = item + } + if (metricMap.get(key)) { + const values = metricMap.get(key) + values.push({ label: item, value: item }) + } else { + const values = [{ label: item, value: item }] + metricMap.set(key, values) + } + // this.metricStore.push({label:item,value:item,insertText:item}) + }) + for (const key of metricMap.keys()) { + const option = { + label: key, + value: key + } + if (metricMap.get(key) && metricMap.get(key).length > 1) { + option.children = [] + this.metricOptions.push({ ...option }) + option.children = metricMap.get(key) + metricsList.push(option) + } else { + this.metricOptions.push(option) + metricsList.push(option) + } + } + this.$store.commit('setMetricsList', metricsList) + if (this.showTemp) { + this.getExprTemp() + } + } + }) + }, + getExprTemp () { + this.$get('/expression/tmpl/gname').then(res => { + this.loading = false + if (res.code === 200) { + res.data.list.forEach(item => { + this.metricOptions.unshift({ + label: item, + value: item, + children: [], + temp: true, + child: false + }) + }) + } + }) + } + }, + watch: { + }, + created () { + this.queryMetrics() + }, + beforeDestroy () { + this.$store.commit('setMetricsList', []) + } +} diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 5360f086c..9b0e37ddd 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -60,13 +60,13 @@ { - if (response.status == 'success') { - const metrics = response.data.sort() - const metricMap = new Map() - metrics.forEach((item) => { - let key = '' - if (/^[a-zA-Z]+?_[a-zA-Z]*/.test(item)) { - key = item.split('_')[0] - } else if (/^_\w*/.test(item)) { - key = ' ' - } else { - key = item - } - if (metricMap.get(key)) { - const values = metricMap.get(key) - values.push({ label: item, value: item }) - } else { - const values = [{ label: item, value: item }] - metricMap.set(key, values) - } - // this.metricStore.push({label:item,value:item,insertText:item}) - }) - for (const key of metricMap.keys()) { - const option = { - label: key, - value: key - } - if (metricMap.get(key) && metricMap.get(key).length > 1) { - option.children = metricMap.get(key) - } - this.metricOptions.push(option) - } - } - }) - }, tabClick (n) { }, moduleIdChange (n) { @@ -1778,9 +1742,6 @@ export default { const delObj = this.selection.pen ? this.selection.pen.id : this.selection.pens this.$emit('del', delObj) }, - getMetricOptions () { - return this.metricOptions - }, addExpression () { this.selection.pen.data.expressAllArr.push('') this.selection.pen.data.legendsAll.push('') diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index 5ab20669b..1287e7b43 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -50,6 +50,8 @@