summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-11-06 11:48:27 -0600
committerMike Greiling <mike@pixelcog.com>2017-11-06 11:48:27 -0600
commitebf16b840e41729742e7290b8919dcf5d3dbed7b (patch)
treee25e4eb308c2b9ba5c5fea21a26edeca7c3d32aa
parent9066e6e3306e2d37f33e8a0accb477e498e48f80 (diff)
downloadgitlab-ce-multiple-query-prometheus-graphs-mocked.tar.gz
-rw-r--r--app/assets/javascripts/monitoring/services/monitoring_service.js26
-rw-r--r--spec/javascripts/monitoring/mock_data.js32
2 files changed, 48 insertions, 10 deletions
diff --git a/app/assets/javascripts/monitoring/services/monitoring_service.js b/app/assets/javascripts/monitoring/services/monitoring_service.js
index fed884d5c94..39400626d5f 100644
--- a/app/assets/javascripts/monitoring/services/monitoring_service.js
+++ b/app/assets/javascripts/monitoring/services/monitoring_service.js
@@ -3,6 +3,8 @@ import VueResource from 'vue-resource';
import statusCodes from '../../lib/utils/http_status';
import { backOff } from '../../lib/utils/common_utils';
+import mockData, { deploymentData } from '../../../../../spec/javascripts/monitoring/mock_data';
+
Vue.use(VueResource);
const MAX_REQUESTS = 3;
@@ -31,9 +33,11 @@ export default class MonitoringService {
this.deploymentEndpoint = deploymentEndpoint;
}
+ // eslint-disable-next-line
getGraphsData() {
- return backOffRequest(() => Vue.http.get(this.metricsEndpoint))
- .then(resp => resp.json())
+ // return backOffRequest(() => Vue.http.get(this.metricsEndpoint))
+ // .then(resp => resp.json())
+ return Promise.resolve(mockData)
.then((response) => {
if (!response || !response.data) {
throw new Error('Unexpected metrics data response from prometheus endpoint');
@@ -42,14 +46,16 @@ export default class MonitoringService {
});
}
+ // eslint-disable-next-line
getDeploymentData() {
- return backOffRequest(() => Vue.http.get(this.deploymentEndpoint))
- .then(resp => resp.json())
- .then((response) => {
- if (!response || !response.deployments) {
- throw new Error('Unexpected deployment data response from prometheus endpoint');
- }
- return response.deployments;
- });
+ return Promise.resolve(deploymentData);
+ // return backOffRequest(() => Vue.http.get(this.deploymentEndpoint))
+ // .then(resp => resp.json())
+ // .then((response) => {
+ // if (!response || !response.deployments) {
+ // throw new Error('Unexpected deployment data response from prometheus endpoint');
+ // }
+ // return response.deployments;
+ // });
}
}
diff --git a/spec/javascripts/monitoring/mock_data.js b/spec/javascripts/monitoring/mock_data.js
index 7ceab657464..5da323b6a38 100644
--- a/spec/javascripts/monitoring/mock_data.js
+++ b/spec/javascripts/monitoring/mock_data.js
@@ -2423,6 +2423,38 @@ const metricsGroupsAPIResponse = {
'last_update': '2017-05-25T13:18:34.949Z'
};
+const result = JSON.parse(JSON.stringify(metricsGroupsAPIResponse['data'][0]['metrics'][0]['queries'][0]['result'][0]));
+result['values'] = result['values'].map(([date, value]) => ([date, value * (0.85)]));
+//(Math.random() * (0.1)) +
+metricsGroupsAPIResponse['data'][0]['metrics'][0]['queries'][0]['result'][1] = result;
+
+const query = JSON.parse(JSON.stringify(metricsGroupsAPIResponse['data'][0]['metrics'][0]['queries'][0]));
+query['result'][0]['values'] = query['result'][0]['values'].map(([date, value]) => ([date, value * 0.65]));
+query['result'][1]['values'] = query['result'][1]['values'].map(([date, value]) => ([date, value * 0.65]));
+query['track'] = 'canary';
+
+metricsGroupsAPIResponse['data'][0]['metrics'][0]['queries'][1] = query;
+
+// const metricsGroupsAPIResponse = {
+// 'success': true,
+// 'data': [
+// {
+// 'group': 'Kubernetes',
+// 'priority': 1,
+// 'metrics': [
+// {
+// 'title': 'Memory usage',
+// 'weight': 1,
+// 'queries': [
+// {
+// 'query_range': 'avg(container_memory_usage_bytes{%{environment_filter}}) / 2^20',
+// 'y_label': 'Memory',
+// 'unit': 'MiB',
+// 'result': [
+// {
+// 'metric': {},
+// 'values': [
+
export default metricsGroupsAPIResponse;
const responseMockData = {