Merge pull request #1569 from kube-logging/strings-cherry-pick

Pick fix for #1555
kube-logging · Nov 2, 2023 · 6636837 · 6636837
2 parents 83dfca7 + 88124c7
commit 6636837
Show file tree

Hide file tree

Showing 24 changed files with 133 additions and 882 deletions.
diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusteroutputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusteroutputs.yaml
@@ -1130,7 +1130,6 @@ spec:
                   time_reopen:
                     type: integer
                   timestamp:
-                    default: current
                     enum:
                     - current
                     - received
@@ -1227,31 +1226,20 @@ spec:
                   value_pairs:
                     properties:
                       exclude:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       key:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       pair:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       scope:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
-                    type: object
-                  write_concern:
-                    properties:
-                      raw_string:
                         type: string
                     type: object
+                  write_concern:
+                    enum:
+                    - unacked
+                    - acked
+                    - majority
+                    type: string
                 required:
                 - collection
                 type: object
@@ -1417,10 +1405,7 @@ spec:
                   object_key:
                     type: string
                   object_key_timestamp:
-                    properties:
-                      raw_string:
-                        type: string
-                    type: object
+                    type: string
                   persist_name:
                     type: string
                   region:
@@ -1463,10 +1448,7 @@ spec:
                   storage_class:
                     type: string
                   template:
-                    properties:
-                      raw_string:
-                        type: string
-                    type: object
+                    type: string
                   throttle:
                     type: integer
                   upload_threads:

diff --git a/charts/logging-operator/crds/logging.banzaicloud.io_syslogngoutputs.yaml b/charts/logging-operator/crds/logging.banzaicloud.io_syslogngoutputs.yaml
@@ -1126,7 +1126,6 @@ spec:
                   time_reopen:
                     type: integer
                   timestamp:
-                    default: current
                     enum:
                     - current
                     - received
@@ -1223,31 +1222,20 @@ spec:
                   value_pairs:
                     properties:
                       exclude:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       key:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       pair:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       scope:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
-                    type: object
-                  write_concern:
-                    properties:
-                      raw_string:
                         type: string
                     type: object
+                  write_concern:
+                    enum:
+                    - unacked
+                    - acked
+                    - majority
+                    type: string
                 required:
                 - collection
                 type: object
@@ -1413,10 +1401,7 @@ spec:
                   object_key:
                     type: string
                   object_key_timestamp:
-                    properties:
-                      raw_string:
-                        type: string
-                    type: object
+                    type: string
                   persist_name:
                     type: string
                   region:
@@ -1459,10 +1444,7 @@ spec:
                   storage_class:
                     type: string
                   template:
-                    properties:
-                      raw_string:
-                        type: string
-                    type: object
+                    type: string
                   throttle:
                     type: integer
                   upload_threads:

diff --git a/config/crd/bases/logging.banzaicloud.io_syslogngclusteroutputs.yaml b/config/crd/bases/logging.banzaicloud.io_syslogngclusteroutputs.yaml
@@ -1130,7 +1130,6 @@ spec:
                   time_reopen:
                     type: integer
                   timestamp:
-                    default: current
                     enum:
                     - current
                     - received
@@ -1227,31 +1226,20 @@ spec:
                   value_pairs:
                     properties:
                       exclude:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       key:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       pair:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       scope:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
-                    type: object
-                  write_concern:
-                    properties:
-                      raw_string:
                         type: string
                     type: object
+                  write_concern:
+                    enum:
+                    - unacked
+                    - acked
+                    - majority
+                    type: string
                 required:
                 - collection
                 type: object
@@ -1417,10 +1405,7 @@ spec:
                   object_key:
                     type: string
                   object_key_timestamp:
-                    properties:
-                      raw_string:
-                        type: string
-                    type: object
+                    type: string
                   persist_name:
                     type: string
                   region:
@@ -1463,10 +1448,7 @@ spec:
                   storage_class:
                     type: string
                   template:
-                    properties:
-                      raw_string:
-                        type: string
-                    type: object
+                    type: string
                   throttle:
                     type: integer
                   upload_threads:

diff --git a/config/crd/bases/logging.banzaicloud.io_syslogngoutputs.yaml b/config/crd/bases/logging.banzaicloud.io_syslogngoutputs.yaml
@@ -1126,7 +1126,6 @@ spec:
                   time_reopen:
                     type: integer
                   timestamp:
-                    default: current
                     enum:
                     - current
                     - received
@@ -1223,31 +1222,20 @@ spec:
                   value_pairs:
                     properties:
                       exclude:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       key:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       pair:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
+                        type: string
                       scope:
-                        properties:
-                          raw_string:
-                            type: string
-                        type: object
-                    type: object
-                  write_concern:
-                    properties:
-                      raw_string:
                         type: string
                     type: object
+                  write_concern:
+                    enum:
+                    - unacked
+                    - acked
+                    - majority
+                    type: string
                 required:
                 - collection
                 type: object
@@ -1413,10 +1401,7 @@ spec:
                   object_key:
                     type: string
                   object_key_timestamp:
-                    properties:
-                      raw_string:
-                        type: string
-                    type: object
+                    type: string
                   persist_name:
                     type: string
                   region:
@@ -1459,10 +1444,7 @@ spec:
                   storage_class:
                     type: string
                   template:
-                    properties:
-                      raw_string:
-                        type: string
-                    type: object
+                    type: string
                   throttle:
                     type: integer
                   upload_threads:

diff --git a/docs/configuration/plugins/syslogng-outputs/mongodb.md b/docs/configuration/plugins/syslogng-outputs/mongodb.md
@@ -144,10 +144,3 @@ Default: -
 Default: -
 
 
-## RawString
-
-### raw_string (string, optional) {#rawstring-raw_string}
-
-Default: -
-
-
diff --git a/e2e/go.mod b/e2e/go.mod
@@ -125,15 +125,15 @@ require (
 	go.opentelemetry.io/otel/trace v1.14.0 // indirect
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
 	golang.org/x/crypto v0.11.0 // indirect
 	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/oauth2 v0.5.0 // indirect
+	golang.org/x/oauth2 v0.8.0 // indirect
 	golang.org/x/sync v0.2.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/term v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect

diff --git a/e2e/go.sum b/e2e/go.sum
@@ -655,8 +655,9 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
-go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
@@ -772,8 +773,8 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ
 golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s=
-golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
+golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
+golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -850,14 +851,14 @@ golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
-golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
-golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
+golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -869,8 +870,8 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

diff --git a/go.mod b/go.mod
@@ -72,17 +72,17 @@ require (
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/wayneashleyberry/terminal-dimensions v1.1.0 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect
 	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/oauth2 v0.5.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/term v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
+	golang.org/x/oauth2 v0.8.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/term v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/protobuf v1.30.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect