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 and git-ignore the new keystore provided by beats #618

Merged
merged 3 commits into from
Mar 8, 2018

Conversation

jalvz
Copy link
Contributor

@jalvz jalvz commented Feb 5, 2018

fixes #559

@jalvz
Copy link
Contributor Author

jalvz commented Feb 5, 2018

jenkins retest this please

@jalvz
Copy link
Contributor Author

jalvz commented Feb 5, 2018

jenkins retest it please

Copy link
Contributor

@simitt simitt left a 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"]
Copy link
Contributor

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"]
Copy link
Contributor

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.

Copy link
Contributor Author

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.

Copy link
Contributor

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.

@jalvz
Copy link
Contributor Author

jalvz commented Feb 6, 2018

Yes, I tested and it works.

@jalvz jalvz self-assigned this Feb 12, 2018
@simitt
Copy link
Contributor

simitt commented Mar 8, 2018

As the https://github.com/elastic/beats/pull/6184/files is merged, could you please update this PR so we can merge it.

@jalvz
Copy link
Contributor Author

jalvz commented Mar 8, 2018

I did already, the change up there in L387 seems to be consistent with the updated docs

@jalvz jalvz merged commit c3a3221 into elastic:master Mar 8, 2018
@jalvz jalvz deleted the beat-keystore branch November 5, 2018 12:19
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.

Test and document keystore functionality from beats for APM Server
2 participants