From 04608f3884621fa7487bfdce940e778e5915a3e8 Mon Sep 17 00:00:00 2001 From: Bharat Mukheja Date: Mon, 26 Nov 2018 04:02:57 -0800 Subject: [PATCH 1/8] Fix for http://mvjira.mv.usa.alcatel.com:8080/browse/VSD-27833 --- .../queries/vss-enterprise-acldeny-metric.json | 8 ++++---- .../queries/vss-enterprise-alerts-metric.json | 4 ++-- .../queries/vss-enterprise-events-metric.json | 8 ++++---- .../queries/vss-enterprise-flows-metric.json | 8 ++++---- .../configurations/queries/vss-enterprise-pg-metric.json | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/public/configurations/queries/vss-enterprise-acldeny-metric.json b/public/configurations/queries/vss-enterprise-acldeny-metric.json index e02f2b04..0d2ddb16 100644 --- a/public/configurations/queries/vss-enterprise-acldeny-metric.json +++ b/public/configurations/queries/vss-enterprise-acldeny-metric.json @@ -30,16 +30,16 @@ "Prev 24": { "range": { "timestamp": { - "gte": "{{prevStartTime:now-48h}}", - "lte": "{{startTime:now-24h}}" + "gte": "now-48h", + "lte": "now-24h" } } }, "Last 24": { "range": { "timestamp": { - "gte": "{{startTime:now-24h}}", - "lte": "{{endTime:now}}" + "gte": "now-24h", + "lte": "now" } } } diff --git a/public/configurations/queries/vss-enterprise-alerts-metric.json b/public/configurations/queries/vss-enterprise-alerts-metric.json index a457630f..0681c398 100644 --- a/public/configurations/queries/vss-enterprise-alerts-metric.json +++ b/public/configurations/queries/vss-enterprise-alerts-metric.json @@ -38,8 +38,8 @@ "Last 24":{ "range":{ "timestamp":{ - "gte":"{{startTime:now-24h}}", - "lte":"{{endTime:now}}" + "gte":"now-24h", + "lte":"now" } } } diff --git a/public/configurations/queries/vss-enterprise-events-metric.json b/public/configurations/queries/vss-enterprise-events-metric.json index c01061b7..4a2fb4a8 100644 --- a/public/configurations/queries/vss-enterprise-events-metric.json +++ b/public/configurations/queries/vss-enterprise-events-metric.json @@ -25,16 +25,16 @@ "Prev 24": { "range": { "timestamp": { - "gte": "{{prevStartTime:now-48h}}", - "lte": "{{startTime:now-24h}}" + "gte": "now-48h", + "lte": "now-24h" } } }, "Last 24": { "range": { "timestamp": { - "gte": "{{startTime:now-24h}}", - "lte": "{{endTime:now}}" + "gte": "now-24h", + "lte": "now" } } } diff --git a/public/configurations/queries/vss-enterprise-flows-metric.json b/public/configurations/queries/vss-enterprise-flows-metric.json index ebe9f6d8..a02ea8c2 100644 --- a/public/configurations/queries/vss-enterprise-flows-metric.json +++ b/public/configurations/queries/vss-enterprise-flows-metric.json @@ -25,16 +25,16 @@ "Prev 24": { "range": { "timestamp": { - "gte": "{{prevStartTime:now-48h}}", - "lte": "{{startTime:now-24h}}" + "gte": "now-48h", + "lte": "now-24h" } } }, "Last 24": { "range": { "timestamp": { - "gte": "{{startTime:now-24h}}", - "lte": "{{endTime:now}}" + "gte": "now-24h", + "lte": "now" } } } diff --git a/public/configurations/queries/vss-enterprise-pg-metric.json b/public/configurations/queries/vss-enterprise-pg-metric.json index 8c64f4b3..e0f24895 100644 --- a/public/configurations/queries/vss-enterprise-pg-metric.json +++ b/public/configurations/queries/vss-enterprise-pg-metric.json @@ -25,16 +25,16 @@ "Prev 24": { "range": { "timestamp": { - "gte": "{{prevStartTime:now-48h}}", - "lte": "{{startTime:now-24h}}" + "gte": "now-48h", + "lte": "now-24h" } } }, "Last 24": { "range": { "timestamp": { - "gte": "{{startTime:now-24h}}", - "lte": "{{endTime:now}}" + "gte": "now-24h", + "lte": "now" } } } From ec2e2b217fd43f1e90ff19d711e672eb75461ddf Mon Sep 17 00:00:00 2001 From: Bharat Mukheja Date: Mon, 26 Nov 2018 05:41:07 -0800 Subject: [PATCH 2/8] http://mvjira.mv.usa.alcatel.com:8080/browse/VSD-27908 --- .../vss-top-domains-blocked-traffic.json | 41 ++++++++++--------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/public/configurations/queries/vss-top-domains-blocked-traffic.json b/public/configurations/queries/vss-top-domains-blocked-traffic.json index 57768a36..6d289e91 100644 --- a/public/configurations/queries/vss-top-domains-blocked-traffic.json +++ b/public/configurations/queries/vss-top-domains-blocked-traffic.json @@ -1,27 +1,27 @@ { - "id":"vss-topdomains-blocked-traffic", - "title":"Top Domains with Blocked Traffic", - "service":"elasticsearch", - "query":{ - "index":"{{index:nuage_flow}}", - "type":"{{type:nuage_doc_type}}", - "body":{ - "size":0, - "query":{ - "bool":{ - "must":[ + "id": "vss-topdomains-blocked-traffic", + "title": "Top Domains with Blocked Traffic", + "service": "elasticsearch", + "query": { + "index": "{{index:nuage_flow}}", + "type": "{{type:nuage_doc_type}}", + "body": { + "size": 0, + "query": { + "bool": { + "must": [ { - "range":{ - "timestamp":{ - "gte":"{{startTime:now-24h}}", - "lte":"{{endTime:now}}", - "format":"epoch_millis" + "range": { + "timestamp": { + "gte": "{{startTime:now-24h}}", + "lte": "{{endTime:now}}", + "format": "epoch_millis" } } }, { "term": { - "nuage_metadata.enterpriseName":"{{enterpriseName:chord_enterprise}}" + "nuage_metadata.enterpriseName": "{{enterpriseName:chord_enterprise}}" } }, { @@ -35,7 +35,10 @@ "aggs": { "domains": { "terms": { - "field": "nuage_metadata.domainName", + "script": { + "inline": "doc['nuage_metadata.l2domainName'].value ?: doc['nuage_metadata.domainName']", + "lang": "painless" + }, "size": 5, "order": { "SumOf": "desc" @@ -52,4 +55,4 @@ } } } -} +} \ No newline at end of file From b138801ef6464436cab48f622bf81b4f558fe8ec Mon Sep 17 00:00:00 2001 From: Bharat Mukheja Date: Mon, 26 Nov 2018 12:43:05 -0800 Subject: [PATCH 3/8] Corrected d3 format --- .../visualizations/vss-domain-flow-flow-metric.json | 2 +- .../visualizations/vss-enterprise-acldeny-metric.json | 2 +- .../visualizations/vss-enterprise-alerts-metric.json | 2 +- .../visualizations/vss-enterprise-events-metric.json | 2 +- .../configurations/visualizations/vss-enterprise-pg-metric.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/public/configurations/visualizations/vss-domain-flow-flow-metric.json b/public/configurations/visualizations/vss-domain-flow-flow-metric.json index 5ae0b122..cd3d93cf 100644 --- a/public/configurations/visualizations/vss-domain-flow-flow-metric.json +++ b/public/configurations/visualizations/vss-domain-flow-flow-metric.json @@ -10,7 +10,7 @@ "column": "timezones", "value": "Last 24", "field": "value", - "format": ",.4s" + "format": "s" } } } diff --git a/public/configurations/visualizations/vss-enterprise-acldeny-metric.json b/public/configurations/visualizations/vss-enterprise-acldeny-metric.json index 3081816e..9a741dd4 100644 --- a/public/configurations/visualizations/vss-enterprise-acldeny-metric.json +++ b/public/configurations/visualizations/vss-enterprise-acldeny-metric.json @@ -9,7 +9,7 @@ "column": "timezones", "value": "Last 24", "field": "doc_count", - "format": ",.4s" + "format": "s" } } } diff --git a/public/configurations/visualizations/vss-enterprise-alerts-metric.json b/public/configurations/visualizations/vss-enterprise-alerts-metric.json index 405d999d..b453d93e 100644 --- a/public/configurations/visualizations/vss-enterprise-alerts-metric.json +++ b/public/configurations/visualizations/vss-enterprise-alerts-metric.json @@ -9,7 +9,7 @@ "column": "timezones", "value": "Last 24", "field": "doc_count", - "format": ",.4s" + "format": "s" } } } diff --git a/public/configurations/visualizations/vss-enterprise-events-metric.json b/public/configurations/visualizations/vss-enterprise-events-metric.json index 3859e0e6..bb8247c4 100644 --- a/public/configurations/visualizations/vss-enterprise-events-metric.json +++ b/public/configurations/visualizations/vss-enterprise-events-metric.json @@ -9,7 +9,7 @@ "column": "timezones", "value": "Last 24", "field": "doc_count", - "format": ",.4s" + "format": "s" } } } diff --git a/public/configurations/visualizations/vss-enterprise-pg-metric.json b/public/configurations/visualizations/vss-enterprise-pg-metric.json index 9c4a0fcc..0bff7479 100644 --- a/public/configurations/visualizations/vss-enterprise-pg-metric.json +++ b/public/configurations/visualizations/vss-enterprise-pg-metric.json @@ -9,7 +9,7 @@ "column": "timezones", "value": "Last 24", "field": "value", - "format": ",.4s" + "format": "s" } } } From b4065859cb0782e5f560428204784455c297757d Mon Sep 17 00:00:00 2001 From: Bharat Mukheja Date: Mon, 26 Nov 2018 14:23:19 -0800 Subject: [PATCH 4/8] Fix for http://mvjira.mv.usa.alcatel.com:8080/browse/VSD-26102 --- public/configurations/queries/vss-domain-flow-table-pg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/configurations/queries/vss-domain-flow-table-pg.json b/public/configurations/queries/vss-domain-flow-table-pg.json index a793022f..89c6da3e 100644 --- a/public/configurations/queries/vss-domain-flow-table-pg.json +++ b/public/configurations/queries/vss-domain-flow-table-pg.json @@ -98,14 +98,14 @@ {"term": {"{{domainType:nuage_metadata.domainName}}": "{{domainName}}"} }, { "nested": { - "path": "{{destination_field:nuage_metadata.dst-pgmem-info}}", + "path": "{{destination_field:nuage_metadata.src-pgmem-info}}", "score_mode": "none", "query": { "bool": { "must": [ { "match": { - "{{source_field:nuage_metadata.dst-pgmem-info}}.name": "{{destination}}" + "{{source_field:nuage_metadata.src-pgmem-info}}.name": "{{destination}}" } } ] From 2ebdd24fd54f2fe3374c8792be84a8a7c0edf4eb Mon Sep 17 00:00:00 2001 From: Bharat Mukheja Date: Mon, 26 Nov 2018 16:05:50 -0800 Subject: [PATCH 5/8] Fix for http://mvjira.mv.usa.alcatel.com:8080/browse/VSD-27652 --- .../configurations/visualizations/vss-domain-events-detail.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/configurations/visualizations/vss-domain-events-detail.json b/public/configurations/visualizations/vss-domain-events-detail.json index bc0029ad..b7427127 100644 --- a/public/configurations/visualizations/vss-domain-events-detail.json +++ b/public/configurations/visualizations/vss-domain-events-detail.json @@ -14,5 +14,5 @@ { "column": "nuage_metadata.zoneName", "label": "Zone Name" } ] }, - "query": "vss-domain-events-detail" + "query": {"data":{"name":"vss-domain-events-detail","scroll":true}} } From 6315d60cb040b8d182e7d0834efa00c342f37414 Mon Sep 17 00:00:00 2001 From: Bharat Mukheja Date: Fri, 29 Mar 2019 15:54:54 -0700 Subject: [PATCH 6/8] Empty commit to test visualization-framework-build jenkins job From abfb05b1e9ca58ca7d2f5daa173419e9e7612451 Mon Sep 17 00:00:00 2001 From: Bharat Mukheja Date: Fri, 5 Apr 2019 10:06:22 -0700 Subject: [PATCH 7/8] Empty commit to test PR build on jenkins From fc656615391c2888e991dadc1af46f705e5e2359 Mon Sep 17 00:00:00 2001 From: Bharat Mukheja Date: Fri, 5 Apr 2019 12:45:46 -0700 Subject: [PATCH 8/8] 2nd Empty commit to test jenkins