From: mcp-jenkins <mcp-jenkins@mirantis.com>
Date: Wed, 22 Nov 2017 21:45:33 +0000 (+0000)
Subject: Merge "Add a possibility to deploy Elasticsearch 5.x version"
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=commitdiff_plain;h=25d7a3bfa4f441fa0c1cac00784d9c0af5fa1bc1;hp=15e62f813461d519da6e766f72f60f9a07fb6628

Merge "Add a possibility to deploy Elasticsearch 5.x version"
---

diff --git a/elasticsearch/meta/fluentd.yml b/elasticsearch/meta/fluentd.yml
new file mode 100644
index 0000000..29d9914
--- /dev/null
+++ b/elasticsearch/meta/fluentd.yml
@@ -0,0 +1,45 @@
+config:
+  label:
+    elasticsearch:
+      input:
+        tail_elasticsearch:
+          type: tail
+          tag: elasticsearch.general
+          path: /var/log/elasticsearch/elasticsearch.log
+          pos_file: /tmp/elasticsearch.general.pos
+          format: '/^\[(?<time>[^ ]* [^ ]*)\]\[(?<severity_label>[^ ]*) *?\]\[([^ ]*) *\] \[([^\]]*) *\] (?<Payload>.+)/'
+        tail_elasticsearch_deprecation:
+          type: tail
+          tag: elasticsearch.deprecation
+          path: /var/log/elasticsearch/elasticsearch_deprecation.log
+          pos_file: /tmp/elasticsearch.deprecation.pos
+          format: '/^\[(?<time>[^ ]* [^ ]*)\]\[(?<severity_label>[^ ]*) *?\]\[([^ ]*) *\] (?<Payload>.+)/'
+        tail_elasticsearch_index_indexing_slowlog:
+          type: tail
+          tag: elasticsearch.slowlog.indexing
+          path: /var/log/elasticsearch/elasticsearch_index_indexing_slowlog.log
+          pos_file: /tmp/elasticsearch.slowlog.indexing.pos
+          format: '/^\[(?<time>[^ ]* [^ ]*)\]\[(?<severity_label>[^ ]*) *?\]\[([^ ]*) *\] (?<Payload>.+)/'
+        tail_elasticsearch_index_search_slowlog:
+          type: tail
+          tag: elasticsearch.slowlog.search
+          path: /var/log/elasticsearch/elasticsearch_index_search_slowlog.log
+          pos_file: /tmp/elasticsearch.slowlog.search.pos
+          format: '/^\[(?<time>[^ ]* [^ ]*)\]\[(?<severity_label>[^ ]*) *?\]\[([^ ]*) *\] (?<Payload>.+)/'
+      filter:
+        match_severity:
+          type: record_transformer
+          tag: elasticsearch.**
+          enable_ruby: true
+          record:
+            - name: programname
+              value: elasticsearch
+            - name: Severity
+              value: ${ {"WARN"=>4,"INFO"=>6,"DEBUG"=>7,"TRACE"=>7}[record["severity_label"]] }
+            - name: severity_label
+              value: ${ {"WARN"=>"WARNING","INFO"=>"INFO","DEBUG"=>"DEBUG","TRACE"=>"TRACE"}[record["severity_label"]] }
+      match:
+        push_to_default:
+          tag: elasticsearch.**
+          type: relabel
+          label: default_output
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 4e2c98a..7140e23 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -15,3 +15,5 @@ parameters:
         enabled: true
       prometheus:
         enabled: true
+      fluentd:
+        enabled: true