Merge branch 'production' of gitlab.stud.idi.ntnu.no:puppet/control-repo

logstash/config/30-elasticsearch-output.conf

+output {
+  if [@metadata][pipeline] {
+    elasticsearch {
+    hosts => ["localhost:9200"]
+    manage_template => false
+    index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}"
+    pipeline => "%{[@metadata][pipeline]}"
+    }
+  } else {
+    elasticsearch {
+    hosts => ["localhost:9200"]
+    manage_template => false
+    index => "%{[@metadata][beat]}-%{[@metadata][version]}-%{+YYYY.MM.dd}"
+    }
+  }
+}