check if a user can list apps before trying to fetch the monitoring a…

…pp (rancher#9826)
momesgin · Oct 6, 2023 · 702c54e · 702c54e
1 parent 63d6ffd
commit 702c54e
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 22 deletions.
diff --git a/shell/components/AlertTable.vue b/shell/components/AlertTable.vue
@@ -82,14 +82,16 @@ export default {
     },
 
     async fetchDeps() {
-      try {
-        const am = await this.$store.dispatch('cluster/find', { type: ENDPOINTS, id: `${ this.monitoringNamespace }/${ this.alertServiceEndpoint }` });
+      if (this.$store.getters['cluster/canList'](ENDPOINTS)) {
+        try {
+          const am = await this.$store.dispatch('cluster/find', { type: ENDPOINTS, id: `${ this.monitoringNamespace }/${ this.alertServiceEndpoint }` });
 
-        if (!isEmpty(am) && !isEmpty(am.subsets)) {
-          this.alertManagerPoller.start();
-        }
-      } catch {
+          if (!isEmpty(am) && !isEmpty(am.subsets)) {
+            this.alertManagerPoller.start();
+          }
+        } catch {
 
+        }
       }
     },
   }

diff --git a/shell/components/EtcdInfoBanner.vue b/shell/components/EtcdInfoBanner.vue
@@ -9,8 +9,18 @@ export default {
   components: { Banner, Loading },
   async fetch() {
     const inStore = this.$store.getters['currentProduct'].inStore;
-    const res = await this.$store.dispatch(`${ inStore }/find`, { type: CATALOG.APP, id: 'cattle-monitoring-system/rancher-monitoring' });
-    const monitoringVersion = res?.currentVersion;
+    let monitoringVersion = '';
+
+    if (this.$store.getters[`${ inStore }/canList}`](CATALOG.APP)) {
+      try {
+        const res = await this.$store.dispatch(`${ inStore }/find`, { type: CATALOG.APP, id: 'cattle-monitoring-system/rancher-monitoring' });
+
+        monitoringVersion = res?.currentVersion;
+      } catch (err) {
+
+      }
+    }
+
     const leader = await hasLeader(monitoringVersion, this.$store.dispatch, this.currentCluster.id);
 
     this.hasLeader = leader ? this.t('generic.yes') : this.t('generic.no');

diff --git a/shell/components/GrafanaDashboard.vue b/shell/components/GrafanaDashboard.vue
@@ -40,13 +40,18 @@ export default {
   },
   async fetch() {
     const inStore = this.$store.getters['currentProduct'].inStore;
-    const res = await this.$store.dispatch(`${ inStore }/find`, { type: CATALOG.APP, id: 'cattle-monitoring-system/rancher-monitoring' });
 
-    this.monitoringVersion = res?.currentVersion;
+    if (this.$store.getters[`${ inStore }/canList`](CATALOG.APP)) {
+      try {
+        const res = await this.$store.dispatch(`${ inStore }/find`, { type: CATALOG.APP, id: 'cattle-monitoring-system/rancher-monitoring' });
+
+        this.monitoringVersion = res?.currentVersion;
+      } catch (err) {}
+    }
   },
   data() {
     return {
-      loading: false, error: false, interval: null, errorTimer: null, monitoringVersion: null
+      loading: false, error: false, interval: null, errorTimer: null, monitoringVersion: ''
     };
   },
   computed: {

diff --git a/shell/pages/c/_cluster/monitoring/index.vue b/shell/pages/c/_cluster/monitoring/index.vue
@@ -96,12 +96,17 @@ export default {
       const { $store, externalLinks } = this;
 
       this.v1Installed = await haveV1MonitoringWorkloads($store);
-      const hash = await allHash({
-        apps:      $store.dispatch('cluster/findAll', { type: CATALOG.APP }),
-        endpoints: $store.dispatch('cluster/findAll', { type: ENDPOINTS }),
-      });
+      const hash = {};
 
-      if (!isEmpty(hash.endpoints)) {
+      if ($store.getters['cluster/canList'](CATALOG.APP)) {
+        hash.apps = $store.dispatch('cluster/findAll', { type: CATALOG.APP });
+      }
+      if ($store.getters['cluster/schemaFor'](ENDPOINTS)) {
+        hash.endpoints = $store.dispatch('cluster/findAll', { type: ENDPOINTS });
+      }
+      const res = await allHash(hash);
+
+      if (res.endpoints && !isEmpty(res.endpoints)) {
         const amMatch = findBy(externalLinks, 'group', 'alertmanager');
         const grafanaMatch = findBy(externalLinks, 'group', 'grafana');
         const promeMatch = externalLinks.filter(
@@ -110,23 +115,23 @@ export default {
 
         // Generate Grafana link
         const currentCluster = this.$store.getters['currentCluster'];
-        const rancherMonitoring = !isEmpty(hash.apps) ? findBy(hash.apps, 'id', 'cattle-monitoring-system/rancher-monitoring') : '';
+        const rancherMonitoring = !isEmpty(res.apps) ? findBy(res.apps, 'id', 'cattle-monitoring-system/rancher-monitoring') : '';
         const clusterPrefix = getClusterPrefix(rancherMonitoring?.currentVersion || '', currentCluster.id);
 
         grafanaMatch.link = `${ clusterPrefix }/api/v1/namespaces/cattle-monitoring-system/services/http:rancher-monitoring-grafana:80/proxy/`;
 
         const alertmanager = findBy(
-          hash.endpoints,
+          res.endpoints,
           'id',
           `${ CATTLE_MONITORING_NAMESPACE }/rancher-monitoring-alertmanager`
         );
         const grafana = findBy(
-          hash.endpoints,
+          res.endpoints,
           'id',
           `${ CATTLE_MONITORING_NAMESPACE }/rancher-monitoring-grafana`
         );
         const prometheus = findBy(
-          hash.endpoints,
+          res.endpoints,
           'id',
           `${ CATTLE_MONITORING_NAMESPACE }/rancher-monitoring-prometheus`
         );

diff --git a/shell/utils/grafana.js b/shell/utils/grafana.js
@@ -63,14 +63,13 @@ export async function allDashboardsExist(store, clusterId, embeddedUrls, storeNa
 
   let monitoringVersion = '';
 
-  if (!projectId) {
+  if (!projectId && store.getters[`${ storeName }/canList`](CATALOG.APP)) {
     try {
       res = await store.dispatch(`${ storeName }/find`, {
         type: CATALOG.APP,
         id:   'cattle-monitoring-system/rancher-monitoring'
       });
     } catch (err) {
-      return false;
     }
 
     monitoringVersion = res?.currentVersion;