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

Merge branch '38789-prometheus-graphs-occasionally-have-incorrect-y-scale' into 'master'
858d5214 · Tim Zallmann · Jarka Kadlecova · 8c3338c7 · 858d5214 · 858d5214
Commit 858d5214 authored Oct 05, 2017 by Tim Zallmann Committed by Jarka Kadlecova Nov 01, 2017
Showing with 6 additions and 1 deletion

monitoring_store.js app/assets/javascripts/monitoring/stores/monitoring_store.js +1 -1

38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml ...prometheus-graphs-occasionally-have-incorrect-y-scale.yml +5 -0

No files found.
--- 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),
        })),
      })),
    })),

--- a/changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml
+++ b/changelogs/unreleased/38789-prometheus-graphs-occasionally-have-incorrect-y-scale.yml
+---
+title: Fix broken Y-axis scaling in some Prometheus graphs
+merge_request: 14693
+author:
+type: fixed