Cherry-pick #14135 to 7.x: [Metricbeat] VSphere module dashboards (#1…

…6613)
elastic · Feb 27, 2020 · 3741197 · 3741197
1 parent 5a91fd1
commit 3741197
Show file tree

Hide file tree

Showing 9 changed files with 2,159 additions and 1 deletion.
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -43,6 +43,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 
 *Metricbeat*
 
+- Add new dashboard for VSphere host cluster and virtual machine {pull}14135[14135]
 - kubernetes.container.cpu.limit.cores and kubernetes.container.cpu.requests.cores are now floats. {issue}11975[11975]
 - Update cloudwatch metricset mapping for both metrics and dimensions. {pull}15245[15245]
 - Make use of secure port when accessing Kubelet API {pull}16063[16063]

diff --git a/metricbeat/docs/images/metricbeat_vsphere_dashboard.png b/metricbeat/docs/images/metricbeat_vsphere_dashboard.png
diff --git a/metricbeat/docs/images/metricbeat_vsphere_vm_dashboard.png b/metricbeat/docs/images/metricbeat_vsphere_vm_dashboard.png
diff --git a/metricbeat/docs/modules/vsphere.asciidoc b/metricbeat/docs/modules/vsphere.asciidoc
@@ -11,6 +11,14 @@ The vSphere module uses the https://github.com/vmware/govmomi[Govmomi] library t
 
 By default it enables the metricsets `datastore`, `host` and `virtualmachine`.
 
+[float]
+=== Dashboard
+
+The vsphere module comes with a predefined dashboard. For example:
+
+image::./images/metricbeat_vsphere_dashboard.png[]
+image::./images/metricbeat_vsphere_vm_dashboard.png[]
+
 
 [float]
 === Example configuration

diff --git a/metricbeat/docs/modules_list.asciidoc b/metricbeat/docs/modules_list.asciidoc
@@ -234,7 +234,7 @@ This file is generated! See scripts/mage/docs_collector.go
 .1+| .1+|  |<<metricbeat-metricset-traefik-health,health>>   
 |<<metricbeat-module-uwsgi,uwsgi>>     |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .1+| .1+|  |<<metricbeat-metricset-uwsgi-status,status>>   
-|<<metricbeat-module-vsphere,vSphere>>  beta[]   |image:./images/icon-no.png[No prebuilt dashboards]    |  
+|<<metricbeat-module-vsphere,vSphere>>  beta[]   |image:./images/icon-yes.png[Prebuilt dashboards are available]    |  
 .3+| .3+|  |<<metricbeat-metricset-vsphere-datastore,datastore>> beta[]  
 |<<metricbeat-metricset-vsphere-host,host>> beta[]  
 |<<metricbeat-metricset-vsphere-virtualmachine,virtualmachine>> beta[]  

diff --git a/metricbeat/module/vsphere/_meta/docs.asciidoc b/metricbeat/module/vsphere/_meta/docs.asciidoc
@@ -1,3 +1,11 @@
 The vSphere module uses the https://github.com/vmware/govmomi[Govmomi] library to collect metrics from any Vmware SDK URL (ESXi/VCenter). This library is built for and tested against ESXi and vCenter 5.5, 6.0 and 6.5.
 
 By default it enables the metricsets `datastore`, `host` and `virtualmachine`.
+
+[float]
+=== Dashboard
+
+The vsphere module comes with a predefined dashboard. For example:
+
+image::./images/metricbeat_vsphere_dashboard.png[]
+image::./images/metricbeat_vsphere_vm_dashboard.png[]