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

Commit e5ee965

Browse files
author
Chris Wiechmann
committed
Integration test fixed and added a default leg: 0 to the search result
#103
1 parent 7971b5c commit e5ee965

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

‎apibuilder4elastic/flows/trafficMonitorApi-search.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
{
135135
"name": "code",
136136
"type": "string",
137-
"value": "\"var result = {};\\n var hits = data.elasticsearch.result.body.hits.hits;\\n var protocol = data.params.protocol;\\n result.processId = \\\"\\\";\\n result.data = [];\\n hits.map(function(entry) {\\n var dataObject = {};\\n var _source = entry._source;\\n dataObject.correlationId = _source.correlationId;\\n dataObject.timestamp = Date.parse(_source['@timestamp']);\\n if(_source.serviceContext) {\\n dataObject.serviceName = _source.serviceContext.service;\\n dataObject.operation = _source.serviceContext.method;\\n }\\n dataObject.type = protocol;\\n switch (protocol) {\\n case \\\"http\\\":\\n formatHttpFields(dataObject, _source);\\n break;\\n case \\\"fileTransfer\\\":\\n formatFiletransferFields(dataObject, _source);\\n break;\\n }\\n result.data.push(dataObject);\\n });\\n \\n function formatHttpFields(dataObject, _source) { \\n dataObject.statustext = _source.http.statusText;\\n dataObject.method = _source.http.method;\\n dataObject.status = _source.http.status;\\n dataObject.wafStatus = _source.http.wafStatus;\\n dataObject.subject = _source.http.authSubjectId;\\n dataObject.localPort = _source.http.localPort;\\n dataObject.uri = _source.http.uri;\\n dataObject.vhost = _source.http.vhost;\\n dataObject.duration = _source.duration;\\n dataObject.finalStatus = _source.finalStatus;\\n dataObject.bytesReceived = _source.http.bytesReceived;\\n dataObject.bytesSent = _source.http.bytesSent;\\n dataObject.remoteName = _source.http.remoteName;\\n dataObject.remoteAddr = _source.http.remoteAddr;\\n dataObject.remotePort = _source.http.remotePort;\\n dataObject.localAddr = _source.http.localAddr;\\n dataObject.localPort = _source.http.localPort;\\n }\\n \\n function formatFiletransferFields(dataObject, _source) {\\n dataObject.remoteAddr = _source.fileTransfer.remoteAddr;\\n dataObject.uploadFile = _source.fileTransfer.uploadFile;\\n dataObject.direction = _source.fileTransfer.direction;\\n dataObject.servicetype = _source.fileTransfer.serviceType;\\n dataObject.size = _source.fileTransfer.size;\\n dataObject.duration = _source.duration;\\n dataObject.subject = _source.fileTransfer.authSubjectId;\\n dataObject.finalStatus = _source.finalStatus;\\n }\\n\\n \\n return result;\"",
137+
"value": "\"var result = {};\\n var hits = data.elasticsearch.result.body.hits.hits;\\n var protocol = data.params.protocol;\\n result.processId = \\\"\\\";\\n result.data = [];\\n hits.map(function(entry) {\\n var dataObject = {};\\n var _source = entry._source;\\n dataObject.correlationId = _source.correlationId;\\n dataObject.timestamp = Date.parse(_source['@timestamp']);\\n if(_source.serviceContext) {\\n dataObject.serviceName = _source.serviceContext.service;\\n dataObject.operation = _source.serviceContext.method;\\n }\\n dataObject.type = protocol;\\n switch (protocol) {\\n case \\\"http\\\":\\n formatHttpFields(dataObject, _source);\\n break;\\n case \\\"fileTransfer\\\":\\n formatFiletransferFields(dataObject, _source);\\n break;\\n }\\n result.data.push(dataObject);\\n });\\n \\n function formatHttpFields(dataObject, _source) { \\n dataObject.statustext = _source.http.statusText;\\n dataObject.method = _source.http.method;\\n dataObject.status = _source.http.status;\\n dataObject.wafStatus = _source.http.wafStatus;\\n dataObject.subject = _source.http.authSubjectId;\\n dataObject.localPort = _source.http.localPort;\\n dataObject.uri = _source.http.uri;\\n dataObject.vhost = _source.http.vhost;\\n dataObject.duration = _source.duration;\\n dataObject.finalStatus = _source.finalStatus;\\n dataObject.bytesReceived = _source.http.bytesReceived;\\n dataObject.bytesSent = _source.http.bytesSent;\\n dataObject.remoteName = _source.http.remoteName;\\n dataObject.remoteAddr = _source.http.remoteAddr;\\n dataObject.remotePort = _source.http.remotePort;\\n dataObject.localAddr = _source.http.localAddr;\\n dataObject.localPort = _source.http.localPort;\\n dataObject.leg = 0;\\n }\\n \\n function formatFiletransferFields(dataObject, _source) {\\n dataObject.remoteAddr = _source.fileTransfer.remoteAddr;\\n dataObject.uploadFile = _source.fileTransfer.uploadFile;\\n dataObject.direction = _source.fileTransfer.direction;\\n dataObject.servicetype = _source.fileTransfer.serviceType;\\n dataObject.size = _source.fileTransfer.size;\\n dataObject.duration = _source.duration;\\n dataObject.subject = _source.fileTransfer.authSubjectId;\\n dataObject.finalStatus = _source.finalStatus;\\n }\\n\\n \\n return result;\"",
138138
"metaName": "code",
139139
"metaDescription": "A JavaScript function body. Supports `await` and returning promises."
140140
}

