From d5879135f077e4aaaa09c8e4ebf5d9ef2a063a78 Mon Sep 17 00:00:00 2001
From: Eric Wolinetz <ewolinet@redhat.com>
Date: Fri, 5 Jan 2018 11:06:43 -0600
Subject: Adding support for ES 5.x tech preview opt in

---
 roles/openshift_logging_mux/files/2.x/fluent.conf  | 37 ++++++++++++++++++++++
 .../files/2.x/secure-forward.conf                  | 26 +++++++++++++++
 roles/openshift_logging_mux/files/5.x/fluent.conf  | 37 ++++++++++++++++++++++
 .../files/5.x/secure-forward.conf                  | 26 +++++++++++++++
 roles/openshift_logging_mux/files/fluent.conf      | 37 ----------------------
 .../files/secure-forward.conf                      | 26 ---------------
 6 files changed, 126 insertions(+), 63 deletions(-)
 create mode 100644 roles/openshift_logging_mux/files/2.x/fluent.conf
 create mode 100644 roles/openshift_logging_mux/files/2.x/secure-forward.conf
 create mode 100644 roles/openshift_logging_mux/files/5.x/fluent.conf
 create mode 100644 roles/openshift_logging_mux/files/5.x/secure-forward.conf
 delete mode 100644 roles/openshift_logging_mux/files/fluent.conf
 delete mode 100644 roles/openshift_logging_mux/files/secure-forward.conf

(limited to 'roles/openshift_logging_mux/files')

