diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 21:07:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-02 21:07:51 +0000 |
| commit | d74fcc9b69746c4d9582299c370a95aafe2ac3ac (patch) | |
| tree | 8230bdf94ff004521422c9986062278dd3bc5b3f /app/assets/javascripts/monitoring/components | |
| parent | 8a7efa45c38ed3200d173d2c3207a8154e583c16 (diff) | |
| download | gitlab-ce-d74fcc9b69746c4d9582299c370a95aafe2ac3ac.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring/components')
| -rw-r--r-- | app/assets/javascripts/monitoring/components/panel_type.vue | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/monitoring/components/panel_type.vue b/app/assets/javascripts/monitoring/components/panel_type.vue index 77ba17b6e68..44e38089da8 100644 --- a/app/assets/javascripts/monitoring/components/panel_type.vue +++ b/app/assets/javascripts/monitoring/components/panel_type.vue @@ -101,7 +101,8 @@ export default { return this.graphData.title || ''; }, alertWidgetAvailable() { - return IS_EE && this.prometheusAlertsAvailable && this.alertsEndpoint && this.graphData; + // This method is extended by ee functionality + return false; }, graphDataHasMetrics() { return ( @@ -209,7 +210,7 @@ export default { > <div class="d-flex align-items-center"> <alert-widget - v-if="alertWidgetAvailable && graphData" + v-if="alertWidgetAvailable" :modal-id="`alert-modal-${index}`" :alerts-endpoint="alertsEndpoint" :relevant-queries="graphData.metrics" |