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

fix：alertMessage Table 去除 rule_type rule_name 以及Rule_id

Browse Source
This commit is contained in:
zhangyu
2022-09-22 17:04:38 +08:00
parent 77572bd9c7
commit 7aaaa966c3
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nezha-fronted/src/components/common/alert/alertMessageLabelMixin.js
View File

@@ -5,7 +5,8 @@ export default {
}, },
data () { data () {
return { return {
exclusiveLabels: ['_id', 'severity', '__name__'] exclusiveLabels: ['_id', 'severity', '__name__', 'rule'],
filterArr: ['alertname', 'severity_id', 'severity', 'rule_type', 'rule_id', 'rule_name']
} }
}, },
computed: { computed: {

2
nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
View File

@@ -430,7 +430,7 @@ export default {
}, },
promQueryParamLabels (labels) { promQueryParamLabels (labels) {
const obj = JSON.parse(labels) const obj = JSON.parse(labels)
const filterArr = ['alertname', 'severity_id', 'severity', 'rule_type'] const filterArr = ['alertname', 'severity_id', 'severity', 'rule_type', 'rule_id', 'rule_name']
filterArr.forEach(key => { filterArr.forEach(key => {
delete obj[key] delete obj[key]
}) })

3
nezha-fronted/src/components/common/searchSelectInfo.js
View File

@@ -1,4 +1,4 @@
import i18n from './i18n' import i18n from '@/components/common/i18n'
export default { export default {
data () { data () {
return { return {
@@ -372,7 +372,6 @@ export default {
} }
] ]
} }
} }
} }
} }

3
nezha-fronted/src/components/common/table/alert/alertMessageTable.vue
View File

@@ -179,6 +179,7 @@ export default {
graphShow: false, graphShow: false,
chartDatas: [], chartDatas: [],
sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'dc'], sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'dc'],
filterArr: ['alertname', 'severity_id', 'severity', 'rule_type', 'rule_id', 'rule_name'],
legend: [], legend: [],
searchTime: [new Date().setHours(new Date().getHours() - 1), new Date()], searchTime: [new Date().setHours(new Date().getHours() - 1), new Date()],
currentMsg: {}, currentMsg: {},
@@ -447,7 +448,7 @@ export default {
let by = ' by (' let by = ' by ('
for (const k in obj.labels) { for (const k in obj.labels) {
if (k != 'alertname' && k != 'severity') { if (this.filterArr.indexOf(k) == -1) {
intoLabels = true intoLabels = true
group += k group += k
group += '=' group += '='

2
nezha-fronted/src/components/page/alert/alertMessage.vue
View File

@@ -1018,7 +1018,7 @@ export default {
}, },
promQueryParamLabels (labels) { promQueryParamLabels (labels) {
const obj = JSON.parse(labels) const obj = JSON.parse(labels)
const filterArr = ['alertname', 'severity_id', 'severity', 'rule_type'] const filterArr = ['alertname', 'severity_id', 'severity', 'rule_type', 'rule_id', 'rule_name']
filterArr.forEach(key => { filterArr.forEach(key => {
delete obj[key] delete obj[key]
}) })