Skip to content

Commit

Permalink
Provide better defaults in reference configuration for Kerberos auth (#…
Browse files Browse the repository at this point in the history
…17701) (#17703)

(cherry picked from commit 3f50058)
  • Loading branch information
kvch authored Apr 14, 2020
1 parent 6176cf1 commit f514120
Show file tree
Hide file tree
Showing 12 changed files with 60 additions and 48 deletions.
9 changes: 5 additions & 4 deletions auditbeat/auditbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -788,13 +788,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down
9 changes: 5 additions & 4 deletions filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1494,13 +1494,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down
9 changes: 5 additions & 4 deletions heartbeat/heartbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -932,13 +932,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down
9 changes: 5 additions & 4 deletions journalbeat/journalbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -726,13 +726,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down
9 changes: 5 additions & 4 deletions libbeat/_meta/config.reference.yml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -669,13 +669,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down
9 changes: 5 additions & 4 deletions metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1538,13 +1538,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down
9 changes: 5 additions & 4 deletions packetbeat/packetbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1215,13 +1215,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down
9 changes: 5 additions & 4 deletions winlogbeat/winlogbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -711,13 +711,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down
9 changes: 5 additions & 4 deletions x-pack/auditbeat/auditbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -844,13 +844,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down
9 changes: 5 additions & 4 deletions x-pack/filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2185,13 +2185,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down
9 changes: 5 additions & 4 deletions x-pack/metricbeat/metricbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1947,13 +1947,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down
9 changes: 5 additions & 4 deletions x-pack/winlogbeat/winlogbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -714,13 +714,14 @@ output.elasticsearch:
#kerberos.auth_type: password

# Path to the keytab file. It is used when auth_type is set to keytab.
#kerberos.keytab: /etc/krb5kdc/kafka.keytab
#kerberos.keytab: /etc/security/keytabs/kafka.keytab

# Path to the Kerberos configuration.
#kerberos.config_path: /etc/path/config
#kerberos.config_path: /etc/krb5.conf

# The service principal name.
#kerberos.service_name: HTTP/my-service@realm
# The service name. Service principal name is contructed from
# service_name/hostname@realm.
#kerberos.service_name: kafka

# Name of the Kerberos user.
#kerberos.username: elastic
Expand Down

0 comments on commit f514120

Please sign in to comment.