diff --git a/roles/openshift_logging_mux/files/2.x/fluent.conf b/roles/openshift_logging_mux/files/2.x/fluent.conf
new file mode 100644
index 000000000..bf61c9811
--- /dev/null
+++ b/roles/openshift_logging_mux/files/2.x/fluent.conf
@@ -0,0 +1,37 @@
+# This file is the fluentd configuration entrypoint. Edit with care.
+
+@include configs.d/openshift/system.conf
+
+# In each section below, pre- and post- includes don't include anything initially;
+# they exist to enable future additions to openshift conf as needed.
+
+## sources
+## ordered so that syslog always runs last...
+@include configs.d/openshift/input-pre-*.conf
+@include configs.d/dynamic/input-docker-*.conf
+@include configs.d/dynamic/input-syslog-*.conf
+@include configs.d/openshift/input-post-*.conf
+##
+
+<label @INGRESS>
+## filters
+  @include configs.d/openshift/filter-pre-*.conf
+  @include configs.d/openshift/filter-retag-journal.conf
+  @include configs.d/openshift/filter-k8s-meta.conf
+  @include configs.d/openshift/filter-kibana-transform.conf
+  @include configs.d/openshift/filter-k8s-flatten-hash.conf
+  @include configs.d/openshift/filter-k8s-record-transform.conf
+  @include configs.d/openshift/filter-syslog-record-transform.conf
+  @include configs.d/openshift/filter-viaq-data-model.conf
+  @include configs.d/openshift/filter-post-*.conf
+##
+</label>
+
+<label @OUTPUT>
+## matches
+  @include configs.d/openshift/output-pre-*.conf
+  @include configs.d/openshift/output-operations.conf
+  @include configs.d/openshift/output-applications.conf
+  # no post - applications.conf matches everything left
+##
+</label>
diff --git a/roles/openshift_logging_mux/files/2.x/secure-forward.conf b/roles/openshift_logging_mux/files/2.x/secure-forward.conf
new file mode 100644
index 000000000..87410c1c5
--- /dev/null
+++ b/roles/openshift_logging_mux/files/2.x/secure-forward.conf
@@ -0,0 +1,26 @@
+# <store>
+# @type secure_forward
+
+# self_hostname ${HOSTNAME}
+# shared_key <SECRET_STRING>
+
+# secure yes
+# enable_strict_verification yes
+
+# ca_cert_path /etc/fluent/keys/your_ca_cert
+# ca_private_key_path /etc/fluent/keys/your_private_key
+  # for private CA secret key
+# ca_private_key_passphrase passphrase
+
+# <server>
+  # or IP
+#   host server.fqdn.example.com
+#   port 24284
+# </server>
+# <server>
+  # ip address to connect
+#   host 203.0.113.8
+  # specify hostlabel for FQDN verification if ipaddress is used for host
+#   hostlabel server.fqdn.example.com
+# </server>
+# </store>
diff --git a/roles/openshift_logging_mux/files/5.x/fluent.conf b/roles/openshift_logging_mux/files/5.x/fluent.conf
new file mode 100644
index 000000000..bf61c9811
--- /dev/null
+++ b/roles/openshift_logging_mux/files/5.x/fluent.conf
@@ -0,0 +1,37 @@
+# This file is the fluentd configuration entrypoint. Edit with care.
+
+@include configs.d/openshift/system.conf
+
+# In each section below, pre- and post- includes don't include anything initially;
+# they exist to enable future additions to openshift conf as needed.
+
+## sources
+## ordered so that syslog always runs last...
+@include configs.d/openshift/input-pre-*.conf
+@include configs.d/dynamic/input-docker-*.conf
+@include configs.d/dynamic/input-syslog-*.conf
+@include configs.d/openshift/input-post-*.conf
+##
+
+<label @INGRESS>
+## filters
+  @include configs.d/openshift/filter-pre-*.conf
+  @include configs.d/openshift/filter-retag-journal.conf
+  @include configs.d/openshift/filter-k8s-meta.conf
+  @include configs.d/openshift/filter-kibana-transform.conf
+  @include configs.d/openshift/filter-k8s-flatten-hash.conf
+  @include configs.d/openshift/filter-k8s-record-transform.conf
+  @include configs.d/openshift/filter-syslog-record-transform.conf
+  @include configs.d/openshift/filter-viaq-data-model.conf
+  @include configs.d/openshift/filter-post-*.conf
+##
+</label>
+
+<label @OUTPUT>
+## matches
+  @include configs.d/openshift/output-pre-*.conf
+  @include configs.d/openshift/output-operations.conf
+  @include configs.d/openshift/output-applications.conf
+  # no post - applications.conf matches everything left
+##
+</label>
diff --git a/roles/openshift_logging_mux/files/5.x/secure-forward.conf b/roles/openshift_logging_mux/files/5.x/secure-forward.conf
new file mode 100644
index 000000000..87410c1c5
--- /dev/null
+++ b/roles/openshift_logging_mux/files/5.x/secure-forward.conf
@@ -0,0 +1,26 @@
+# <store>
+# @type secure_forward
+
+# self_hostname ${HOSTNAME}
+# shared_key <SECRET_STRING>
+
+# secure yes
+# enable_strict_verification yes
+
+# ca_cert_path /etc/fluent/keys/your_ca_cert
+# ca_private_key_path /etc/fluent/keys/your_private_key
+  # for private CA secret key
+# ca_private_key_passphrase passphrase
+
+# <server>
+  # or IP
+#   host server.fqdn.example.com
+#   port 24284
+# </server>
+# <server>
+  # ip address to connect
+#   host 203.0.113.8
+  # specify hostlabel for FQDN verification if ipaddress is used for host
+#   hostlabel server.fqdn.example.com
+# </server>
+# </store>
diff --git a/roles/openshift_logging_mux/files/fluent.conf b/roles/openshift_logging_mux/files/fluent.conf
deleted file mode 100644
index bf61c9811..000000000
--- a/roles/openshift_logging_mux/files/fluent.conf
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file is the fluentd configuration entrypoint. Edit with care.
-
-@include configs.d/openshift/system.conf
-
-# In each section below, pre- and post- includes don't include anything initially;
-# they exist to enable future additions to openshift conf as needed.
-
-## sources
-## ordered so that syslog always runs last...
-@include configs.d/openshift/input-pre-*.conf
-@include configs.d/dynamic/input-docker-*.conf
-@include configs.d/dynamic/input-syslog-*.conf
-@include configs.d/openshift/input-post-*.conf
-##
-
-<label @INGRESS>
-## filters
-  @include configs.d/openshift/filter-pre-*.conf
-  @include configs.d/openshift/filter-retag-journal.conf
-  @include configs.d/openshift/filter-k8s-meta.conf
-  @include configs.d/openshift/filter-kibana-transform.conf
-  @include configs.d/openshift/filter-k8s-flatten-hash.conf
-  @include configs.d/openshift/filter-k8s-record-transform.conf
-  @include configs.d/openshift/filter-syslog-record-transform.conf
-  @include configs.d/openshift/filter-viaq-data-model.conf
-  @include configs.d/openshift/filter-post-*.conf
-##
-</label>
-
-<label @OUTPUT>
-## matches
-  @include configs.d/openshift/output-pre-*.conf
-  @include configs.d/openshift/output-operations.conf
-  @include configs.d/openshift/output-applications.conf
-  # no post - applications.conf matches everything left
-##
-</label>
diff --git a/roles/openshift_logging_mux/files/secure-forward.conf b/roles/openshift_logging_mux/files/secure-forward.conf
deleted file mode 100644
index 87410c1c5..000000000
--- a/roles/openshift_logging_mux/files/secure-forward.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-# <store>
-# @type secure_forward
-
-# self_hostname ${HOSTNAME}
-# shared_key <SECRET_STRING>
-
-# secure yes
-# enable_strict_verification yes
-
-# ca_cert_path /etc/fluent/keys/your_ca_cert
-# ca_private_key_path /etc/fluent/keys/your_private_key
-  # for private CA secret key
-# ca_private_key_passphrase passphrase
-
-# <server>
-  # or IP
-#   host server.fqdn.example.com
-#   port 24284
-# </server>
-# <server>
-  # ip address to connect
-#   host 203.0.113.8
-  # specify hostlabel for FQDN verification if ipaddress is used for host
-#   hostlabel server.fqdn.example.com
-# </server>
-# </store>
-- 
cgit v1.2.1