Commit 550a8e23 authored by Fatih Acet's avatar Fatih Acet 🙌 Committed by GitLab Release Tools Bot

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 ce02daea)

761fa974 Make the monitoring bundle reusable
parent 4adcfd43
......@@ -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,
},
});
},
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment