diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-04-17 23:08:26 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-04-23 08:42:14 +0000 |
| commit | 550a8e235880d15a88c379da13a7361d16d76773 (patch) | |
| tree | 41e2f84c652e4980e2a1b2028d6619ad3219e711 | |
| parent | 4adcfd43dac92e0028c7d9d762b6d93994cb6782 (diff) | |
| download | gitlab-ce-550a8e235880d15a88c379da13a7361d16d76773.tar.gz | |
Merge branch 'jivl-add-feature-flag-gon-ee' into 'master'
make the monitoring bundle reusable
See merge request gitlab-org/gitlab-ce!27402
(cherry picked from commit ce02daea08c4cc7bc5e65e56f9b3d744a2e1faa6)
761fa974 Make the monitoring bundle reusable
| -rw-r--r-- | app/assets/javascripts/monitoring/monitoring_bundle.js | 3 | ||||
| -rw-r--r-- | app/controllers/clusters/clusters_controller.rb | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/monitoring/monitoring_bundle.js b/app/assets/javascripts/monitoring/monitoring_bundle.js index 2b4ddd7afbc..ed794779ff2 100644 --- a/app/assets/javascripts/monitoring/monitoring_bundle.js +++ b/app/assets/javascripts/monitoring/monitoring_bundle.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import { parseBoolean } from '~/lib/utils/common_utils'; import Dashboard from './components/dashboard.vue'; -export default () => { +export default (props = {}) => { const el = document.getElementById('prometheus-graphs'); if (el && el.dataset) { @@ -15,6 +15,7 @@ export default () => { ...el.dataset, hasMetrics: parseBoolean(el.dataset.hasMetrics), showTimeWindowDropdown: gon.features.metricsTimeWindow, + ...props, }, }); }, diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb index e82756e4643..edaf07063ec 100644 --- a/app/controllers/clusters/clusters_controller.rb +++ b/app/controllers/clusters/clusters_controller.rb @@ -12,6 +12,9 @@ class Clusters::ClustersController < Clusters::BaseController before_action :authorize_update_cluster!, only: [:update] before_action :authorize_admin_cluster!, only: [:destroy] before_action :update_applications_status, only: [:cluster_status] + before_action only: [:show] do + push_frontend_feature_flag(:metrics_time_window) + end helper_method :token_in_session |