Merge branch 'jivl-fix-timescale-prometheus-charts-overlapping' into 'master'

fix timescale prometheus charts overlapping Closes #43458 See merge request gitlab-org/gitlab-ce!17657

Merge branch 'jivl-fix-timescale-prometheus-charts-overlapping' into 'master'
3bd219a4 · Mike Greiling · 654050da · f2247c65 · 3bd219a4
Commit 3bd219a4 authored Mar 13, 2018 by Mike Greiling
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

graph.vue app/assets/javascripts/monitoring/components/graph.vue +1 -0

No files found.
--- a/app/assets/javascripts/monitoring/components/graph.vue
+++ b/app/assets/javascripts/monitoring/components/graph.vue
@@ -209,6 +209,7 @@

        const xAxis = d3.axisBottom()
          .scale(axisXScale)
+          .ticks(this.graphWidth / 120)
          .tickFormat(timeScaleFormat);

        const yAxis = d3.axisLeft()