Skip to content

Bug: Kafka output parameter type fix #762

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 21, 2021
Merged

Bug: Kafka output parameter type fix #762

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6d6c89
Bug: Kafka output parameter type fix kafka_agg_max_messages `string` …
ahma Jun 20, 2021
e6e8f12
Merge branch 'master' into bug/kafaka_agg_max_messages
ahma Jun 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions charts/logging-operator/crds/logging.banzaicloud.io_clusteroutputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2523,7 +2523,7 @@ spec:
kafka_agg_max_bytes:
type: integer
kafka_agg_max_messages:
type: string
type: integer
max_send_retries:
type: integer
message_key_key:
Expand Down Expand Up @@ -7228,7 +7228,7 @@ spec:
kafka_agg_max_bytes:
type: integer
kafka_agg_max_messages:
type: string
type: integer
max_send_retries:
type: integer
message_key_key:
Expand Down
4 changes: 2 additions & 2 deletions charts/logging-operator/crds/logging.banzaicloud.io_outputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2519,7 +2519,7 @@ spec:
kafka_agg_max_bytes:
type: integer
kafka_agg_max_messages:
type: string
type: integer
max_send_retries:
type: integer
message_key_key:
Expand Down Expand Up @@ -7218,7 +7218,7 @@ spec:
kafka_agg_max_bytes:
type: integer
kafka_agg_max_messages:
type: string
type: integer
max_send_retries:
type: integer
message_key_key:
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/logging.banzaicloud.io_clusteroutputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2523,7 +2523,7 @@ spec:
kafka_agg_max_bytes:
type: integer
kafka_agg_max_messages:
type: string
type: integer
max_send_retries:
type: integer
message_key_key:
Expand Down Expand Up @@ -7228,7 +7228,7 @@ spec:
kafka_agg_max_bytes:
type: integer
kafka_agg_max_messages:
type: string
type: integer
max_send_retries:
type: integer
message_key_key:
Expand Down
4 changes: 2 additions & 2 deletions config/crd/bases/logging.banzaicloud.io_outputs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2519,7 +2519,7 @@ spec:
kafka_agg_max_bytes:
type: integer
kafka_agg_max_messages:
type: string
type: integer
max_send_retries:
type: integer
message_key_key:
Expand Down Expand Up @@ -7218,7 +7218,7 @@ spec:
kafka_agg_max_bytes:
type: integer
kafka_agg_max_messages:
type: string
type: integer
max_send_retries:
type: integer
message_key_key:
Expand Down
2 changes: 1 addition & 1 deletion pkg/sdk/model/output/kafka.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ type KafkaOutputConfig struct {
// Maximum value of total message size to be included in one batch transmission. (default: 4096).
KafkaAggMaxBytes int `json:"kafka_agg_max_bytes,omitempty"`
// Maximum number of messages to include in one batch transmission. (default: nil).
KafkaAggMaxMessages string `json:"kafka_agg_max_messages,omitempty"`
KafkaAggMaxMessages int `json:"kafka_agg_max_messages,omitempty"`
// Discard the record where Kafka DeliveryFailed occurred (default: false)
DiscardKafkaDeliveryFailed bool `json:"discard_kafka_delivery_failed,omitempty"`
// System's CA cert store (default: false)
Expand Down
8 changes: 4 additions & 4 deletions pkg/sdk/static/gen/crds/generated.go
View file
Open in desktop

Large diffs are not rendered by default.