diff --git a/nezha-fronted/src/components/common/alert/alertMessageLabelMixin.js b/nezha-fronted/src/components/common/alert/alertMessageLabelMixin.js index d7afe3cee..cf2be2885 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageLabelMixin.js +++ b/nezha-fronted/src/components/common/alert/alertMessageLabelMixin.js @@ -5,7 +5,8 @@ export default { }, data () { return { - exclusiveLabels: ['_id', 'severity', '__name__'] + exclusiveLabels: ['_id', 'severity', '__name__', 'rule'], + filterArr: ['alertname', 'severity_id', 'severity', 'rule_type', 'rule_id', 'rule_name'] } }, computed: { diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue index 42c9aeb3b..6f9721d12 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue @@ -430,7 +430,7 @@ export default { }, promQueryParamLabels (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 => { delete obj[key] }) diff --git a/nezha-fronted/src/components/common/searchSelectInfo.js b/nezha-fronted/src/components/common/searchSelectInfo.js index 60f93a66f..eee6b22ef 100644 --- a/nezha-fronted/src/components/common/searchSelectInfo.js +++ b/nezha-fronted/src/components/common/searchSelectInfo.js @@ -1,4 +1,4 @@ -import i18n from './i18n' +import i18n from '@/components/common/i18n' export default { data () { return { @@ -372,7 +372,6 @@ export default { } ] } - } } } diff --git a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue index 3dee7bbd1..cdc2cd63a 100644 --- a/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertMessageTable.vue @@ -179,6 +179,7 @@ export default { graphShow: false, chartDatas: [], sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'dc'], + filterArr: ['alertname', 'severity_id', 'severity', 'rule_type', 'rule_id', 'rule_name'], legend: [], searchTime: [new Date().setHours(new Date().getHours() - 1), new Date()], currentMsg: {}, @@ -447,7 +448,7 @@ export default { let by = ' by (' for (const k in obj.labels) { - if (k != 'alertname' && k != 'severity') { + if (this.filterArr.indexOf(k) == -1) { intoLabels = true group += k group += '=' diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index 9cb5c9481..c744864a8 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -1018,7 +1018,7 @@ export default { }, promQueryParamLabels (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 => { delete obj[key] })