diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-05 10:00:15 +0000 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-05 10:00:15 +0000 |
commit | da522efa1a46241bb5828420382174fed0a20a00 (patch) | |
tree | 71f7493a671e4235b09b07a14749f5cbb55da5fa | |
parent | db239dc26079217b2a1d21c44061470678e91eaa (diff) | |
parent | 9a4ab760ff886f71aefa1e9db856763bb698bebd (diff) | |
download | gitlab-ce-da522efa1a46241bb5828420382174fed0a20a00.tar.gz |
Merge branch '38789-prometheus-graphs-occasionally-have-incorrect-y-scale' into 'master'
Resolve "Prometheus graphs occasionally have incorrect Y scale"
Closes #38789
See merge request gitlab-org/gitlab-ce!14693
-rw-r--r-- | app/assets/javascripts/monitoring/stores/monitoring_store.js | 2 | ||||
-rw-r--r-- | changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/monitoring/stores/monitoring_store.js b/app/assets/javascripts/monitoring/stores/monitoring_store.js index 7592af5878e..854636e9a89 100644 --- a/app/assets/javascripts/monitoring/stores/monitoring_store.js +++ b/app/assets/javascripts/monitoring/stores/monitoring_store.js @@ -13,7 +13,7 @@ function normalizeMetrics(metrics) { ...result, values: result.values.map(([timestamp, value]) => ({ time: new Date(timestamp * 1000), - value, + value: Number(value), })), })), })), diff --git a/changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml b/changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml new file mode 100644 index 00000000000..bbfe5d49a3e --- /dev/null +++ b/changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml @@ -0,0 +1,5 @@ +--- +title: Fix broken Y-axis scaling in some Prometheus graphs +merge_request: 14693 +author: +type: fixed |