Merge pull request openshift#1228 from jcantrill/log1862

LOG-1862: Use correct keys for kafka username/password
pmoogi-redhat · Oct 25, 2021 · c874faa · c874faa
2 parents 8ba6f62 + 1234beb
commit c874faa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/internal/generator/fluentd/output/kafka/kafka_test.go b/internal/generator/fluentd/output/kafka/kafka_test.go
@@ -58,8 +58,8 @@ var _ = Describe("Generate fluentd config", func() {
     brokers broker1-kafka.svc.messaging.cluster.local:9092
     default_topic build_complete
     use_event_time true
-    sasl_plain_username "#{File.exists?('/var/run/ocp-collector/secrets/kafka-receiver-1/username') ? open('/var/run/ocp-collector/secrets/kafka-receiver-1/username','r') do |f|f.read end : ''}"
-    sasl_plain_password "#{File.exists?('/var/run/ocp-collector/secrets/kafka-receiver-1/password') ? open('/var/run/ocp-collector/secrets/kafka-receiver-1/password','r') do |f|f.read end : ''}"
+    username "#{File.exists?('/var/run/ocp-collector/secrets/kafka-receiver-1/username') ? open('/var/run/ocp-collector/secrets/kafka-receiver-1/username','r') do |f|f.read end : ''}"
+    password "#{File.exists?('/var/run/ocp-collector/secrets/kafka-receiver-1/password') ? open('/var/run/ocp-collector/secrets/kafka-receiver-1/password','r') do |f|f.read end : ''}"
     sasl_over_ssl false
     <format>
       @type json

diff --git a/internal/generator/fluentd/output/kafka/userpass.go b/internal/generator/fluentd/output/kafka/userpass.go
@@ -12,8 +12,8 @@ func (up UserNamePass) Name() string {
 
 func (up UserNamePass) Template() string {
 	return `{{define "` + up.Name() + `" -}}
-sasl_plain_username "#{File.exists?({{.UsernamePath}}) ? open({{.UsernamePath}},'r') do |f|f.read end : ''}"
-sasl_plain_password "#{File.exists?({{.PasswordPath}}) ? open({{.PasswordPath}},'r') do |f|f.read end : ''}"
+username "#{File.exists?({{.UsernamePath}}) ? open({{.UsernamePath}},'r') do |f|f.read end : ''}"
+password "#{File.exists?({{.PasswordPath}}) ? open({{.PasswordPath}},'r') do |f|f.read end : ''}"
 {{- end}}
 `
 }