diff --git a/.github/workflows/traffic-monitor-api.yml b/.github/workflows/traffic-monitor-api.yml index 7dae9895..866a3710 100644 --- a/.github/workflows/traffic-monitor-api.yml +++ b/.github/workflows/traffic-monitor-api.yml @@ -2,7 +2,7 @@ # For that an Elasticsearch instance is started, test-data inserted and the # API-Builder Traffic-Monitor API is executed with all possible parameters. -name: Test Traffic-Monitor API +name: Traffic-Monitor API on: push: diff --git a/elk-traffic-monitor-api/flows/monitoringApiApi-getRouterServiceOpsSearchByServiceID.json b/elk-traffic-monitor-api/flows/monitoringApiApi-getRouterServiceOpsSearchByServiceID.json index d617c70a..2110b554 100644 --- a/elk-traffic-monitor-api/flows/monitoringApiApi-getRouterServiceOpsSearchByServiceID.json +++ b/elk-traffic-monitor-api/flows/monitoringApiApi-getRouterServiceOpsSearchByServiceID.json @@ -248,7 +248,7 @@ { "name": "code", "type": "string", - "value": "\"var queryFilters = data.queryFilters;\\n if(data.params.ago) {\\n var ago = data.params.ago;\\n var diff = convertAgo(ago);\\n var filter = {\\n range: {\\n \\\"timestampOriginal\\\": {\\n gt: diff\\n }\\n }\\n };\\n queryFilters.push(filter);\\n return queryFilters;\\n }\\n \\n function convertAgo(ago) {\\n var diff = ago.substring(0, ago.length-1);\\n var now = new Date();\\n if(ago.endsWith('m')) {\\n return now.setMinutes(now.getMinutes() - diff);\\n } else if(ago.endsWith('h')) {\\n return now.setMinutes(now.getHours() - diff);\\n }\\n console.log(`ERRRRO ${ago}`);\\n }\"", + "value": "\"var queryFilters = data.queryFilters;\\n if(data.params.ago) {\\n var ago = data.params.ago;\\n var diff = convertAgo(ago);\\n var filter = {\\n range: {\\n \\\"timestampOriginal\\\": {\\n gt: diff\\n }\\n }\\n };\\n queryFilters.push(filter);\\n return queryFilters;\\n }\\n \\n function convertAgo(ago) {\\n var diff = ago.substring(0, ago.length-1);\\n var now = new Date();\\n if(ago.endsWith('m')) {\\n return now.setMinutes(now.getMinutes() - diff);\\n } else if(ago.endsWith('h')) {\\n return now.setHours(now.getHours() - diff);\\n }\\n console.log(`ERRRRO ${ago}`);\\n }\"", "metaName": "code", "metaDescription": "A JavaScript function body. Supports `await` and returning promises" } diff --git a/elk-traffic-monitor-api/test/endpoints.js b/elk-traffic-monitor-api/test/endpoints.js index 885994cb..f3cb7461 100644 --- a/elk-traffic-monitor-api/test/endpoints.js +++ b/elk-traffic-monitor-api/test/endpoints.js @@ -413,7 +413,7 @@ describe('Endpoints', function () { }; return requestAsync({ method: 'GET', - uri: `http://localhost:${server.apibuilder.port}/api/elk/v1/api/router/service/instance-1/ops/search?ago=120h`, + uri: `http://localhost:${server.apibuilder.port}/api/elk/v1/api/router/service/instance-1/ops/search?ago=2h`, auth: auth, json: true }).then(({ response, body }) => {