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

Add x-pack monitoring note to kibana/es docs #4012

Merged
merged 1 commit into from
Apr 25, 2017

Conversation

ruflin
Copy link
Member

@ruflin ruflin commented Apr 13, 2017

  • Remove kibana from the short config and comment it out by default

@ruflin
Copy link
Member Author

ruflin commented Apr 13, 2017

Needs rebase when #4014 is merged

@@ -7,6 +7,7 @@ This file is generated! See scripts/docs_collector.py

This is the elasticsearch Module. The elasticsearch module contains a minimal set of metrics to enable monitoring of elasticsearch across multiple versions.

For more detailed monitoring of elasticsearch use the https://www.elastic.co/guide/en/x-pack/current/xpack-monitoring.html[free x-pack monitoring].
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you create a variable in the index.asciidoc file and use the variable to resolve the path?

Add this to index.asciidoc:
:monitoringdoc: https://www.elastic.co/guide/en/x-pack/current

Then use {monitoringdoc}/xpack-monitoring.html[free x-pack monitoring].

Note that for X-Pack we don't use {doc-branch} to resolve the branch because we end up with broken links in master (for X-Pack, we don't build/publish docs in master).

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@@ -7,6 +7,7 @@ This file is generated! See scripts/docs_collector.py

This is the elasticsearch Module. The elasticsearch module contains a minimal set of metrics to enable monitoring of elasticsearch across multiple versions.

For more detailed monitoring of elasticsearch use the https://www.elastic.co/guide/en/x-pack/current/xpack-monitoring.html[free x-pack monitoring].
Copy link
Contributor

Choose a reason for hiding this comment

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

Oh also please capitalize Elasticsearch. :-)

Copy link
Member Author

Choose a reason for hiding this comment

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

done

@@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py
[[metricbeat-module-kibana]]
== kibana Module

This is the kibana Module.
This is the kibana Module and only tracks the high level metrics. For more detailed monitoring of kibana use the https://www.elastic.co/guide/en/x-pack/current/xpack-monitoring.html[free x-pack monitoring].
Copy link
Contributor

Choose a reason for hiding this comment

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

ditto - same comments as above.

Copy link

@bohyun-e bohyun-e left a comment

Choose a reason for hiding this comment

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

@ruflin I changed up the words a bit to make it more clear. Please have a look. Thanks!

@@ -7,6 +7,7 @@ This file is generated! See scripts/docs_collector.py

This is the elasticsearch Module. The elasticsearch module contains a minimal set of metrics to enable monitoring of elasticsearch across multiple versions.

For more detailed monitoring of elasticsearch use the https://www.elastic.co/guide/en/x-pack/current/xpack-monitoring.html[free x-pack monitoring].

Choose a reason for hiding this comment

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

May I suggest saying something like "To monitor more Elasticsearch metrics, use our https://www.elastic.co/guide/en/x-pack/current/xpack-monitoring.html[X-Pack monitoring] which is available under a free basic license."

@@ -5,7 +5,7 @@ This file is generated! See scripts/docs_collector.py
[[metricbeat-module-kibana]]
== kibana Module

This is the kibana Module.
This is the kibana Module and only tracks the high level metrics. For more detailed monitoring of kibana use the https://www.elastic.co/guide/en/x-pack/current/xpack-monitoring.html[free x-pack monitoring].

Choose a reason for hiding this comment

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

May I suggest saying something like "To monitor more Kibana metrics, use our https://www.elastic.co/guide/en/x-pack/current/xpack-monitoring.html[X-Pack monitoring] which is available under a free basic license.

@@ -2,3 +2,4 @@

This is the elasticsearch Module. The elasticsearch module contains a minimal set of metrics to enable monitoring of elasticsearch across multiple versions.

For more detailed monitoring of elasticsearch use the https://www.elastic.co/guide/en/x-pack/current/xpack-monitoring.html[free x-pack monitoring].

Choose a reason for hiding this comment

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

May I suggest saying something like "To monitor more Elasticsearch metrics, use our https://www.elastic.co/guide/en/x-pack/current/xpack-monitoring.html[X-Pack monitoring] which is available under a free basic license."

@@ -1,4 +1,4 @@
== kibana Module

This is the kibana Module.
This is the kibana Module and only tracks the high level metrics. For more detailed monitoring of kibana use the https://www.elastic.co/guide/en/x-pack/current/xpack-monitoring.html[free x-pack monitoring].
Copy link

@bohyun-e bohyun-e Apr 14, 2017

Choose a reason for hiding this comment

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

May I suggest saying something like "To monitor more Kibana Elasticsearch metrics, use our https://www.elastic.co/guide/en/x-pack/current/xpack-monitoring.html[X-Pack monitoring] which is available under a free basic license."

@ruflin
Copy link
Member Author

ruflin commented Apr 18, 2017

@bohyun-e @dedemorton Reviews applied. Can you check again?

@dedemorton
Copy link
Contributor

@ruflin I'll probably take a pass at editing the content for the new modules after they're merged, but this looks good for now.

@monicasarbu
Copy link
Contributor

@ruflin #4014 is merged, can you please rebase?

Copy link

@bohyun-e bohyun-e left a comment

Choose a reason for hiding this comment

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

left one comment


This is the Kibana Module and only tracks the high level metrics. To monitor more Kibana metrics, use our {monitoringdoc}/xpack-monitoring.html[X-Pack monitoring] which is available under a free basic license.

Choose a reason for hiding this comment

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

@ruflin what high level metrics are we tracking? can you point me to a PR/issue?

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

It might be worth adding a bit more clarification so users know what you mean by high-level metrics. So something like this:

The Kibana module tracks high-level metrics, such as the number of current connections, the number of requests, and the overall status of Kibana.

I'd keep it short to give users a general sense of what we mean by high-level.

Copy link
Contributor

Choose a reason for hiding this comment

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

LGTM with the understanding that we'll flesh out the details of what we mean by "high-level metrics" when this module is more mature.

Copy link
Member Author

Choose a reason for hiding this comment

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

deal

* Remove kibana from the short config and comment it out by default
@monicasarbu monicasarbu merged commit af60958 into elastic:master Apr 25, 2017
@monicasarbu monicasarbu deleted the add-xpack-note branch April 25, 2017 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants