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

Document output.elasticsearch.api_key in yml file #3138

Merged
merged 5 commits into from
Jan 15, 2020

Conversation

simitt
Copy link
Contributor

@simitt simitt commented Jan 10, 2020

related to #3137

@codecov-io
Copy link

codecov-io commented Jan 10, 2020

Codecov Report

Merging #3138 into master will decrease coverage by 0.73%.
The diff coverage is 84.26%.

@@            Coverage Diff             @@
##           master    #3138      +/-   ##
==========================================
- Coverage   79.63%   78.89%   -0.74%     
==========================================
  Files         105      106       +1     
  Lines        5529     5587      +58     
==========================================
+ Hits         4403     4408       +5     
- Misses       1126     1179      +53
Impacted Files Coverage Δ
elasticsearch/client.go 27.69% <ø> (-2.31%) ⬇️
sourcemap/es_store.go 85.89% <ø> (ø) ⬆️
beater/config/instrumentation.go 17.85% <ø> (ø) ⬆️
elasticsearch/security_api.go 0% <ø> (ø)
beater/config/api_key.go 85.71% <ø> (-1.79%) ⬇️
elasticsearch/config.go 72.91% <ø> (ø) ⬆️
beater/beater.go 64.28% <ø> (-1.79%) ⬇️
beater/tracing.go 78.26% <100%> (+0.73%) ⬆️
beater/api/root/handler.go 88.23% <100%> (ø) ⬆️
beater/authorization/privilege.go 100% <100%> (ø) ⬆️
... and 11 more

Copy link
Member

@graphaelli graphaelli left a comment

Choose a reason for hiding this comment

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

if supported, we should have this in all of the elasticsearch sections - monitoring_elasticsearch, source_mapping

@simitt
Copy link
Contributor Author

simitt commented Jan 14, 2020

Good point!

@simitt simitt requested a review from graphaelli January 14, 2020 17:04
#protocol: "https"

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

Choose a reason for hiding this comment

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

is this the base64 encoded version or really two strings with colon?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is really two strings with colon, the libbeat elasticsearch client takes care of the base64 encoding.
We should be consistent with this behaviour also for sourcemaps, so I am changing the elasticsearch/client behavior accordingly.
Unfortunately we currently do not have system tests for the case that an apm-server.source_mapping.elasticsearch is configured, created an issue for following up on that #3166.

Copy link
Member

Choose a reason for hiding this comment

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

great, thanks for clarifying

#protocol: "https"

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

Choose a reason for hiding this comment

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

great, thanks for clarifying

@simitt simitt merged commit 3894af0 into elastic:master Jan 15, 2020
simitt added a commit to simitt/apm-server that referenced this pull request Jan 15, 2020
simitt added a commit that referenced this pull request Jan 15, 2020
@simitt simitt deleted the es-output-apikey branch February 10, 2020 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants