diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2017-10-05 10:00:15 +0000 |
---|---|---|
committer | Jarka Kadlecova <jarka@gitlab.com> | 2017-11-01 14:06:34 +0100 |
commit | 858d5214d27df14bca8b7365649002f1dda77759 (patch) | |
tree | 7fccb4914d3094485ea1191d25beb51d0770e29f | |
parent | 8c3338c717b5bd63f7e5737dc35d44934fb4eb1c (diff) | |
download | gitlab-ce-858d5214d27df14bca8b7365649002f1dda77759.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 |