Merge branch '60687-enviro-dropdown' into 'master'

Fix Metrics environments dropdown

Closes #60687

See merge request gitlab-org/gitlab-ce!27586

2 files changed, 2 insertions, 1 deletions

diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue
index f2bd4150b6d..00547abd7bc 100644
--- a/app/assets/javascripts/monitoring/components/dashboard.vue
+++ b/app/assets/javascripts/monitoring/components/dashboard.vue
@@ -221,6 +221,7 @@ export default {
           <gl-dropdown-item
             v-for="environment in store.environmentsData"
             :key="environment.id"
+            :href="environment.metrics_path"
             :active="environment.name === currentEnvironmentName"
             active-class="is-active"
             >{{ environment.name }}</gl-dropdown-item
diff --git a/app/assets/javascripts/monitoring/monitoring_bundle.js b/app/assets/javascripts/monitoring/monitoring_bundle.js
index ed794779ff2..08dc57d545c 100644
--- a/app/assets/javascripts/monitoring/monitoring_bundle.js
+++ b/app/assets/javascripts/monitoring/monitoring_bundle.js
@@ -1,6 +1,6 @@
 import Vue from 'vue';
 import { parseBoolean } from '~/lib/utils/common_utils';
-import Dashboard from './components/dashboard.vue';
+import Dashboard from 'ee_else_ce/monitoring/components/dashboard.vue';
 
 export default (props = {}) => {
   const el = document.getElementById('prometheus-graphs');