Commit ffe11337 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch 'jivanvl-add-sentry-messages-monitoring-dashboard' into 'master'

Add Sentry messages to the monitoring dashboard

See merge request gitlab-org/gitlab!25196
parents c299e39f 38496f16
import * as Sentry from '@sentry/browser';
import * as types from './mutation_types'; import * as types from './mutation_types';
import axios from '~/lib/utils/axios_utils'; import axios from '~/lib/utils/axios_utils';
import createFlash from '~/flash'; import createFlash from '~/flash';
...@@ -94,11 +95,14 @@ export const fetchDashboard = ({ state, dispatch }) => { ...@@ -94,11 +95,14 @@ export const fetchDashboard = ({ state, dispatch }) => {
return backOffRequest(() => axios.get(state.dashboardEndpoint, { params })) return backOffRequest(() => axios.get(state.dashboardEndpoint, { params }))
.then(resp => resp.data) .then(resp => resp.data)
.then(response => dispatch('receiveMetricsDashboardSuccess', { response, params })) .then(response => dispatch('receiveMetricsDashboardSuccess', { response, params }))
.catch(e => { .catch(error => {
dispatch('receiveMetricsDashboardFailure', e); Sentry.captureException(error);
dispatch('receiveMetricsDashboardFailure', error);
if (state.showErrorBanner) { if (state.showErrorBanner) {
if (e.response.data && e.response.data.message) { if (error.response.data && error.response.data.message) {
const { message } = e.response.data; const { message } = error.response.data;
createFlash( createFlash(
sprintf( sprintf(
s__('Metrics|There was an error while retrieving metrics. %{message}'), s__('Metrics|There was an error while retrieving metrics. %{message}'),
...@@ -152,6 +156,8 @@ export const fetchPrometheusMetric = ({ commit }, { metric, params }) => { ...@@ -152,6 +156,8 @@ export const fetchPrometheusMetric = ({ commit }, { metric, params }) => {
commit(types.RECEIVE_METRIC_RESULT_SUCCESS, { metricId: metric.metric_id, result }); commit(types.RECEIVE_METRIC_RESULT_SUCCESS, { metricId: metric.metric_id, result });
}) })
.catch(error => { .catch(error => {
Sentry.captureException(error);
commit(types.RECEIVE_METRIC_RESULT_FAILURE, { metricId: metric.metric_id, error }); commit(types.RECEIVE_METRIC_RESULT_FAILURE, { metricId: metric.metric_id, error });
// Continue to throw error so the dashboard can notify using createFlash // Continue to throw error so the dashboard can notify using createFlash
throw error; throw error;
...@@ -197,7 +203,8 @@ export const fetchDeploymentsData = ({ state, dispatch }) => { ...@@ -197,7 +203,8 @@ export const fetchDeploymentsData = ({ state, dispatch }) => {
dispatch('receiveDeploymentsDataSuccess', response.deployments); dispatch('receiveDeploymentsDataSuccess', response.deployments);
}) })
.catch(() => { .catch(error => {
Sentry.captureException(error);
dispatch('receiveDeploymentsDataFailure'); dispatch('receiveDeploymentsDataFailure');
createFlash(s__('Metrics|There was an error getting deployment information.')); createFlash(s__('Metrics|There was an error getting deployment information.'));
}); });
...@@ -225,7 +232,8 @@ export const fetchEnvironmentsData = ({ state, dispatch }) => { ...@@ -225,7 +232,8 @@ export const fetchEnvironmentsData = ({ state, dispatch }) => {
dispatch('receiveEnvironmentsDataSuccess', environments); dispatch('receiveEnvironmentsDataSuccess', environments);
}) })
.catch(() => { .catch(err => {
Sentry.captureException(err);
dispatch('receiveEnvironmentsDataFailure'); dispatch('receiveEnvironmentsDataFailure');
createFlash(s__('Metrics|There was an error getting environments information.')); createFlash(s__('Metrics|There was an error getting environments information.'));
}); });
...@@ -254,7 +262,10 @@ export const duplicateSystemDashboard = ({ state }, payload) => { ...@@ -254,7 +262,10 @@ export const duplicateSystemDashboard = ({ state }, payload) => {
.then(response => response.data) .then(response => response.data)
.then(data => data.dashboard) .then(data => data.dashboard)
.catch(error => { .catch(error => {
Sentry.captureException(error);
const { response } = error; const { response } = error;
if (response && response.data && response.data.error) { if (response && response.data && response.data.error) {
throw sprintf(s__('Metrics|There was an error creating the dashboard. %{error}'), { throw sprintf(s__('Metrics|There was an error creating the dashboard. %{error}'), {
error: response.data.error, error: response.data.error,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment