Skip to content

Commit

Permalink
Incorporate review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
karenzone committed Apr 14, 2020
1 parent 8884fb7 commit b11f6cb
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 12 deletions.
2 changes: 1 addition & 1 deletion docs/static/monitoring/collectors.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ data collection. For more information about the configuration options for the
collectors, see <<monitoring-settings>>.

WARNING: Unlike for {es} and {kib} monitoring, there is no
`pack.monitoring.collection.enabled` setting on Logstash. You must use the
`xpack.monitoring.collection.enabled` setting on Logstash. You must use the
`monitoring.enabled` setting to enable and disable data collection.

If gaps exist in the monitoring charts in {kib}, it is typically because either
Expand Down
17 changes: 10 additions & 7 deletions docs/static/monitoring/monitoring-internal-legacy.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@ should migrate to either Metricbeat collection or internal collection.
==== Migrating from legacy internal collection to new internal collection

Migrating from legacy internal collection to new
<<monitoring-internal-collection,Internal collection>> is straightforward. Drop
the `xpack` prefix from your configuration settings.
For example, `xpack.monitoring.enabled` is now `monitoring.enabled`.
See <<monitoring-settings, Monitoring Settings>> for the list of settings.

If you don’t have an Elasticsearch output plugin configured in the pipelines,
add the setting `monitoring.cluster_uuid` to your logstash.yml.
<<monitoring-internal-collection,Internal collection>> is straightforward.

** Drop the `xpack.` prefix from your configuration settings.
For example, `xpack.monitoring.enabled` is now `monitoring.enabled`. See
<<monitoring-settings, Monitoring Settings>> for the full list.
** Change the hosts settings and configuration options to point to the monitoring
cluster instead of the production cluster.
** If you don’t have an Elasticsearch output plugin configured in the pipelines,
add the <<monitoring-cluster-uuid,`monitoring.cluster_uuid`>> setting to your
logstash.yml.

==== Components for legacy internal collection

Expand Down
3 changes: 3 additions & 0 deletions docs/static/monitoring/monitoring-overview.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ collection is that you have fewer pieces of software to install and maintain.

* <<monitoring-internal-collection-legacy,Legacy internal collection>>. Legacy
internal collectors send monitoring data to your production cluster.
This is no longer a preferred approach. Use
<<monitoring-internal-collection,internal collection>> or
<<monitoring-with-metricbeat, {metricbeat} collection>> instead.


include::monitoring-mb.asciidoc[]
Expand Down
8 changes: 4 additions & 4 deletions docs/static/settings/monitoring-settings.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,12 @@ Controls how often data samples are collected and shipped on the Logstash side.
Defaults to `10s`. If you modify the collection interval, set the
`monitoring.min_interval_seconds` option in `kibana.yml` to the same value.

[[monitoring-cluster-uuid]]
`monitoring.cluster_uuid`::

The universally unique identifier (UUID) for the monitoring cluster.
By default, {ls} identifies and uses the `cluster uuid` from the first
`output-elasticsearch` plugin defined in the pipelines, and ignores this
By default, {ls} identifies and uses the `cluster uuid` value from each
elasticsearch output defined in the pipelines, and ignores this
setting.
+
If no `cluster_uuid` is discovered in elasticsearch outputs, then {ls}
Expand Down Expand Up @@ -88,15 +89,14 @@ the client’s certificate.

Optional settings that provide the password to the keystore.

`xpack.monitoring.elasticsearch.ssl.verification_mode`::
`monitoring.elasticsearch.ssl.verification_mode`::

Option to validate the server’s certificate. Defaults to `certificate`. To
disable, set to `none`. Disabling this severely compromises security.

`monitoring.elasticsearch.sniffing`::

Finds all {es} cluster nodes and adds them to the hosts list.

Defaults to `false`.

[[monitoring-additional-settings]]
Expand Down

0 comments on commit b11f6cb

Please sign in to comment.