Skip to content

Commit 6636837

Browse files
kristofgyuraczkristofgyuracz
authored
Merge pull request #1569 from kube-logging/strings-cherry-pick
Pick fix for #1555
2 parents 83dfca7 + 88124c7 commit 6636837

File tree

24 files changed

+133
-882
lines changed

24 files changed

+133
-882
lines changed

‎charts/logging-operator/crds/logging.banzaicloud.io_syslogngclusteroutputs.yaml‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,6 @@ spec:
11301130
time_reopen:
11311131
type: integer
11321132
timestamp:
1133-
default: current
11341133
enum:
11351134
- current
11361135
- received
@@ -1227,31 +1226,20 @@ spec:
12271226
value_pairs:
12281227
properties:
12291228
exclude:
1230-
properties:
1231-
raw_string:
1232-
type: string
1233-
type: object
1229+
type: string
12341230
key:
1235-
properties:
1236-
raw_string:
1237-
type: string
1238-
type: object
1231+
type: string
12391232
pair:
1240-
properties:
1241-
raw_string:
1242-
type: string
1243-
type: object
1233+
type: string
12441234
scope:
1245-
properties:
1246-
raw_string:
1247-
type: string
1248-
type: object
1249-
type: object
1250-
write_concern:
1251-
properties:
1252-
raw_string:
12531235
type: string
12541236
type: object
1237+
write_concern:
1238+
enum:
1239+
- unacked
1240+
- acked
1241+
- majority
1242+
type: string
12551243
required:
12561244
- collection
12571245
type: object
@@ -1417,10 +1405,7 @@ spec:
14171405
object_key:
14181406
type: string
14191407
object_key_timestamp:
1420-
properties:
1421-
raw_string:
1422-
type: string
1423-
type: object
1408+
type: string
14241409
persist_name:
14251410
type: string
14261411
region:
@@ -1463,10 +1448,7 @@ spec:
14631448
storage_class:
14641449
type: string
14651450
template:
1466-
properties:
1467-
raw_string:
1468-
type: string
1469-
type: object
1451+
type: string
14701452
throttle:
14711453
type: integer
14721454
upload_threads:

‎charts/logging-operator/crds/logging.banzaicloud.io_syslogngoutputs.yaml‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,6 @@ spec:
11261126
time_reopen:
11271127
type: integer
11281128
timestamp:
1129-
default: current
11301129
enum:
11311130
- current
11321131
- received
@@ -1223,31 +1222,20 @@ spec:
12231222
value_pairs:
12241223
properties:
12251224
exclude:
1226-
properties:
1227-
raw_string:
1228-
type: string
1229-
type: object
1225+
type: string
12301226
key:
1231-
properties:
1232-
raw_string:
1233-
type: string
1234-
type: object
1227+
type: string
12351228
pair:
1236-
properties:
1237-
raw_string:
1238-
type: string
1239-
type: object
1229+
type: string
12401230
scope:
1241-
properties:
1242-
raw_string:
1243-
type: string
1244-
type: object
1245-
type: object
1246-
write_concern:
1247-
properties:
1248-
raw_string:
12491231
type: string
12501232
type: object
1233+
write_concern:
1234+
enum:
1235+
- unacked
1236+
- acked
1237+
- majority
1238+
type: string
12511239
required:
12521240
- collection
12531241
type: object
@@ -1413,10 +1401,7 @@ spec:
14131401
object_key:
14141402
type: string
14151403
object_key_timestamp:
1416-
properties:
1417-
raw_string:
1418-
type: string
1419-
type: object
1404+
type: string
14201405
persist_name:
14211406
type: string
14221407
region:
@@ -1459,10 +1444,7 @@ spec:
14591444
storage_class:
14601445
type: string
14611446
template:
1462-
properties:
1463-
raw_string:
1464-
type: string
1465-
type: object
1447+
type: string
14661448
throttle:
14671449
type: integer
14681450
upload_threads:

‎config/crd/bases/logging.banzaicloud.io_syslogngclusteroutputs.yaml‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,7 +1130,6 @@ spec:
11301130
time_reopen:
11311131
type: integer
11321132
timestamp:
1133-
default: current
11341133
enum:
11351134
- current
11361135
- received
@@ -1227,31 +1226,20 @@ spec:
12271226
value_pairs:
12281227
properties:
12291228
exclude:
1230-
properties:
1231-
raw_string:
1232-
type: string
1233-
type: object
1229+
type: string
12341230
key:
1235-
properties:
1236-
raw_string:
1237-
type: string
1238-
type: object
1231+
type: string
12391232
pair:
1240-
properties:
1241-
raw_string:
1242-
type: string
1243-
type: object
1233+
type: string
12441234
scope:
1245-
properties:
1246-
raw_string:
1247-
type: string
1248-
type: object
1249-
type: object
1250-
write_concern:
1251-
properties:
1252-
raw_string:
12531235
type: string
12541236
type: object
1237+
write_concern:
1238+
enum:
1239+
- unacked
1240+
- acked
1241+
- majority
1242+
type: string
12551243
required:
12561244
- collection
12571245
type: object
@@ -1417,10 +1405,7 @@ spec:
14171405
object_key:
14181406
type: string
14191407
object_key_timestamp:
1420-
properties:
1421-
raw_string:
1422-
type: string
1423-
type: object
1408+
type: string
14241409
persist_name:
14251410
type: string
14261411
region:
@@ -1463,10 +1448,7 @@ spec:
14631448
storage_class:
14641449
type: string
14651450
template:
1466-
properties:
1467-
raw_string:
1468-
type: string
1469-
type: object
1451+
type: string
14701452
throttle:
14711453
type: integer
14721454
upload_threads:

