diff options
Diffstat (limited to 'app/views/projects/settings/operations')
4 files changed, 7 insertions, 5 deletions
diff --git a/app/views/projects/settings/operations/_external_dashboard.html.haml b/app/views/projects/settings/operations/_external_dashboard.html.haml deleted file mode 100644 index 08d50a336fd..00000000000 --- a/app/views/projects/settings/operations/_external_dashboard.html.haml +++ /dev/null @@ -1,3 +0,0 @@ -.js-operation-settings{ data: { operations_settings_endpoint: project_settings_operations_path(@project), - external_dashboard: { url: metrics_external_dashboard_url, - help_page_path: help_page_path('user/project/operations/linking_to_an_external_dashboard') } } } diff --git a/app/views/projects/settings/operations/_incidents.html.haml b/app/views/projects/settings/operations/_incidents.html.haml index 92fffa42b73..3b1b0a00380 100644 --- a/app/views/projects/settings/operations/_incidents.html.haml +++ b/app/views/projects/settings/operations/_incidents.html.haml @@ -9,7 +9,7 @@ = _('Expand') %p = _('Action to take when receiving an alert.') - = link_to help_page_path('user/project/integrations/prometheus', anchor: 'taking-action-on-an-alert-ultimate') do + = link_to help_page_path('user/project/integrations/prometheus', anchor: 'taking-action-on-incidents-ultimate') do = _('More information') .settings-content = form_for @project, url: project_settings_operations_path(@project), method: :patch do |f| diff --git a/app/views/projects/settings/operations/_metrics_dashboard.html.haml b/app/views/projects/settings/operations/_metrics_dashboard.html.haml new file mode 100644 index 00000000000..edbada8444a --- /dev/null +++ b/app/views/projects/settings/operations/_metrics_dashboard.html.haml @@ -0,0 +1,5 @@ +.js-operation-settings{ data: { operations_settings_endpoint: project_settings_operations_path(@project), + help_page: help_page_path('user/project/operations/dashboard_settings'), + external_dashboard: { url: metrics_external_dashboard_url, + help_page: help_page_path('user/project/operations/linking_to_an_external_dashboard') }, + dashboard_timezone: { setting: metrics_dashboard_timezone.upcase } } } diff --git a/app/views/projects/settings/operations/show.html.haml b/app/views/projects/settings/operations/show.html.haml index ee47d70171b..9e4fbf81ca4 100644 --- a/app/views/projects/settings/operations/show.html.haml +++ b/app/views/projects/settings/operations/show.html.haml @@ -5,7 +5,7 @@ = render 'projects/settings/operations/incidents' = render 'projects/settings/operations/error_tracking' = render 'projects/settings/operations/prometheus', service: prometheus_service if Feature.enabled?(:settings_operations_prometheus_service) -= render 'projects/settings/operations/external_dashboard' += render 'projects/settings/operations/metrics_dashboard' = render 'projects/settings/operations/grafana_integration' = render_if_exists 'projects/settings/operations/tracing' = render_if_exists 'projects/settings/operations/status_page' |