Skip to content
This repository was archived by the owner on Dec 14, 2022. It is now read-only.

Fixed an issue with the ago-filter when using hours #3

Merged
merged 2 commits into from
Mar 19, 2020
Merged

Fixed an issue with the ago-filter when using hours #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
907460a
Fixed another issue when using ago with hours
Mar 19, 2020
3974890
Merge branch 'master' of https://github.com/cwiechmann/apigateway-ope…
Mar 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/traffic-monitor-api.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion elk-traffic-monitor-api/flows/monitoringApiApi-getRouterServiceOpsSearchByServiceID.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
2 changes: 1 addition & 1 deletion elk-traffic-monitor-api/test/endpoints.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }) => {
Expand Down