[Monitoring] Fix UI error when alerting is not available (elastic#77179…

…) (elastic#77271) * Ensure we always pass this structure down to avoid any errors in the UI * Fix tests and also fix inaccurate boolean states * Fix fixture
darnautov · Sep 11, 2020 · 0e12028 · 0e12028
1 parent da86e3d
commit 0e12028
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 56 deletions.
diff --git a/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js b/x-pack/plugins/monitoring/server/lib/cluster/get_clusters_from_request.js
@@ -119,67 +119,75 @@ export async function getClustersFromRequest(
     // add alerts data
     if (isInCodePath(codePaths, [CODE_PATH_ALERTS])) {
       const alertsClient = req.getAlertsClient();
-      if (alertsClient) {
-        for (const cluster of clusters) {
-          const verification = verifyMonitoringLicense(req.server);
-          if (!verification.enabled) {
-            // return metadata detailing that alerts is disabled because of the monitoring cluster license
-            cluster.alerts = {
-              alertsMeta: {
-                enabled: verification.enabled,
-                message: verification.message, // NOTE: this is only defined when the alert feature is disabled
-              },
-              list: {},
-            };
-            continue;
-          }
-
-          // check the license type of the production cluster for alerts feature support
-          const license = cluster.license || {};
-          const prodLicenseInfo = checkLicenseForAlerts(
-            license.type,
-            license.status === 'active',
-            'production'
-          );
-          if (prodLicenseInfo.clusterAlerts.enabled) {
-            cluster.alerts = {
-              list: await fetchStatus(
-                alertsClient,
-                req.server.plugins.monitoring.info,
-                undefined,
-                cluster.cluster_uuid,
-                start,
-                end,
-                []
-              ),
-              alertsMeta: {
-                enabled: true,
-              },
-            };
-            continue;
-          }
+      for (const cluster of clusters) {
+        const verification = verifyMonitoringLicense(req.server);
+        if (!verification.enabled) {
+          // return metadata detailing that alerts is disabled because of the monitoring cluster license
+          cluster.alerts = {
+            alertsMeta: {
+              enabled: verification.enabled,
+              message: verification.message, // NOTE: this is only defined when the alert feature is disabled
+            },
+            list: {},
+          };
+          continue;
+        }
 
+        if (!alertsClient) {
           cluster.alerts = {
             list: {},
             alertsMeta: {
-              enabled: true,
-            },
-            clusterMeta: {
               enabled: false,
-              message: i18n.translate(
-                'xpack.monitoring.clusterAlerts.unsupportedClusterAlertsDescription',
-                {
-                  defaultMessage:
-                    'Cluster [{clusterName}] license type [{licenseType}] does not support Cluster Alerts',
-                  values: {
-                    clusterName: cluster.cluster_name,
-                    licenseType: `${license.type}`,
-                  },
-                }
-              ),
             },
           };
+          continue;
+        }
+
+        // check the license type of the production cluster for alerts feature support
+        const license = cluster.license || {};
+        const prodLicenseInfo = checkLicenseForAlerts(
+          license.type,
+          license.status === 'active',
+          'production'
+        );
+        if (prodLicenseInfo.clusterAlerts.enabled) {
+          cluster.alerts = {
+            list: await fetchStatus(
+              alertsClient,
+              req.server.plugins.monitoring.info,
+              undefined,
+              cluster.cluster_uuid,
+              start,
+              end,
+              []
+            ),
+            alertsMeta: {
+              enabled: true,
+            },
+          };
+          continue;
         }
+
+        cluster.alerts = {
+          list: {},
+          alertsMeta: {
+            enabled: false,
+          },
+          clusterMeta: {
+            enabled: false,
+            message: i18n.translate(
+              'xpack.monitoring.clusterAlerts.unsupportedClusterAlertsDescription',
+              {
+                defaultMessage:
+                  'Cluster [{clusterName}] license type [{licenseType}] does not support Cluster Alerts',
+                values: {
+                  clusterName: cluster.cluster_name,
+                  licenseType: `${license.type}`,
+                },
+              }
+            ),
+          },
+        };
       }
     }
   }

diff --git a/x-pack/test/api_integration/apis/monitoring/cluster/fixtures/multicluster.json b/x-pack/test/api_integration/apis/monitoring/cluster/fixtures/multicluster.json
@@ -102,7 +102,7 @@
   },
   "alerts": {
     "alertsMeta": {
-      "enabled": true
+      "enabled": false
     },
     "clusterMeta": {
       "enabled": false,

diff --git a/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/clusters.json b/x-pack/test/api_integration/apis/monitoring/standalone_cluster/fixtures/clusters.json
@@ -102,7 +102,7 @@
   },
   "alerts": {
     "alertsMeta": {
-      "enabled": true
+      "enabled": false
     },
     "clusterMeta": {
       "enabled": false,
@@ -170,7 +170,7 @@
   },
   "alerts": {
     "alertsMeta": {
-      "enabled": true
+      "enabled": false
     },
     "clusterMeta": {
       "enabled": false,