diff options
| author | Tim Zallmann <tzallmann@gitlab.com> | 2017-12-13 06:45:44 +0000 |
|---|---|---|
| committer | LUKE BENNETT <lbennett@gitlab.com> | 2017-12-13 14:15:22 +0000 |
| commit | edf0aafadc205543bad25735fd71bd9070b45f6b (patch) | |
| tree | 59f9532ea2a09936e0530f1b9d704b127eb5fd58 | |
| parent | 81038fbaf4b6267c87450fbaf04df2b4e4bbbe90 (diff) | |
| download | gitlab-ce-edf0aafadc205543bad25735fd71bd9070b45f6b.tar.gz | |
Merge branch '40285-prometheus-loading-screen-no-longer-seems-to-appear' into 'master'
Resolve "Prometheus loading screen no longer seems to appear"
Closes #40285
See merge request gitlab-org/gitlab-ce!15889
(cherry picked from commit a8b9852837c3ecde3148a7e989d53fd5ac025bc3)
d072c0cd fix broken empty state assets for environment monitoring page
9864720a add CHANGELOG.md entry for !15889
| -rw-r--r-- | app/views/projects/environments/metrics.html.haml | 6 | ||||
| -rw-r--r-- | changelogs/unreleased/40285-prometheus-loading-screen-no-longer-seems-to-appear.yml | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/app/views/projects/environments/metrics.html.haml b/app/views/projects/environments/metrics.html.haml index 56cf16c3778..ad94113fffd 100644 --- a/app/views/projects/environments/metrics.html.haml +++ b/app/views/projects/environments/metrics.html.haml @@ -15,9 +15,9 @@ #prometheus-graphs{ data: { "settings-path": edit_project_service_path(@project, 'prometheus'), "documentation-path": help_page_path('administration/monitoring/prometheus/index.md'), - "empty-getting-started-svg-path": image_path('illustrations/monitoring/getting_started'), - "empty-loading-svg-path": image_path('illustrations/monitoring/loading'), - "empty-unable-to-connect-svg-path": image_path('illustrations/monitoring/unable_to_connect'), + "empty-getting-started-svg-path": image_path('illustrations/monitoring/getting_started.svg'), + "empty-loading-svg-path": image_path('illustrations/monitoring/loading.svg'), + "empty-unable-to-connect-svg-path": image_path('illustrations/monitoring/unable_to_connect.svg'), "additional-metrics": additional_metrics_project_environment_path(@project, @environment, format: :json), "project-path": project_path(@project), "tags-path": project_tags_path(@project), diff --git a/changelogs/unreleased/40285-prometheus-loading-screen-no-longer-seems-to-appear.yml b/changelogs/unreleased/40285-prometheus-loading-screen-no-longer-seems-to-appear.yml new file mode 100644 index 00000000000..978930a5b8c --- /dev/null +++ b/changelogs/unreleased/40285-prometheus-loading-screen-no-longer-seems-to-appear.yml @@ -0,0 +1,5 @@ +--- +title: Fix broken illustration images for monitoring page empty states +merge_request: 15889 +author: +type: fixed |