diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 03:08:50 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-30 03:08:50 +0000 |
| commit | 1d388ed855838a2d50588c131f9f23815f148344 (patch) | |
| tree | d9278b42419b6a91c90aa4940c69684077d34273 /app/assets/javascripts/monitoring | |
| parent | c36e59283ebcfd75281a9dda227ed060eeb5fbe7 (diff) | |
| download | gitlab-ce-1d388ed855838a2d50588c131f9f23815f148344.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring')
3 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/javascripts/monitoring/components/charts/time_series.vue b/app/assets/javascripts/monitoring/components/charts/time_series.vue index e77bf08be7f..e79755f4fb2 100644 --- a/app/assets/javascripts/monitoring/components/charts/time_series.vue +++ b/app/assets/javascripts/monitoring/components/charts/time_series.vue @@ -311,7 +311,10 @@ export default { <gl-tooltip :target="() => $refs.graphTitle" :disabled="!showTitleTooltip"> {{ graphData.title }} </gl-tooltip> - <div class="prometheus-graph-widgets js-graph-widgets flex-fill"> + <div + class="prometheus-graph-widgets js-graph-widgets flex-fill" + data-qa-selector="prometheus_graph_widgets" + > <slot></slot> </div> </div> diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 6178d1fab67..0cdda48f1e5 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -363,7 +363,7 @@ export default { </script> <template> - <div class="prometheus-graphs"> + <div class="prometheus-graphs" data-qa-selector="prometheus_graphs"> <div v-if="showHeader" ref="prometheusGraphsHeader" diff --git a/app/assets/javascripts/monitoring/components/panel_type.vue b/app/assets/javascripts/monitoring/components/panel_type.vue index a2849dcfddb..9c50d3190b9 100644 --- a/app/assets/javascripts/monitoring/components/panel_type.vue +++ b/app/assets/javascripts/monitoring/components/panel_type.vue @@ -138,6 +138,7 @@ export default { v-gl-tooltip class="ml-auto mx-3" toggle-class="btn btn-transparent border-0" + data-qa-selector="prometheus_widgets_dropdown" :right="true" :no-caret="true" :title="__('More actions')" @@ -161,7 +162,11 @@ export default { > {{ __('Generate link to chart') }} </gl-dropdown-item> - <gl-dropdown-item v-if="alertWidgetAvailable" v-gl-modal="`alert-modal-${index}`"> + <gl-dropdown-item + v-if="alertWidgetAvailable" + v-gl-modal="`alert-modal-${index}`" + data-qa-selector="alert_widget_menu_item" + > {{ __('Alerts') }} </gl-dropdown-item> </gl-dropdown> |