diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-01-29 13:49:04 -0600 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-01-29 13:49:04 -0600 |
| commit | e2065ed6c71e544253fbf3effaea8434836e7d12 (patch) | |
| tree | e08617c72c9bf7c806356ed8268ff76aa709ace8 | |
| parent | 86dc598518b1e4dd5a5c02ac8e0cb6930e7e36c4 (diff) | |
| download | gitlab-ce-fix-prometheus-empty-state-no-data.tar.gz | |
add noData empty state to prometheus graphsfix-prometheus-empty-state-no-data
| -rw-r--r-- | app/assets/javascripts/monitoring/components/dashboard.vue | 8 | ||||
| -rw-r--r-- | app/assets/javascripts/monitoring/components/empty_state.vue | 11 |
2 files changed, 16 insertions, 3 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 025e38ea99a..5afae93724b 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -76,7 +76,13 @@ .then(data => this.store.storeDeploymentData(data)) .catch(() => new Flash('Error getting deployment information.')), ]) - .then(() => { this.showEmptyState = false; }) + .then(() => { + if (this.store.groups.length < 1) { + this.state = 'noData'; + return; + } + this.showEmptyState = false; + }) .catch(() => { this.state = 'unableToConnect'; }); }, diff --git a/app/assets/javascripts/monitoring/components/empty_state.vue b/app/assets/javascripts/monitoring/components/empty_state.vue index 87d1975d5ad..56cd60c583b 100644 --- a/app/assets/javascripts/monitoring/components/empty_state.vue +++ b/app/assets/javascripts/monitoring/components/empty_state.vue @@ -34,16 +34,23 @@ svgUrl: this.emptyGettingStartedSvgPath, title: 'Get started with performance monitoring', description: `Stay updated about the performance and health -of your environment by configuring Prometheus to monitor your deployments.`, + of your environment by configuring Prometheus to monitor your deployments.`, buttonText: 'Configure Prometheus', }, loading: { svgUrl: this.emptyLoadingSvgPath, title: 'Waiting for performance data', description: `Creating graphs uses the data from the Prometheus server. -If this takes a long time, ensure that data is available.`, + If this takes a long time, ensure that data is available.`, buttonText: 'View documentation', }, + noData: { + svgUrl: this.emptyUnableToConnectSvgPath, + title: 'No data found', + description: `You are connected to the Prometheus server, but there is currently + no data to display.`, + buttonText: 'Configure Prometheus', + }, unableToConnect: { svgUrl: this.emptyUnableToConnectSvgPath, title: 'Unable to connect to Prometheus server', |