Skip to content
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.

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

Cherry-pick #23629 to 7.x: [libbeat] Expose the new Sarama flag 'DisablePAFXFAST' in the Kafka output #23665

Merged
merged 6 commits into from
Jan 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Deprecate aws_partition config parameter for AWS, use endpoint instead. {pull}23539[23539]
- Update the baseline version of Sarama (Kafka support library) to 1.27.2. {pull}23595[23595]
- Add kubernetes.volume.fs.used.pct field. {pull}23564[23564]
- Add the `enable_krb5_fast` flag to the Kafka output to explicitly opt-in to FAST authentication. {pull}23629[23629]

*Auditbeat*

Expand Down
4 changes: 4 additions & 0 deletions auditbeat/auditbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1736,6 +1736,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions heartbeat/heartbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions journalbeat/journalbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions libbeat/_meta/config/output-kafka.reference.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

{{include "ssl.reference.yml.tmpl" . | indent 2 }}
# Enable Kerberos support. Kerberos is automatically enabled if any Kerberos setting is set.
#kerberos.enabled: true
Expand Down
2 changes: 2 additions & 0 deletions libbeat/outputs/kafka/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ type kafkaConfig struct {
Password string `config:"password"`
Codec codec.Config `config:"codec"`
Sasl saslConfig `config:"sasl"`
EnableFAST bool `config:"enable_krb5_fast"`
}

type saslConfig struct {
Expand Down Expand Up @@ -241,6 +242,7 @@ func newSaramaConfig(log *logp.Logger, config *kafkaConfig) (*sarama.Config, err
Username: config.Kerberos.Username,
Password: config.Kerberos.Password,
Realm: config.Kerberos.Realm,
DisablePAFXFAST: !config.EnableFAST,
}

case config.Username != "":
Expand Down
6 changes: 6 additions & 0 deletions libbeat/outputs/kafka/docs/kafka.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,12 @@ The ACK reliability level required from broker. 0=no response, 1=wait for local

Note: If set to 0, no ACKs are returned by Kafka. Messages might be lost silently on error.

===== `enable_krb5_fast`

beta[]

Enable Kerberos FAST authentication. This may conflict with some Active Directory installations. It is separate from the standard Kerberos settings because this flag only applies to the Kafka output. The default is `false`.

===== `ssl`

Configuration options for SSL parameters like the root CA for Kafka connections.
Expand Down
4 changes: 4 additions & 0 deletions metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1633,6 +1633,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions packetbeat/packetbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1351,6 +1351,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions winlogbeat/winlogbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -779,6 +779,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions x-pack/auditbeat/auditbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -913,6 +913,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions x-pack/filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3534,6 +3534,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions x-pack/heartbeat/heartbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1034,6 +1034,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions x-pack/metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2135,6 +2135,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions x-pack/packetbeat/packetbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1351,6 +1351,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down
4 changes: 4 additions & 0 deletions x-pack/winlogbeat/winlogbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,10 @@ output.elasticsearch:
# purposes. The default is "beats".
#client_id: beats

# Enables Kerberos FAST authentication in the Kafka output. This may
# conflict with certain Active Directory configurations.
#enable_krb5_fast: false

# Use SSL settings for HTTPS.
#ssl.enabled: true

Expand Down