Automatic merge of gitlab-org/gitlab-ce master

app/assets/javascripts/monitoring/monitoring_bundle.js

@@ -8,10 +8,12 @@ export default (props = {}) => {
   const el = document.getElementById('prometheus-graphs');
 
   if (el && el.dataset) {
-    store.dispatch('monitoringDashboard/setFeatureFlags', {
-      prometheusEndpointEnabled: gon.features.environmentMetricsUsePrometheusEndpoint,
-      multipleDashboardsEnabled: gon.features.environmentMetricsShowMultipleDashboards,
-    });
+    if (gon.features) {
+      store.dispatch('monitoringDashboard/setFeatureFlags', {
+        prometheusEndpointEnabled: gon.features.environmentMetricsUsePrometheusEndpoint,
+        multipleDashboardsEnabled: gon.features.environmentMetricsShowMultipleDashboards,
+      });
+    }
 
     const [currentDashboard] = getParameterValues('dashboard');
 

changelogs/unreleased/dohtaset.yml

+---
+title: Fix charts on Cluster health page
+merge_request: 30073
+author:
+type: fixed