Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 57 deletions

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/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);
-  }
-}