diff --git a/pkg/generators/forwarding/fluentd/fluent_conf_test.go b/pkg/generators/forwarding/fluentd/fluent_conf_test.go index 8a185c9b89..2792a8461f 100644 --- a/pkg/generators/forwarding/fluentd/fluent_conf_test.go +++ b/pkg/generators/forwarding/fluentd/fluent_conf_test.go @@ -952,6 +952,7 @@ var _ = Describe("Generating fluentd config", func() { client_cert '/var/run/ocp-collector/secrets/my-infra-secret/tls.crt' ca_file '/var/run/ocp-collector/secrets/my-infra-secret/ca-bundle.crt' type_name _doc + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after @@ -997,6 +998,7 @@ var _ = Describe("Generating fluentd config", func() { ca_file '/var/run/ocp-collector/secrets/my-infra-secret/ca-bundle.crt' type_name _doc retry_tag retry_infra_es + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after @@ -1043,6 +1045,7 @@ var _ = Describe("Generating fluentd config", func() { client_cert '/var/run/ocp-collector/secrets/my-es-secret/tls.crt' ca_file '/var/run/ocp-collector/secrets/my-es-secret/ca-bundle.crt' type_name _doc + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after @@ -1088,6 +1091,7 @@ var _ = Describe("Generating fluentd config", func() { ca_file '/var/run/ocp-collector/secrets/my-es-secret/ca-bundle.crt' type_name _doc retry_tag retry_apps_es_1 + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after @@ -1134,6 +1138,7 @@ var _ = Describe("Generating fluentd config", func() { client_cert '/var/run/ocp-collector/secrets/my-other-secret/tls.crt' ca_file '/var/run/ocp-collector/secrets/my-other-secret/ca-bundle.crt' type_name _doc + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after @@ -1179,6 +1184,7 @@ var _ = Describe("Generating fluentd config", func() { ca_file '/var/run/ocp-collector/secrets/my-other-secret/ca-bundle.crt' type_name _doc retry_tag retry_apps_es_2 + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after @@ -1225,6 +1231,7 @@ var _ = Describe("Generating fluentd config", func() { client_cert '/var/run/ocp-collector/secrets/my-audit-secret/tls.crt' ca_file '/var/run/ocp-collector/secrets/my-audit-secret/ca-bundle.crt' type_name _doc + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after @@ -1270,6 +1277,7 @@ var _ = Describe("Generating fluentd config", func() { ca_file '/var/run/ocp-collector/secrets/my-audit-secret/ca-bundle.crt' type_name _doc retry_tag retry_audit_es + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after diff --git a/pkg/generators/forwarding/fluentd/output_conf_es_test.go b/pkg/generators/forwarding/fluentd/output_conf_es_test.go index 732dc77d28..0a900f57c2 100644 --- a/pkg/generators/forwarding/fluentd/output_conf_es_test.go +++ b/pkg/generators/forwarding/fluentd/output_conf_es_test.go @@ -84,6 +84,7 @@ var _ = Describe("Generating fluentd config blocks", func() { client_cert '/var/run/ocp-collector/secrets/my-es-secret/tls.crt' ca_file '/var/run/ocp-collector/secrets/my-es-secret/ca-bundle.crt' type_name _doc + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after @@ -129,6 +130,7 @@ var _ = Describe("Generating fluentd config blocks", func() { ca_file '/var/run/ocp-collector/secrets/my-es-secret/ca-bundle.crt' type_name _doc retry_tag retry_oncluster_elasticsearch + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after @@ -188,6 +190,7 @@ var _ = Describe("Generating fluentd config blocks", func() { password changeme type_name _doc + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after @@ -229,6 +232,7 @@ var _ = Describe("Generating fluentd config blocks", func() { type_name _doc retry_tag retry_other_elasticsearch + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after diff --git a/pkg/generators/forwarding/fluentd/templates.go b/pkg/generators/forwarding/fluentd/templates.go index f7de35f1c2..7fd834a592 100644 --- a/pkg/generators/forwarding/fluentd/templates.go +++ b/pkg/generators/forwarding/fluentd/templates.go @@ -605,6 +605,7 @@ const storeElasticsearchTemplate = `{{ define "storeElasticsearch" -}} {{- if .Hints.Has "include_retry_tag" }} retry_tag {{.RetryTag}} {{- end }} + http_backend typhoeus write_operation create reload_connections "#{ENV['ES_RELOAD_CONNECTIONS'] || 'true'}" # https://github.com/uken/fluent-plugin-elasticsearch#reload-after diff --git a/test/e2e/collection/cleanup.sh b/test/e2e/collection/cleanup.sh old mode 100644 new mode 100755