Cherry-pick #4964 to 6.0: Added cloud.id and cloud.auth config settings #4976
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
jenkins, retest it |
ruflin
reviewed
Aug 23, 2017
CHANGELOG.asciidoc
Outdated
| @@ -65,6 +65,8 @@ https://github.com/elastic/beats/compare/v6.0.0-beta1...master[Check the HEAD di | |||
|
|
|||
| - Update init scripts to use the `test config` subcommand instead of the deprecated `-configtest` flag. {issue}4600[4600] | |||
| - Get by default the credentials for connecting to Kibana from the Elasticsearch output configuration. {pull}4867[4867] | |||
| - Move TCP UDP start up into `server.Start()` {pull}4903[4903] | |||
* Added cloud.id and cloud.auth config settings This adds two new configuration settings: `cloud.id` and `cloud.auth`. They can be used in the configuration file, or from the CLI like this: ``` ./metricbeat -e -E cloud.id=<cloud-id> -E cloud.auth=<cloud-auth> ``` The ES/KB settings are changed via overwritting, but we display an INFO level message that the settings are changed by the cloud-id. Closes elastic#4959. * goimports fix * aded more tests * added basic docs * changelog * addressed comments * Check that we're not enabling a second output * remove unused var * Addressed comments (cherry picked from commit bd6981d)
|
jenkins, test it |
leweafan
pushed a commit
to leweafan/beats
that referenced
this pull request
Apr 28, 2023
…#4976) This adds two new configuration settings: `cloud.id` and `cloud.auth`. They can be used in the configuration file, or from the CLI like this: ``` ./metricbeat -e -E cloud.id=<cloud-id> -E cloud.auth=<cloud-auth> ``` The ES/KB settings are changed via overwritting, but we display an INFO level message that the settings are changed by the cloud-id. Closes elastic#4959. * goimports fix * aded more tests * added basic docs * changelog * addressed comments * Check that we're not enabling a second output * remove unused var * Addressed comments (cherry picked from commit 3d32342)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick of PR #4964 to 6.0 branch. Original message:
This adds two new configuration settings:
cloud.idandcloud.auth.They can be used in the configuration file, or from the CLI like this:
The ES/KB settings are changed via overwritting, but we display an INFO
level message that the settings are changed by the cloud-id.
Closes #4959.
Left TODOs: