Bug 1791336: Fix fluent metrics config to support ipv6

jcantrill · Jan 16, 2020 · 1473937 · 1473937
1 parent 549ddc5
commit 1473937
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/pkg/generators/forwarding/fluentd/fluent_conf_test.go b/pkg/generators/forwarding/fluentd/fluent_conf_test.go
@@ -108,6 +108,7 @@ var _ = Describe("Generating fluentd config", func() {
 			## ordered so that syslog always runs last...
 			<source>
 				@type prometheus
+                bind '::'
 				<ssl>
 					enable true
 					certificate_path "#{ENV['METRICS_CERT'] || '/etc/fluent/metrics/tls.crt'}"
@@ -448,6 +449,7 @@ var _ = Describe("Generating fluentd config", func() {
 			## ordered so that syslog always runs last...
 			<source>
 				@type prometheus
+                bind '::'
 				<ssl>
 					enable true
 					certificate_path "#{ENV['METRICS_CERT'] || '/etc/fluent/metrics/tls.crt'}"

diff --git a/pkg/generators/forwarding/fluentd/templates.go b/pkg/generators/forwarding/fluentd/templates.go
@@ -32,6 +32,7 @@ const fluentConfTemplate = `{{- define "fluentConf" }}
 ## ordered so that syslog always runs last...
 <source>
   @type prometheus
+  bind '::'
   <ssl>
     enable true
     certificate_path "#{ENV['METRICS_CERT'] || '/etc/fluent/metrics/tls.crt'}"

diff --git a/scripts/cert_generation.sh b/scripts/cert_generation.sh
@@ -226,7 +226,7 @@ function generate_extensions() {
   local use_comma=0
 
   if [ "$add_localhost" == "true" ]; then
-    extension_names="IP.1:127.0.0.1,DNS.1:localhost"
+    extension_names="IP.1:127.0.0.1,IP.2:0:0:0:0:0:0:0:1,DNS.1:localhost"
     extension_index=2
     use_comma=1
   fi