diff --git a/app/assets/javascripts/monitoring/components/refresh_button.vue b/app/assets/javascripts/monitoring/components/refresh_button.vue index 544fe10f26e43ae8e293b39eb767c0a4e6650e9a..55c602db33d16e5598a2db5a634449ec3cec720a 100644 --- a/app/assets/javascripts/monitoring/components/refresh_button.vue +++ b/app/assets/javascripts/monitoring/components/refresh_button.vue @@ -11,8 +11,6 @@ import Visibility from 'visibilityjs'; import { mapActions } from 'vuex'; import { n__, __, s__ } from '~/locale'; -import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; - const makeInterval = (length = 0, unit = 's') => { const shortLabel = `${length}${unit}`; switch (unit) { @@ -58,7 +56,6 @@ export default { directives: { GlTooltip: GlTooltipDirective, }, - mixins: [glFeatureFlagsMixin()], data() { return { refreshInterval: null, @@ -66,12 +63,6 @@ export default { }; }, computed: { - disableMetricDashboardRefreshRate() { - // Can refresh rates impact performance? - // Add "negative" feature flag called `disable_metric_dashboard_refresh_rate` - // See more at: https://gitlab.com/gitlab-org/gitlab/-/issues/229831 - return this.glFeatures.disableMetricDashboardRefreshRate; - }, dropdownText() { return this.refreshInterval?.shortLabel ?? __('Off'); }, @@ -156,12 +147,7 @@ export default { icon="retry" @click="refresh" /> - <gl-dropdown - v-if="!disableMetricDashboardRefreshRate" - v-gl-tooltip - :title="s__('Metrics|Set refresh rate')" - :text="dropdownText" - > + <gl-dropdown v-gl-tooltip :title="s__('Metrics|Set refresh rate')" :text="dropdownText"> <gl-dropdown-item is-check-item :is-checked="refreshInterval === null" diff --git a/app/controllers/projects/environments_controller.rb b/app/controllers/projects/environments_controller.rb index 67f2f85ce65a240d76098834a2f123591eb53842..5f194508fc4cc6b5708377243dadceb49e4fb8d3 100644 --- a/app/controllers/projects/environments_controller.rb +++ b/app/controllers/projects/environments_controller.rb @@ -16,7 +16,6 @@ class Projects::EnvironmentsController < Projects::ApplicationController authorize_metrics_dashboard! push_frontend_feature_flag(:prometheus_computed_alerts) - push_frontend_feature_flag(:disable_metric_dashboard_refresh_rate) end before_action :authorize_read_environment!, except: [:metrics, :additional_metrics, :metrics_dashboard, :metrics_redirect] diff --git a/app/controllers/projects/metrics_dashboard_controller.rb b/app/controllers/projects/metrics_dashboard_controller.rb index b78ee6ca9179ca90acac01ebe15a3e91a6ef7f14..0c7d794365bedb234c317973f0aafc2aa15d17bc 100644 --- a/app/controllers/projects/metrics_dashboard_controller.rb +++ b/app/controllers/projects/metrics_dashboard_controller.rb @@ -11,7 +11,6 @@ class MetricsDashboardController < Projects::ApplicationController before_action :authorize_metrics_dashboard! before_action do push_frontend_feature_flag(:prometheus_computed_alerts) - push_frontend_feature_flag(:disable_metric_dashboard_refresh_rate) end feature_category :metrics diff --git a/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml b/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml deleted file mode 100644 index 6adfba96e104c91b6fcb282766e2f3d922b17ffc..0000000000000000000000000000000000000000 --- a/config/feature_flags/development/disable_metric_dashboard_refresh_rate.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -name: disable_metric_dashboard_refresh_rate -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37195 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/229841 -milestone: '13.2' -type: development -group: group::respond -default_enabled: false diff --git a/spec/frontend/monitoring/components/refresh_button_spec.js b/spec/frontend/monitoring/components/refresh_button_spec.js index e00736954a900048133fc4a21613451fd804c374..cb300870689d35f4b93af857a67a1bc4ab89a66b 100644 --- a/spec/frontend/monitoring/components/refresh_button_spec.js +++ b/spec/frontend/monitoring/components/refresh_button_spec.js @@ -52,20 +52,6 @@ describe('RefreshButton', () => { expect(findDropdown().props('text')).toBe('Off'); }); - describe('when feature flag disable_metric_dashboard_refresh_rate is on', () => { - beforeEach(() => { - createWrapper({ - provide: { - glFeatures: { disableMetricDashboardRefreshRate: true }, - }, - }); - }); - - it('refresh rate is not available', () => { - expect(findDropdown().exists()).toBe(false); - }); - }); - describe('refresh rate options', () => { it('presents multiple options', () => { expect(findOptions().length).toBeGreaterThan(1);