diff options
author | Simon Knox <simon@gitlab.com> | 2019-06-26 22:14:41 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2019-06-26 22:14:41 +0000 |
commit | 27afe5496db343962c573ce4e48a87af74235e4c (patch) | |
tree | 23710882fd4f3be902fd518b931184ef71e3712c /app/assets/javascripts/monitoring/monitoring_bundle.js | |
parent | 871d06993edba9220c10ef2ca5c64f412ee5f984 (diff) | |
download | gitlab-ce-27afe5496db343962c573ce4e48a87af74235e4c.tar.gz |
Add feature flag and dashboard endpoint
First part of FE for Prometheus API
Dashboard endpoint fetches all info except for chart results
Renders empty groups after loading
Diffstat (limited to 'app/assets/javascripts/monitoring/monitoring_bundle.js')
-rw-r--r-- | app/assets/javascripts/monitoring/monitoring_bundle.js | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/app/assets/javascripts/monitoring/monitoring_bundle.js b/app/assets/javascripts/monitoring/monitoring_bundle.js index 1d33537b3b2..edbcf84b342 100644 --- a/app/assets/javascripts/monitoring/monitoring_bundle.js +++ b/app/assets/javascripts/monitoring/monitoring_bundle.js @@ -1,5 +1,6 @@ import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; +import { getParameterValues } from '~/lib/utils/url_utility'; import Dashboard from 'ee_else_ce/monitoring/components/dashboard.vue'; import store from './stores'; @@ -7,10 +8,12 @@ export default (props = {}) => { const el = document.getElementById('prometheus-graphs'); if (el && el.dataset) { - store.dispatch( - 'monitoringDashboard/setDashboardEnabled', - gon.features.environmentMetricsUsePrometheusEndpoint, - ); + store.dispatch('monitoringDashboard/setFeatureFlags', { + prometheusEndpointEnabled: gon.features.environmentMetricsUsePrometheusEndpoint, + multipleDashboardsEnabled: gon.features.environmentMetricsShowMultipleDashboards, + }); + + const [currentDashboard] = getParameterValues('dashboard'); // eslint-disable-next-line no-new new Vue({ @@ -20,6 +23,7 @@ export default (props = {}) => { return createElement(Dashboard, { props: { ...el.dataset, + currentDashboard, hasMetrics: parseBoolean(el.dataset.hasMetrics), ...props, }, |