summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/monitoring/stores/actions.js
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 00:09:24 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-24 00:09:24 +0000
commit2711c26beaca6c3a5a3be4b65e01557faf0185b6 (patch)
tree25d0c2ddb47e87712044884f558a9104c686805f /app/assets/javascripts/monitoring/stores/actions.js
parent8a7aaf86831d2a556578ae558a4fcab8bb659b20 (diff)
downloadgitlab-ce-2711c26beaca6c3a5a3be4b65e01557faf0185b6.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/monitoring/stores/actions.js')
-rw-r--r--app/assets/javascripts/monitoring/stores/actions.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/javascripts/monitoring/stores/actions.js b/app/assets/javascripts/monitoring/stores/actions.js
index 7d0d37c1a20..7ea43d57039 100644
--- a/app/assets/javascripts/monitoring/stores/actions.js
+++ b/app/assets/javascripts/monitoring/stores/actions.js
@@ -86,8 +86,8 @@ export const fetchDashboard = ({ state, commit, dispatch }) => {
if (state.timeRange) {
const { start, end } = convertToFixedRange(state.timeRange);
- params.start = start;
- params.end = end;
+ params.start_time = start;
+ params.end_time = end;
}
if (state.currentDashboard) {
@@ -139,16 +139,16 @@ function fetchPrometheusResult(prometheusEndpoint, params) {
* @param {metric} metric
*/
export const fetchPrometheusMetric = ({ commit }, { metric, params }) => {
- const { start, end } = params;
- const timeDiff = (new Date(end) - new Date(start)) / 1000;
+ const { start_time, end_time } = params;
+ const timeDiff = (new Date(end_time) - new Date(start_time)) / 1000;
const minStep = 60;
const queryDataPoints = 600;
const step = Math.max(minStep, Math.ceil(timeDiff / queryDataPoints));
const queryParams = {
- start,
- end,
+ start_time,
+ end_time,
step,
};