diff options
author | Simon Knox <psimyn@gmail.com> | 2019-07-26 15:58:19 +1000 |
---|---|---|
committer | Simon Knox <psimyn@gmail.com> | 2019-07-26 15:58:19 +1000 |
commit | 36d3dd561f110590768ee0e526619097eb8f965b (patch) | |
tree | a348381458291abbf17d0fc7e3f64ed84e293a55 | |
parent | 513daf3dd6e48fe935ce5f062f8ffd201aee1503 (diff) | |
download | gitlab-ce-12918-metrics-dashboard-alerting-menu-unavailable-when-additional-panel-types-is-enabled-ce.tar.gz |
Fix Alerts on Metrics when additional_panel_types enabled12918-metrics-dashboard-alerting-menu-unavailable-when-additional-panel-types-is-enabled-ce
-rw-r--r-- | app/assets/javascripts/monitoring/components/dashboard.vue | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 745488255ab..b8af79ab2ed 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -20,7 +20,7 @@ export default { components: { MonitorAreaChart, MonitorSingleStatChart, - PanelType, + PanelType: () => import('ee_else_ce/monitoring/components/panel_type.vue'), GraphGroup, EmptyState, Icon, @@ -131,6 +131,16 @@ export default { required: false, default: false, }, + alertsEndpoint: { + type: String, + required: false, + default: null, + }, + prometheusAlertsAvailable: { + type: Boolean, + required: false, + default: false, + }, }, data() { return { @@ -381,6 +391,8 @@ export default { :key="`panel-type-${graphIndex}`" :graph-data="graphData" :dashboard-width="elWidth" + :alerts-endpoint="alertsEndpoint" + :prometheus-alerts-available="prometheusAlertsAvailable" /> </template> <template v-else> |