Skip to content

[release-4.5] Bug 1899419: Add keep-alive backend for elasticsearch store #805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 23, 2020
Merged

[release-4.5] Bug 1899419: Add keep-alive backend for elasticsearch store #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d55c14
Bug 1899419: Add keep-alive backend for elasticsearch store
openshift-merge-robot Nov 20, 2020
bbad2bc
Fix cleanup execution rights for CI
periklis Dec 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pkg/generators/forwarding/fluentd/fluent_conf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions pkg/generators/forwarding/fluentd/output_conf_es_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions pkg/generators/forwarding/fluentd/templates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Empty file modified test/e2e/collection/cleanup.sh
100644 → 100755
View file
Open in desktop
Empty file.