diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 15:09:05 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-28 15:09:05 +0300 |
commit | 5426ca9908085087d465fa52800335f408eb965a (patch) | |
tree | 6b442cff02fda9402fc7bb9cf9986e363dd5aaa6 /app/assets/javascripts/prometheus_metrics | |
parent | 67cdfd2683b89bce260600fa8925eefdcdf9e3e5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/prometheus_metrics')
-rw-r--r-- | app/assets/javascripts/prometheus_metrics/prometheus_metrics.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js index 8380cfb6c59..8d779e04673 100644 --- a/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js +++ b/app/assets/javascripts/prometheus_metrics/prometheus_metrics.js @@ -1,5 +1,5 @@ import $ from 'jquery'; -import _ from 'underscore'; +import { escape } from 'lodash'; import { s__, n__, sprintf } from '~/locale'; import axios from '../lib/utils/axios_utils'; import PANEL_STATE from './constants'; @@ -69,13 +69,13 @@ export default class PrometheusMetrics { if (metric.active_metrics > 0) { totalExporters += 1; this.$monitoredMetricsList.append( - `<li>${_.escape(metric.group)}<span class="badge">${_.escape( + `<li>${escape(metric.group)}<span class="badge">${escape( metric.active_metrics, )}</span></li>`, ); totalMonitoredMetrics += metric.active_metrics; if (metric.metrics_missing_requirements > 0) { - this.$missingEnvVarMetricsList.append(`<li>${_.escape(metric.group)}</li>`); + this.$missingEnvVarMetricsList.append(`<li>${escape(metric.group)}</li>`); totalMissingEnvVarMetrics += 1; } } |