From: Alexis de Talhouët <alexis.de_talhouet@bell.ca>
Date: Tue, 8 Jan 2019 14:12:09 +0000 (+0000)
Subject: Merge "update policy-distribution to enable https" into casablanca
X-Git-Tag: 3.0.1-ONAP~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=99c9c7ad6a04c473e6bd51f75c6afbd970c9bbc3;hp=846d2e58c75e5bf0a0857752c928943d33c56711;p=oom.git

Merge "update policy-distribution to enable https" into casablanca
---

diff --git a/kubernetes/clamp/charts/clamp-dash-logstash/resources/config/pipeline.conf b/kubernetes/clamp/charts/clamp-dash-logstash/resources/config/pipeline.conf
index 317b428c77..78ca65a3c2 100644
--- a/kubernetes/clamp/charts/clamp-dash-logstash/resources/config/pipeline.conf
+++ b/kubernetes/clamp/charts/clamp-dash-logstash/resources/config/pipeline.conf
@@ -57,13 +57,13 @@ filter {
         drop { }
     }
 
-    if [http_request_failure] or [@metadata][code] != "200" {
+    if [http_request_failure] or [@metadata][code] != 200 {
        mutate {
        	   add_tag => [ "error" ]
        }
     }
 
-    if "dmaap_source" in [tags] {
+    if "dmaap_source" in [@metadata][request][tags] {
         #
         # Dmaap provides a json list, whose items are Strings containing the event
         # provided to Dmaap, which itself is an escaped json.
@@ -76,13 +76,26 @@ filter {
             source => "[message]"
             target => "message"
         }
-        ruby {
-            code => "
-            for ev in event.get('message', [])
-                ev.set('@metadata', event.get('@metadata'))
-            end
-            "
-        }
+#        ruby {
+#            code => '
+#            require "json"
+#            puts "\n======================================= MESSAGE"
+#            print event.get("message")
+#            puts "\n======================================= METADATA"
+#            print event.get("@metadata")
+#            puts ""
+#
+#
+#            for ev in event.get("message")
+#                puts "\n======================================= PARSED JSON EV"
+#                print JSON.parse(ev)
+#                puts "\n======================================= JSON EV"
+#                print JSON.parse(ev).get("@metadata")
+#                puts ""
+#                ev.set("[@metadata]", event.get("@metadata"))
+#            end
+#            '
+ #       }
     	
         split {
             field => "message"
@@ -194,7 +207,7 @@ filter {
     }
 
 
-    if "error" not in [tags] {
+    if "error" not in [@metadata][request][tags]{
         #
         # Creating data for a secondary index
         #
@@ -203,7 +216,7 @@ filter {
             add_tag => [ "event-cl-aggs" ]
         }
         
-        if  "event-cl-aggs" in [tags] {
+        if  "event-cl-aggs" in [@metadata][request][tags]{
             #
             # we only need a few fields for aggregations; remove all fields from clone except :
             #   vmName,vnfName,vnfType,requestID,closedLoopAlarmStart, closedLoopControlName,closedLoopAlarmEnd,abated,nbrDmaapevents,finalFailure