‎apibuilder4elastic/test/documents/http/search_test_documents.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ module.exports = [
3131
"localPort": 8065,
3232
"localAddr" : "192.168.65.129",
3333
"remoteName" : "192.168.65.1",
34+
"remoteAddr": "192.168.65.1",
3435
"remotePort" : 59641,
3536
"wafStatus": 1,
3637
"vhost": "api.customer.com:443"
@@ -104,6 +105,7 @@ module.exports = [
104105
"authSubjectId" : "Chris-Test",
105106
"localAddr" : "1.1.1.1",
106107
"remoteName" : "TestHost",
108+
"remoteAddr": "192.168.65.1",
107109
"remotePort" : 78786,
108110
"wafStatus" : 0
109111
},
@@ -142,6 +144,7 @@ module.exports = [
142144
"localPort": 8080,
143145
"localAddr" : "192.168.65.129",
144146
"remoteName" : "192.168.65.1",
147+
"remoteAddr": "192.168.65.1",
145148
"remotePort" : 65392,
146149
"wafStatus" : 0
147150
},
@@ -197,6 +200,7 @@ module.exports = [
197200
"localPort": 8065,
198201
"localAddr" : "192.168.65.129",
199202
"remoteName" : "192.168.65.1",
203+
"remoteAddr": "192.168.65.1",
200204
"remotePort" : 50982
201205
}
202206
},
@@ -248,6 +252,7 @@ module.exports = [
248252
"localPort": 8065,
249253
"localAddr" : "192.168.65.129",
250254
"remoteName" : "192.168.65.1",
255+
"remoteAddr": "192.168.65.1",
251256
"remotePort" : 50982
252257
}
253258
}

‎apibuilder4elastic/test/trafficMonitorAPI/asAdmin/http/test_search_endpoint_AsAdmin.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,7 @@ function checkFields(data, hasServiceContext) {
640640
expect(entry).to.have.property('remotePort');
641641
expect(entry).to.have.property('localAddr');
642642
expect(entry).to.have.property('vhost');
643+
expect(entry).to.have.property('leg');
643644
if(entry.method!='OPTIONS') {
644645
expect(entry).to.have.property('finalStatus');
645646
}

0 commit comments

Comments
 (0)