elastic · jsoriano · Jun 28, 2019 · May 20, 2019 · Jun 7, 2019 · Jun 21, 2019
diff --git a/CHANGELOG.next.asciidoc b/CHANGELOG.next.asciidoc
@@ -243,6 +243,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
 - Always report Pod UID in the `pod` metricset. {pull}12345[12345]
 - Add Vsphere Virtual Machine operating system to `os` field in Vsphere virtualmachine module. {pull}12391[12391]
 - Add validation for elasticsearch and kibana modules' metricsets when xpack.enabled is set to true. {pull}12386[12386]
+- Add CockroachDB module. {pull}12465[12465]
 
 *Packetbeat*
 

diff --git a/x-pack/metricbeat/metricbeat.reference.yml b/x-pack/metricbeat/metricbeat.reference.yml
@@ -212,6 +212,16 @@ metricbeat.modules:
   hosts: ["localhost:5000"]
   enabled: true
 
+#----------------------------- Cockroachdb Module -----------------------------
+- module: cockroachdb
+  metricsets: ['status']
+  period: 10s
+  hosts: ['localhost:8080']
+
+  # This module uses the Prometheus collector metricset, all
+  # the options for this metricset are also available here.
+  #metrics_path: /_status/vars
+
 #-------------------------------- Consul Module --------------------------------
 - module: consul
   metricsets:

diff --git a/x-pack/metricbeat/module/cockroachdb/_meta/config.yml b/x-pack/metricbeat/module/cockroachdb/_meta/config.yml
@@ -0,0 +1,8 @@
+- module: cockroachdb
+  metricsets: ['status']
+  period: 10s
+  hosts: ['localhost:8080']
+
+  # This module uses the Prometheus collector metricset, all
+  # the options for this metricset are also available here.
+  #metrics_path: /_status/vars
diff --git a/x-pack/metricbeat/module/cockroachdb/_meta/docs.asciidoc b/x-pack/metricbeat/module/cockroachdb/_meta/docs.asciidoc
@@ -0,0 +1,7 @@
+This module periodically fetches metrics from CockroachDB.
+
+[float]
+=== Compatibility
+
+The CockroachDB `status` metricset is compatible with any CockroachDB version
+exposing metrics in Prometheus format.
diff --git a/x-pack/metricbeat/module/cockroachdb/module.yml b/x-pack/metricbeat/module/cockroachdb/module.yml
@@ -0,0 +1,3 @@
+name: cockroachdb
+metricsets:
+- status
diff --git a/x-pack/metricbeat/module/cockroachdb/status/_meta/docs.asciidoc b/x-pack/metricbeat/module/cockroachdb/status/_meta/docs.asciidoc
@@ -0,0 +1,4 @@
+The CockroachDB `status` metricset collects metrics exposed by the
+https://www.cockroachlabs.com/docs/v2.1/monitoring-and-alerting.html#prometheus-endpoint[Prometheus endpoint]
+of CockroachDB.
+
diff --git a/x-pack/metricbeat/module/cockroachdb/status/_meta/test/cockroachdb-status.v19.1.1 b/x-pack/metricbeat/module/cockroachdb/status/_meta/test/cockroachdb-status.v19.1.1