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 317b428..78ca65a 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 @@
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 @@
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 @@
}
- if "error" not in [tags] {
+ if "error" not in [@metadata][request][tags]{
#
# Creating data for a secondary index
#
@@ -203,7 +216,7 @@
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