Move service.version to the zookeeper level

elastic · Jan 30, 2019 · d4e5b33 · ruflin · Jan 30, 2019 · ruflin
1 parent 69ab6a2
commit d4e5b33
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 3 deletions.
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
@@ -21399,6 +21399,15 @@ ZooKeeper metrics collected by the four-letter monitoring commands.
 
 
 
+*`zookeeper.service.version`*::
++
+--
+type: keyword
+
+The version of the zookeeper node.
+
+--
+
 [float]
 == mntr fields
 

diff --git a/metricbeat/module/zookeeper/_meta/fields.yml b/metricbeat/module/zookeeper/_meta/fields.yml
@@ -11,3 +11,6 @@
         `zookeeper` contains the metrics reported by ZooKeeper
         commands.
       fields:
+        - name: service.version
+          type: keyword
+          description: The version of the zookeeper node.
diff --git a/metricbeat/module/zookeeper/fields.go b/metricbeat/module/zookeeper/fields.go
diff --git a/metricbeat/module/zookeeper/server/server.go b/metricbeat/module/zookeeper/server/server.go
@@ -89,7 +89,7 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) {
 
 	event := mb.Event{
 		MetricSetFields: metricsetFields,
-		RootFields: common.MapStr{
+		ModuleFields: common.MapStr{
 			"service": common.MapStr{
 				"version": version,
 			},

diff --git a/metricbeat/module/zookeeper/server/server_integration_test.go b/metricbeat/module/zookeeper/server/server_integration_test.go
@@ -48,7 +48,7 @@ func TestFetch(t *testing.T) {
 		metricsetFields := event.MetricSetFields
 
 		// Check values
-		assert.Equal(t, "06/29/2018 04:05 GMT", metricsetFields["version_date"])
+		assert.Equal(t, "02/06/2016 03:18 GMT", metricsetFields["version_date"])
 
 		received := metricsetFields["received"].(int64)
 		assert.True(t, received >= 0)

diff --git a/metricbeat/tests/system/test_zookeeper.py b/metricbeat/tests/system/test_zookeeper.py
@@ -71,6 +71,8 @@ def test_output(self):
         self.assertEqual(len(output), 1)
         evt = output[0]
 
+        self.assertItemsEqual(self.de_dot(ZK_FIELDS), evt.keys())
+
         zk_srvr = evt["zookeeper"]["server"]
 
         assert zk_srvr["connections"] >= 0