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

* Remove kibana from the short config and comment it out by default
elastic · Apr 25, 2017 · af60958 · af60958
1 parent de11679
commit af60958
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 13 deletions.
diff --git a/metricbeat/docs/index.asciidoc b/metricbeat/docs/index.asciidoc
@@ -12,6 +12,7 @@ include::../../libbeat/docs/version.asciidoc[]
 :beatname_lc: metricbeat
 :beatname_uc: Metricbeat
 :security: X-Pack Security
+:monitoringdoc: https://www.elastic.co/guide/en/x-pack/current
 
 include::./overview.asciidoc[]
 

diff --git a/metricbeat/docs/modules/elasticsearch.asciidoc b/metricbeat/docs/modules/elasticsearch.asciidoc
@@ -3,9 +3,9 @@ This file is generated! See scripts/docs_collector.py
 ////
 
 [[metricbeat-module-elasticsearch]]
-== elasticsearch Module
+== Elasticsearch Module
 
-This is the elasticsearch Module. The elasticsearch module contains a minimal set of metrics to enable monitoring of elasticsearch across multiple versions.
+This is the Elasticsearch Module. The Elasticsearch module contains a minimal set of metrics to enable monitoring of Elasticsearch across multiple versions. To monitor more Elasticsearch metrics, use our {monitoringdoc}/xpack-monitoring.html[X-Pack monitoring] which is available under a free basic license.
 
 
 [float]

diff --git a/metricbeat/docs/modules/kibana.asciidoc b/metricbeat/docs/modules/kibana.asciidoc
@@ -3,10 +3,9 @@ This file is generated! See scripts/docs_collector.py
 ////
 
 [[metricbeat-module-kibana]]
-== kibana Module
-
-This is the kibana Module.
+== Kibana Module
 
+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.
 
 
 [float]
@@ -23,7 +22,6 @@ metricbeat.modules:
   enabled: false
   period: 10s
   hosts: ["localhost:5601"]
-
 ----
 
 [float]

diff --git a/metricbeat/metricbeat.full.yml b/metricbeat/metricbeat.full.yml
@@ -207,7 +207,6 @@ metricbeat.modules:
   period: 10s
   hosts: ["localhost:5601"]
 
-
 #------------------------------- kubelet Module ------------------------------
 - module: kubelet
   metricsets: ["node","container","volume","pod","system"]

diff --git a/metricbeat/module/elasticsearch/_meta/docs.asciidoc b/metricbeat/module/elasticsearch/_meta/docs.asciidoc
@@ -1,3 +1,3 @@
-== elasticsearch Module
+== Elasticsearch Module
 
-This is the elasticsearch Module. The elasticsearch module contains a minimal set of metrics to enable monitoring of elasticsearch across multiple versions.
+This is the Elasticsearch Module. The Elasticsearch module contains a minimal set of metrics to enable monitoring of Elasticsearch across multiple versions. To monitor more Elasticsearch metrics, use our {monitoringdoc}/xpack-monitoring.html[X-Pack monitoring] which is available under a free basic license.
diff --git a/metricbeat/module/kibana/_meta/config.yml b/metricbeat/module/kibana/_meta/config.yml
@@ -3,4 +3,3 @@
   enabled: false
   period: 10s
   hosts: ["localhost:5601"]
-
diff --git a/metricbeat/module/kibana/_meta/docs.asciidoc b/metricbeat/module/kibana/_meta/docs.asciidoc
@@ -1,4 +1,3 @@
-== kibana Module
-
-This is the kibana Module.
+== Kibana Module
 
+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.
diff --git a/metricbeat/module/kibana/_meta/fields.yml b/metricbeat/module/kibana/_meta/fields.yml
@@ -4,6 +4,7 @@
     []experimental
 
     kibana Module
+  short_config: false
   fields:
     - name: kibana
       type: group