refactor: overhaul ipv6 metrics on fluentd

Signed-off-by: Bence Csati <[email protected]>
kube-logging · Dec 18, 2024 · a182ecc · a182ecc
1 parent fb27b07
commit a182ecc
Show file tree

Hide file tree

Showing 23 changed files with 110 additions and 42 deletions.
diff --git a/...erator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentbitagents.yaml b/...erator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentbitagents.yaml
@@ -792,6 +792,8 @@ spec:
                 type: object
               bufferVolumeMetrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:
@@ -1167,8 +1169,6 @@ spec:
                 type: string
               enableUpstream:
                 type: boolean
-              enabledIPv6:
-                type: boolean
               envVars:
                 items:
                   properties:
@@ -1687,6 +1687,8 @@ spec:
                 type: string
               metrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:

diff --git a/...perator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentdconfigs.yaml b/...perator/charts/logging-operator-crds/templates/logging.banzaicloud.io_fluentdconfigs.yaml
@@ -782,6 +782,8 @@ spec:
                 type: object
               bufferVolumeMetrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:
@@ -1864,6 +1866,8 @@ spec:
                 type: string
               metrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:

diff --git a/...ging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml b/...ging-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_loggings.yaml
@@ -1637,6 +1637,8 @@ spec:
                     type: object
                   bufferVolumeMetrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:
@@ -2012,8 +2014,6 @@ spec:
                     type: string
                   enableUpstream:
                     type: boolean
-                  enabledIPv6:
-                    type: boolean
                   envVars:
                     items:
                       properties:
@@ -2532,6 +2532,8 @@ spec:
                     type: string
                   metrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:
@@ -4331,6 +4333,8 @@ spec:
                     type: object
                   bufferVolumeMetrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:
@@ -5413,6 +5417,8 @@ spec:
                     type: string
                   metrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:
@@ -11803,6 +11809,8 @@ spec:
                           type: string
                         metrics:
                           properties:
+                            enabledIPv6:
+                              type: boolean
                             interval:
                               type: string
                             path:
@@ -12627,6 +12635,8 @@ spec:
                 properties:
                   bufferVolumeMetrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       mount_name:
@@ -16677,6 +16687,8 @@ spec:
                     type: integer
                   metrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:

diff --git a/...ng-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_nodeagents.yaml b/...ng-operator/charts/logging-operator-crds/templates/logging.banzaicloud.io_nodeagents.yaml
@@ -4079,6 +4079,8 @@ spec:
                     type: string
                   metrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:

diff --git a/...erator/charts/logging-operator-crds/templates/logging.banzaicloud.io_syslogngconfigs.yaml b/...erator/charts/logging-operator-crds/templates/logging.banzaicloud.io_syslogngconfigs.yaml
@@ -33,6 +33,8 @@ spec:
             properties:
               bufferVolumeMetrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   mount_name:
@@ -4083,6 +4085,8 @@ spec:
                 type: integer
               metrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_fluentbitagents.yaml
@@ -789,6 +789,8 @@ spec:
                 type: object
               bufferVolumeMetrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:
@@ -1164,8 +1166,6 @@ spec:
                 type: string
               enableUpstream:
                 type: boolean
-              enabledIPv6:
-                type: boolean
               envVars:
                 items:
                   properties:
@@ -1684,6 +1684,8 @@ spec:
                 type: string
               metrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_fluentdconfigs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_fluentdconfigs.yaml
@@ -779,6 +779,8 @@ spec:
                 type: object
               bufferVolumeMetrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:
@@ -1861,6 +1863,8 @@ spec:
                 type: string
               metrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_loggings.yaml
@@ -1634,6 +1634,8 @@ spec:
                     type: object
                   bufferVolumeMetrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:
@@ -2009,8 +2011,6 @@ spec:
                     type: string
                   enableUpstream:
                     type: boolean
-                  enabledIPv6:
-                    type: boolean
                   envVars:
                     items:
                       properties:
@@ -2529,6 +2529,8 @@ spec:
                     type: string
                   metrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:
@@ -4328,6 +4330,8 @@ spec:
                     type: object
                   bufferVolumeMetrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:
@@ -5410,6 +5414,8 @@ spec:
                     type: string
                   metrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:
@@ -11800,6 +11806,8 @@ spec:
                           type: string
                         metrics:
                           properties:
+                            enabledIPv6:
+                              type: boolean
                             interval:
                               type: string
                             path:
@@ -12624,6 +12632,8 @@ spec:
                 properties:
                   bufferVolumeMetrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       mount_name:
@@ -16674,6 +16684,8 @@ spec:
                     type: integer
                   metrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_nodeagents.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_nodeagents.yaml
@@ -4076,6 +4076,8 @@ spec:
                     type: string
                   metrics:
                     properties:
+                      enabledIPv6:
+                        type: boolean
                       interval:
                         type: string
                       path:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngconfigs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngconfigs.yaml
@@ -30,6 +30,8 @@ spec:
             properties:
               bufferVolumeMetrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   mount_name:
@@ -4080,6 +4082,8 @@ spec:
                 type: integer
               metrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:

diff --git a/config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml b/config/crd/bases/logging.banzaicloud.io_fluentbitagents.yaml
@@ -789,6 +789,8 @@ spec:
                 type: object
               bufferVolumeMetrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:
@@ -1164,8 +1166,6 @@ spec:
                 type: string
               enableUpstream:
                 type: boolean
-              enabledIPv6:
-                type: boolean
               envVars:
                 items:
                   properties:
@@ -1684,6 +1684,8 @@ spec:
                 type: string
               metrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:

diff --git a/config/crd/bases/logging.banzaicloud.io_fluentdconfigs.yaml b/config/crd/bases/logging.banzaicloud.io_fluentdconfigs.yaml
@@ -779,6 +779,8 @@ spec:
                 type: object
               bufferVolumeMetrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path:
@@ -1861,6 +1863,8 @@ spec:
                 type: string
               metrics:
                 properties:
+                  enabledIPv6:
+                    type: boolean
                   interval:
                     type: string
                   path: