diff options
Diffstat (limited to 'app/assets/javascripts/monitoring')
8 files changed, 27 insertions, 73 deletions
diff --git a/app/assets/javascripts/monitoring/components/create_dashboard_modal.vue b/app/assets/javascripts/monitoring/components/create_dashboard_modal.vue index 288487d25a5..10178366db5 100644 --- a/app/assets/javascripts/monitoring/components/create_dashboard_modal.vue +++ b/app/assets/javascripts/monitoring/components/create_dashboard_modal.vue @@ -47,7 +47,7 @@ export default { <gl-button category="secondary" @click="cancelHandler">{{ s__('Metrics|Cancel') }}</gl-button> <gl-button category="secondary" - variant="info" + variant="confirm" target="_blank" :href="addDashboardDocumentationPath" data-testid="create-dashboard-modal-docs-button" diff --git a/app/assets/javascripts/monitoring/components/dashboard.vue b/app/assets/javascripts/monitoring/components/dashboard.vue index 6a85833db27..70e253508ce 100644 --- a/app/assets/javascripts/monitoring/components/dashboard.vue +++ b/app/assets/javascripts/monitoring/components/dashboard.vue @@ -132,16 +132,6 @@ export default { required: false, default: false, }, - alertsEndpoint: { - type: String, - required: false, - default: null, - }, - prometheusAlertsAvailable: { - type: Boolean, - required: false, - default: false, - }, rearrangePanelsAvailable: { type: Boolean, required: false, @@ -461,9 +451,7 @@ export default { :settings-path="settingsPath" :clipboard-text="generatePanelUrl(expandedPanel.group, expandedPanel.panel)" :graph-data="expandedPanel.panel" - :alerts-endpoint="alertsEndpoint" :height="600" - :prometheus-alerts-available="prometheusAlertsAvailable" @timerangezoom="onTimeRangeZoom" > <template #top-left> @@ -526,8 +514,6 @@ export default { :settings-path="settingsPath" :clipboard-text="generatePanelUrl(groupData.group, graphData)" :graph-data="graphData" - :alerts-endpoint="alertsEndpoint" - :prometheus-alerts-available="prometheusAlertsAvailable" @timerangezoom="onTimeRangeZoom" @expand="onExpandPanel(groupData.group, graphData)" /> diff --git a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue index 8e5a0b5cda2..7f8fb3c223d 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_actions_menu.vue @@ -186,7 +186,7 @@ export default { v-track-event="getAddMetricTrackingOptions()" data-testid="add-metric-modal-submit-button" :disabled="!customMetricsFormIsValid" - variant="success" + variant="confirm" @click="submitCustomMetricsForm" > {{ __('Save changes') }} diff --git a/app/assets/javascripts/monitoring/components/dashboard_header.vue b/app/assets/javascripts/monitoring/components/dashboard_header.vue index f53f78a3f13..f18290e7048 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_header.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_header.vue @@ -257,7 +257,7 @@ export default { > <gl-button class="flex-grow-1 js-external-dashboard-link" - variant="info" + variant="confirm" category="primary" :href="externalDashboardUrl" target="_blank" diff --git a/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue b/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue index e5f0206bb8b..8efea2bfc3e 100644 --- a/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue +++ b/app/assets/javascripts/monitoring/components/dashboard_panel_builder.vue @@ -106,7 +106,7 @@ export default { <div class="gl-text-right"> <gl-button ref="clipboardCopyBtn" - variant="success" + variant="confirm" category="secondary" :data-clipboard-text="yml" class="gl-xs-w-full gl-xs-mb-3" @@ -116,7 +116,7 @@ export default { </gl-button> <gl-button type="submit" - variant="success" + variant="confirm" :disabled="panelPreviewIsLoading" class="js-no-auto-disable gl-xs-w-full" > @@ -162,7 +162,7 @@ export default { ref="viewDocumentationBtn" category="secondary" class="gl-xs-w-full gl-xs-mb-3" - variant="info" + variant="confirm" target="_blank" :href="addDashboardDocumentationPath" > @@ -170,7 +170,7 @@ export default { </gl-button> <gl-button ref="openRepositoryBtn" - variant="success" + variant="confirm" :href="projectPath" class="gl-xs-w-full" > diff --git a/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue b/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue index fd07a41ec37..d1ce7bad39a 100644 --- a/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue +++ b/app/assets/javascripts/monitoring/components/duplicate_dashboard_modal.vue @@ -1,7 +1,7 @@ <script> -import { GlAlert, GlLoadingIcon, GlModal } from '@gitlab/ui'; +import { GlAlert, GlModal } from '@gitlab/ui'; import { mapActions, mapGetters } from 'vuex'; -import { s__ } from '~/locale'; +import { __, s__ } from '~/locale'; import DuplicateDashboardForm from './duplicate_dashboard_form.vue'; const events = { @@ -9,7 +9,7 @@ const events = { }; export default { - components: { GlAlert, GlLoadingIcon, GlModal, DuplicateDashboardForm }, + components: { GlAlert, GlModal, DuplicateDashboardForm }, props: { defaultBranch: { type: String, @@ -32,6 +32,20 @@ export default { okButtonText() { return this.loading ? s__('Metrics|Duplicating...') : s__('Metrics|Duplicate'); }, + actionPrimaryProps() { + return { + text: this.okButtonText, + attributes: { + loading: this.loading, + variant: 'confirm', + }, + }; + }, + actionCancelProps() { + return { + text: __('Cancel'), + }; + }, }, methods: { ...mapActions('monitoringDashboard', ['duplicateSystemDashboard']), @@ -75,7 +89,8 @@ export default { ref="duplicateDashboardModal" :modal-id="modalId" :title="s__('Metrics|Duplicate dashboard')" - ok-variant="success" + :action-primary="actionPrimaryProps" + :action-cancel="actionCancelProps" @ok="ok" @hide="hide" > @@ -87,9 +102,5 @@ export default { :default-branch="defaultBranch" @change="formChange" /> - <template #modal-ok> - <gl-loading-icon v-if="loading" size="sm" inline color="light" /> - {{ okButtonText }} - </template> </gl-modal> </template> diff --git a/app/assets/javascripts/monitoring/components/graph_group.vue b/app/assets/javascripts/monitoring/components/graph_group.vue index 5b73fb4e10d..74a806c50a9 100644 --- a/app/assets/javascripts/monitoring/components/graph_group.vue +++ b/app/assets/javascripts/monitoring/components/graph_group.vue @@ -37,7 +37,7 @@ export default { }, computed: { caretIcon() { - return this.isCollapsed ? 'angle-right' : 'angle-down'; + return this.isCollapsed ? 'chevron-lg-right' : 'chevron-lg-down'; }, }, watch: { diff --git a/app/assets/javascripts/monitoring/services/alerts_service.js b/app/assets/javascripts/monitoring/services/alerts_service.js deleted file mode 100644 index cb6dac7aa15..00000000000 --- a/app/assets/javascripts/monitoring/services/alerts_service.js +++ /dev/null @@ -1,43 +0,0 @@ -import axios from '~/lib/utils/axios_utils'; - -const mapAlert = ({ runbook_url, ...alert }) => { - return { runbookUrl: runbook_url, ...alert }; -}; - -export default class AlertsService { - constructor({ alertsEndpoint }) { - this.alertsEndpoint = alertsEndpoint; - } - - getAlerts() { - return axios.get(this.alertsEndpoint).then((resp) => mapAlert(resp.data)); - } - - createAlert({ prometheus_metric_id, operator, threshold, runbookUrl }) { - return axios - .post(this.alertsEndpoint, { - prometheus_metric_id, - operator, - threshold, - runbook_url: runbookUrl, - }) - .then((resp) => mapAlert(resp.data)); - } - - // eslint-disable-next-line class-methods-use-this - readAlert(alertPath) { - return axios.get(alertPath).then((resp) => mapAlert(resp.data)); - } - - // eslint-disable-next-line class-methods-use-this - updateAlert(alertPath, { operator, threshold, runbookUrl }) { - return axios - .put(alertPath, { operator, threshold, runbook_url: runbookUrl }) - .then((resp) => mapAlert(resp.data)); - } - - // eslint-disable-next-line class-methods-use-this - deleteAlert(alertPath) { - return axios.delete(alertPath).then((resp) => resp.data); - } -} |