Move elasticsearch scheme to defaults
Change-Id: I107b6f3290878bb9e5c91075544f96a45d075f43
PROD-related: PROD-30527
diff --git a/defaults/stacklight.yml b/defaults/stacklight.yml
index e969319..625d20c 100644
--- a/defaults/stacklight.yml
+++ b/defaults/stacklight.yml
@@ -1,9 +1,10 @@
parameters:
_param:
# ELK settings
- stacklight_elasticsearch_port: 9200
stacklight_notification_topic: stacklight_notifications
-
+ fluentd_elasticsearch_host: 127.0.0.1
+ fluentd_elasticsearch_port: 9200
+ fluentd_elasticsearch_scheme: http
# ELK stack versions
elasticsearch_version: 5
kibana_version: 5
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}
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
diff --git a/fluentd/label/notifications/audit.yml b/fluentd/label/notifications/audit.yml
index 49ea953..f0cabaa 100644
--- a/fluentd/label/notifications/audit.yml
+++ b/fluentd/label/notifications/audit.yml
@@ -43,7 +43,8 @@
audit_output:
tag: audit
type: elasticsearch
- host: ${_param:stacklight_log_address}
- port: ${_param:stacklight_elasticsearch_port}
+ host: ${_param:fluentd_elasticsearch_host}
+ port: ${_param:fluentd_elasticsearch_port}
+ scheme: ${_param:fluentd_elasticsearch_scheme}
es_index_name: audit
tag_key: Type
diff --git a/fluentd/label/notifications/notifications.yml b/fluentd/label/notifications/notifications.yml
index 22be3c6..7d1e5c6 100644
--- a/fluentd/label/notifications/notifications.yml
+++ b/fluentd/label/notifications/notifications.yml
@@ -116,7 +116,8 @@
notifications_output:
tag: notification
type: elasticsearch
- host: ${_param:stacklight_log_address}
- port: ${_param:stacklight_elasticsearch_port}
+ host: ${_param:fluentd_elasticsearch_host}
+ port: ${_param:fluentd_elasticsearch_port}
+ scheme: ${_param:fluentd_elasticsearch_scheme}
es_index_name: notification
tag_key: Type