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

renaming "elastic" user to "username" in cloud setup docs #40720

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
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
4 changes: 2 additions & 2 deletions auditbeat/auditbeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ output.elasticsearch:

# Authentication credentials - either API key or username/password.
#api_key: "id:api_key"
#username: "elastic"
#username: "username"
#password: "changeme"

# Dictionary of HTTP parameters to pass within the URL with index operations.
Expand Down Expand Up @@ -1405,7 +1405,7 @@ setup.kibana:

# Optional protocol and basic auth credentials.
#protocol: "https"
#username: "elastic"
#username: "username"
#password: "changeme"

# Optional HTTP path
Expand Down
2 changes: 1 addition & 1 deletion auditbeat/auditbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ output.elasticsearch:

# Authentication credentials - either API key or username/password.
#api_key: "id:api_key"
#username: "elastic"
#username: "username"
#password: "changeme"

# ------------------------------ Logstash Output -------------------------------
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion deploy/cloudfoundry/filebeat/filebeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ output.elasticsearch:

# Authentication credentials - either API key or username/password.
#api_key: "id:api_key"
#username: "elastic"
#username: "username"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our documentation files are auto-generated based on templates, I don't see the templates modified on this PR, there are two of them:

  • libbeat/_meta/config/output-elasticsearch.yml.tmpl
  • libbeat/_meta/config/output-elasticsearch.reference.yml.tmpl

After editing them, you can generate all files by running make update from the root of the repo.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@belimawr , that helps. i will work on the above recommendation's and update PR accoringly

#password: "changeme"

#----------------------------- Elastic Cloud ----------------------------------
Expand Down
2 changes: 1 addition & 1 deletion deploy/cloudfoundry/metricbeat/metricbeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ output.elasticsearch:

# Authentication credentials - either API key or username/password.
#api_key: "id:api_key"
#username: "elastic"
#username: "username"
#password: "changeme"

#----------------------------- Elastic Cloud ----------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ output.elasticsearch:

# Authentication credentials - either API key or username/password.
#api_key: "id:api_key"
#username: "elastic"
#username: "username"
#password: "changeme"

# ------------------------------ Logstash Output -------------------------------
Expand Down
4 changes: 2 additions & 2 deletions filebeat/filebeat.reference.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1591,7 +1591,7 @@ output.elasticsearch:

# Authentication credentials - either API key or username/password.
#api_key: "id:api_key"
#username: "elastic"
#username: "username"
#password: "changeme"

# Dictionary of HTTP parameters to pass within the URL with index operations.
Expand Down Expand Up @@ -2519,7 +2519,7 @@ setup.kibana:

# Optional protocol and basic auth credentials.
#protocol: "https"
#username: "elastic"
#username: "username"
#password: "changeme"

# Optional HTTP path
Expand Down
2 changes: 1 addition & 1 deletion filebeat/filebeat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ output.elasticsearch:

# Authentication credentials - either API key or username/password.
#api_key: "id:api_key"
#username: "elastic"
#username: "username"
#password: "changeme"

# ------------------------------ Logstash Output -------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ overwrite settings from other parts in the configuration. For example:
monitoring:
enabled: true
cloud.id: 'staging:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRjZWM2ZjI2MWE3NGJmMjRjZTMzYmI4ODExYjg0Mjk0ZiRjNmMyY2E2ZDA0MjI0OWFmMGNjN2Q3YTllOTYyNTc0Mw=='
cloud.auth: 'elastic:{pwd}'
cloud.auth: 'username:{pwd}'
--------------------
+
If you
Expand Down
2 changes: 1 addition & 1 deletion libbeat/docs/output-cloud.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Example:
["source","yaml",subs="attributes"]
------------------------------------------------------------------------------
cloud.id: "staging:dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRjZWM2ZjI2MWE3NGJmMjRjZTMzYmI4ODExYjg0Mjk0ZiRjNmMyY2E2ZDA0MjI0OWFmMGNjN2Q3YTllOTYyNTc0Mw=="
cloud.auth: "elastic:{pwd}"
cloud.auth: "username:{pwd}"
------------------------------------------------------------------------------

These settings can be also specified at the command line, like this:
Expand Down
2 changes: 1 addition & 1 deletion x-pack/functionbeat/docs/config-options-aws.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ the events to {es}.
- event_source_arn: arn:aws:sqs:us-east-1:123456789012:myevents

cloud.id: "MyESDeployment:SomeLongString=="
cloud.auth: "elastic:SomeLongString"
cloud.auth: "username:SomeLongString"

processors:
- add_host_metadata: ~
Expand Down
Loading