commit 23307746d72bb0cafbb6be205a163988b9ba636c
author Dmitry Kalashnik <dkalashnik@mirantis.com> Thu May 23 16:47:18 2019 +0400
committer Dmitry Kalashnik <dkalashnik@mirantis.com> Thu May 23 18:29:40 2019 +0400
tree 74fe6422f1f7fdbe76e0dd71157bcaa9897f577c
parent 507c4b2a8c340f7ede6b2d3ec5b1855902fb6732

Move elasticsearch scheme to defaults

Change-Id: I107b6f3290878bb9e5c91075544f96a45d075f43
PROD-related: PROD-30527

fluentd/label/default_output/elasticsearch.yml

diff --git a/fluentd/label/default_output/elasticsearch.yml b/fluentd/label/default_output/elasticsearch.yml
index 398ea8c..daf95dd 100644
--- a/fluentd/label/default_output/elasticsearch.yml
+++ b/fluentd/label/default_output/elasticsearch.yml
@@ -2,9 +2,6 @@
 - service.fluentd.agent.output.elasticsearch
 - system.fluentd.label.default_output.filter.common
 parameters:
-  _param:
-    fluentd_elasticsearch_host: 127.0.0.1
-    elasticsearch_port: 9200
   fluentd:
     agent:
       config:
@@ -13,4 +10,5 @@
             match:
               elasticsearch_output:
                 host: ${_param:fluentd_elasticsearch_host}
-                port: ${_param:elasticsearch_port}
+                port: ${_param:fluentd_elasticsearch_port}
+                scheme: ${_param:fluentd_elasticsearch_scheme}

fluentd/label/default_output/elasticsearch_ssl.yml

diff --git a/fluentd/label/default_output/elasticsearch_ssl.yml b/fluentd/label/default_output/elasticsearch_ssl.yml
deleted file mode 100644
index da3a5a7..0000000
--- a/fluentd/label/default_output/elasticsearch_ssl.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-parameters:
-  fluentd:
-    agent:
-      config:
-        label:
-          default_output:
-            match:
-              elasticsearch_output:
-                scheme: https