‎config/crd/bases/logging.banzaicloud.io_syslogngoutputs.yaml‎

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,6 @@ spec:
11261126
time_reopen:
11271127
type: integer
11281128
timestamp:
1129-
default: current
11301129
enum:
11311130
- current
11321131
- received
@@ -1223,31 +1222,20 @@ spec:
12231222
value_pairs:
12241223
properties:
12251224
exclude:
1226-
properties:
1227-
raw_string:
1228-
type: string
1229-
type: object
1225+
type: string
12301226
key:
1231-
properties:
1232-
raw_string:
1233-
type: string
1234-
type: object
1227+
type: string
12351228
pair:
1236-
properties:
1237-
raw_string:
1238-
type: string
1239-
type: object
1229+
type: string
12401230
scope:
1241-
properties:
1242-
raw_string:
1243-
type: string
1244-
type: object
1245-
type: object
1246-
write_concern:
1247-
properties:
1248-
raw_string:
12491231
type: string
12501232
type: object
1233+
write_concern:
1234+
enum:
1235+
- unacked
1236+
- acked
1237+
- majority
1238+
type: string
12511239
required:
12521240
- collection
12531241
type: object
@@ -1413,10 +1401,7 @@ spec:
14131401
object_key:
14141402
type: string
14151403
object_key_timestamp:
1416-
properties:
1417-
raw_string:
1418-
type: string
1419-
type: object
1404+
type: string
14201405
persist_name:
14211406
type: string
14221407
region:
@@ -1459,10 +1444,7 @@ spec:
14591444
storage_class:
14601445
type: string
14611446
template:
1462-
properties:
1463-
raw_string:
1464-
type: string
1465-
type: object
1447+
type: string
14661448
throttle:
14671449
type: integer
14681450
upload_threads:

‎docs/configuration/plugins/syslogng-outputs/mongodb.md‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -144,10 +144,3 @@ Default: -
144144
Default: -
145145

146146

147-
## RawString
148-
149-
### raw_string (string, optional) {#rawstring-raw_string}
150-
151-
Default: -
152-
153-

‎e2e/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,15 +125,15 @@ require (
125125
go.opentelemetry.io/otel/trace v1.14.0 // indirect
126126
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
127127
go.uber.org/atomic v1.7.0 // indirect
128-
go.uber.org/multierr v1.6.0 // indirect
128+
go.uber.org/multierr v1.11.0 // indirect
129129
go.uber.org/zap v1.24.0 // indirect
130130
golang.org/x/crypto v0.11.0 // indirect
131131
golang.org/x/net v0.12.0 // indirect
132-
golang.org/x/oauth2 v0.5.0 // indirect
132+
golang.org/x/oauth2 v0.8.0 // indirect
133133
golang.org/x/sync v0.2.0 // indirect
134-
golang.org/x/sys v0.10.0 // indirect
135-
golang.org/x/term v0.10.0 // indirect
136-
golang.org/x/text v0.11.0 // indirect
134+
golang.org/x/sys v0.13.0 // indirect
135+
golang.org/x/term v0.13.0 // indirect
136+
golang.org/x/text v0.13.0 // indirect
137137
golang.org/x/time v0.3.0 // indirect
138138
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
139139
google.golang.org/appengine v1.6.7 // indirect

‎e2e/go.sum‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -655,8 +655,9 @@ go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
655655
go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
656656
go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
657657
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
658-
go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
659658
go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
659+
go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
660+
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
660661
go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
661662
go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
662663
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
772773
golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
773774
golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
774775
golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
775-
golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s=
776-
golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I=
776+
golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8=
777+
golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE=
777778
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
778779
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
779780
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
850851
golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
851852
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
852853
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
853-
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
854-
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
854+
golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
855+
golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
855856
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
856857
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
857858
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
858859
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
859-
golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
860-
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
860+
golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek=
861+
golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
861862
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
862863
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
863864
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=
869870
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
870871
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
871872
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
872-
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
873-
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
873+
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
874+
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
874875
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
875876
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
876877
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

‎go.mod‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,17 @@ require (
7272
github.com/spf13/pflag v1.0.5 // indirect
7373
github.com/wayneashleyberry/terminal-dimensions v1.1.0 // indirect
7474
go.uber.org/atomic v1.7.0 // indirect
75-
go.uber.org/multierr v1.6.0 // indirect
75+
go.uber.org/multierr v1.11.0 // indirect
7676
go.uber.org/zap v1.24.0 // indirect
7777
golang.org/x/net v0.12.0 // indirect
78-
golang.org/x/oauth2 v0.5.0 // indirect
79-
golang.org/x/sys v0.10.0 // indirect
80-
golang.org/x/term v0.10.0 // indirect
81-
golang.org/x/text v0.11.0 // indirect
78+
golang.org/x/oauth2 v0.8.0 // indirect
79+
golang.org/x/sys v0.13.0 // indirect
80+
golang.org/x/term v0.13.0 // indirect
81+
golang.org/x/text v0.13.0 // indirect
8282
golang.org/x/time v0.3.0 // indirect
8383
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
8484
google.golang.org/appengine v1.6.7 // indirect
85-
google.golang.org/protobuf v1.30.0 // indirect
85+
google.golang.org/protobuf v1.31.0 // indirect
8686
gopkg.in/inf.v0 v0.9.1 // indirect
8787
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8888
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)