Commit a4e320a4 authored by Reuben Pereira's avatar Reuben Pereira Committed by Mike Greiling

Remove the grafana_dashboard_link feature flag

parent b98633ad
...@@ -3,14 +3,6 @@ import store from './store'; ...@@ -3,14 +3,6 @@ import store from './store';
import ExternalDashboardForm from './components/external_dashboard.vue'; import ExternalDashboardForm from './components/external_dashboard.vue';
export default () => { export default () => {
/**
* This check can be removed when we remove
* the :grafana_dashboard_link feature flag
*/
if (!gon.features.grafanaDashboardLink) {
return null;
}
const el = document.querySelector('.js-operation-settings'); const el = document.querySelector('.js-operation-settings');
return new Vue({ return new Vue({
......
...@@ -13,7 +13,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController ...@@ -13,7 +13,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController
before_action only: [:metrics, :additional_metrics, :metrics_dashboard] do before_action only: [:metrics, :additional_metrics, :metrics_dashboard] do
push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint) push_frontend_feature_flag(:environment_metrics_use_prometheus_endpoint)
push_frontend_feature_flag(:environment_metrics_show_multiple_dashboards) push_frontend_feature_flag(:environment_metrics_show_multiple_dashboards)
push_frontend_feature_flag(:grafana_dashboard_link)
push_frontend_feature_flag(:prometheus_computed_alerts) push_frontend_feature_flag(:prometheus_computed_alerts)
end end
......
...@@ -5,10 +5,6 @@ module Projects ...@@ -5,10 +5,6 @@ module Projects
class OperationsController < Projects::ApplicationController class OperationsController < Projects::ApplicationController
before_action :authorize_update_environment! before_action :authorize_update_environment!
before_action do
push_frontend_feature_flag(:grafana_dashboard_link)
end
helper_method :error_tracking_setting helper_method :error_tracking_setting
def show def show
......
---
title: Link to an external dashboard from metrics dashboard
merge_request: 29369
author:
type: added
...@@ -49,9 +49,6 @@ describe('Dashboard', () => { ...@@ -49,9 +49,6 @@ describe('Dashboard', () => {
window.gon = { window.gon = {
...window.gon, ...window.gon,
ee: false, ee: false,
features: {
grafanaDashboardLink: true,
},
}; };
store = createStore(); store = createStore();
...@@ -382,52 +379,26 @@ describe('Dashboard', () => { ...@@ -382,52 +379,26 @@ describe('Dashboard', () => {
describe('external dashboard link', () => { describe('external dashboard link', () => {
beforeEach(() => { beforeEach(() => {
mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse); mock.onGet(mockApiEndpoint).reply(200, metricsGroupsAPIResponse);
});
describe('with feature flag enabled', () => {
beforeEach(() => {
component = new DashboardComponent({
el: document.querySelector('.prometheus-graphs'),
propsData: {
...propsData,
hasMetrics: true,
showPanels: false,
externalDashboardUrl: '/mockUrl',
},
store,
});
});
it('shows the link', done => { component = new DashboardComponent({
setTimeout(() => { el: document.querySelector('.prometheus-graphs'),
expect(component.$el.querySelector('.js-external-dashboard-link').innerText).toContain( propsData: {
'View full dashboard', ...propsData,
); hasMetrics: true,
done(); showPanels: false,
}); showTimeWindowDropdown: false,
externalDashboardUrl: '/mockUrl',
},
store,
}); });
}); });
describe('without feature flage enabled', () => { it('shows the link', done => {
beforeEach(() => { setTimeout(() => {
window.gon.features.grafanaDashboardLink = false; expect(component.$el.querySelector('.js-external-dashboard-link').innerText).toContain(
component = new DashboardComponent({ 'View full dashboard',
el: document.querySelector('.prometheus-graphs'), );
propsData: { done();
...propsData,
hasMetrics: true,
showPanels: false,
externalDashboardUrl: '',
},
store,
});
});
it('does not show the link', done => {
setTimeout(() => {
expect(component.$el.querySelector('.js-external-dashboard-link')).toBe(null);
done();
});
}); });
}); });
}); });
......
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