-
Notifications
You must be signed in to change notification settings - Fork 528
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 and git-ignore the new keystore provided by beats #618
Conversation
jenkins retest this please |
jenkins retest it please |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you test the the keystore handling is working with APM?
@@ -384,10 +442,8 @@ Or: | |||
* The index template ensures that fields are mapped correctly in Elasticsearch. | |||
* The Kibana dashboards make it easier for you to visualize {beatname_uc} data | |||
in Kibana. | |||
ifeval::["{has_ml_jobs}"=="yes"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
same as above
:modules-command-short-desc: Manages configured modules | ||
:run-command-short-desc: Runs {beatname_uc}. This command is used by default if you start {beatname_uc} without specifying a command | ||
|
||
ifeval::["{has_ml_jobs}"=="yes"] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please don't remove this, there is a PR https://github.com/elastic/beats/pull/6184/files open in beats that introduces this distinction, as it doesn't make sense to describe ML here for APM.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I copied over a fresh version of the command-reference that has an entry for the keystore.
Once that PR gets merged and copied over, we will have the right thing, no?
I think is better to wait for that PR to get merged first, than manually editing copied files.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As soon as this gets merged, it is in the official docs.
Thus, I'd not suggest to merge in some documentation that is not supposed to show up for APM Server, but rather to copy over the part for the keystore as is and leave the other part of the file untouched for now.
Yes, I tested and it works. |
As the https://github.com/elastic/beats/pull/6184/files is merged, could you please update this PR so we can merge it. |
I did already, the change up there in L387 seems to be consistent with the updated docs |
fixes #559