From 1d622f901ce9040bbeb9dec3ef8f6f50b8967dd8 Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Fri, 25 Sep 2020 09:57:54 -0700 Subject: [PATCH 1/2] monitoring product reg update only look for pod monitor crd as the type because this is unique to Mon/Alerting v2 --- config/product/monitoring.js | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/config/product/monitoring.js b/config/product/monitoring.js index 90181f92fca..86e2e4274f4 100644 --- a/config/product/monitoring.js +++ b/config/product/monitoring.js @@ -13,20 +13,12 @@ export function init(store) { SERVICEMONITOR, PODMONITOR, PROMETHEUSRULE, - PROMETHEUSE, - THANOSRULER, + PROMETHEUSE } = MONITORING; product({ - ifHaveType: [ - ALERTMANAGER, - SERVICEMONITOR, - PODMONITOR, - PROMETHEUSRULE, - PROMETHEUSE, - THANOSRULER, - ], - // icon: 'prometheus' + ifHaveType: PODMONITOR, + // icon: 'prometheus' }); virtualType({ @@ -41,7 +33,13 @@ export function init(store) { basicType('monitoring-overview'); - basicType([SERVICEMONITOR, PODMONITOR, PROMETHEUSRULE, ALERTMANAGER, PROMETHEUSE]); + basicType([ + SERVICEMONITOR, + PODMONITOR, + PROMETHEUSRULE, + ALERTMANAGER, + PROMETHEUSE + ]); weightType(SERVICEMONITOR, 104, true); weightType(PODMONITOR, 103, true); From 26cbcb702a7a5a5b6b354c3d8b464d07e21bcaf2 Mon Sep 17 00:00:00 2001 From: Vincent Fiduccia Date: Fri, 25 Sep 2020 13:07:43 -0700 Subject: [PATCH 2/2] Update monitoring.js --- config/product/monitoring.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/product/monitoring.js b/config/product/monitoring.js index 86e2e4274f4..ce62985cfb9 100644 --- a/config/product/monitoring.js +++ b/config/product/monitoring.js @@ -17,7 +17,7 @@ export function init(store) { } = MONITORING; product({ - ifHaveType: PODMONITOR, + ifHaveGroup: 'monitoring.coreos.com', // icon: 'prometheus' });