diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2018-05-07 21:08:59 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-05-07 21:08:59 +0000 |
| commit | c93cd37767c8384b7f64aa1e39501ec3cacbd0ad (patch) | |
| tree | a1cbe7fb9871712ab7faeaec2b5d2f270662e64c /app/assets/javascripts/monitoring/utils | |
| parent | 94099f2dd6e4b468886e1de787d4888cfc3114f7 (diff) | |
| download | gitlab-ce-c93cd37767c8384b7f64aa1e39501ec3cacbd0ad.tar.gz | |
Resolve "Monitoring graphs - Popover value improvements"
Diffstat (limited to 'app/assets/javascripts/monitoring/utils')
| -rw-r--r-- | app/assets/javascripts/monitoring/utils/date_time_formatters.js | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/monitoring/utils/multiple_time_series.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/assets/javascripts/monitoring/utils/date_time_formatters.js b/app/assets/javascripts/monitoring/utils/date_time_formatters.js index f3c9acdd93e..d88c13609dc 100644 --- a/app/assets/javascripts/monitoring/utils/date_time_formatters.js +++ b/app/assets/javascripts/monitoring/utils/date_time_formatters.js @@ -14,7 +14,7 @@ const d3 = { timeYear, }; -export const dateFormat = d3.time('%a, %b %-d'); +export const dateFormat = d3.time('%d %b %Y, '); export const timeFormat = d3.time('%-I:%M%p'); export const dateFormatWithName = d3.time('%a, %b %-d'); export const bisectDate = d3.bisector(d => d.time).left; diff --git a/app/assets/javascripts/monitoring/utils/multiple_time_series.js b/app/assets/javascripts/monitoring/utils/multiple_time_series.js index 8a93c7e6bae..4d3f1f1a7cc 100644 --- a/app/assets/javascripts/monitoring/utils/multiple_time_series.js +++ b/app/assets/javascripts/monitoring/utils/multiple_time_series.js @@ -123,6 +123,7 @@ function queryTimeSeries(query, graphWidth, graphHeight, graphHeightOffset, xDom linePath: lineFunction(timeSeries.values), areaPath: areaFunction(timeSeries.values), timeSeriesScaleX, + timeSeriesScaleY, values: timeSeries.values, max: maximumValue, average: accum / timeSeries.values.length, |