Consolidating logstash module integration tests (#9183)

This PR takes the separate `logstash/node/node_integration_test.go` and `logstash/node_stats/node_stats_integration_test.go` files and consolidates them into a single `logstash/logstash_integration_test.go` file, in the same vein as [`elasticsearch/elasticsearch_integration_test.go`](https://github.com/elastic/beats/blob/master/metricbeat/module/elasticsearch/elasticsearch_integration_test.go).

For good measure, this PR also runs the consolidated integration test and re-generates `data.json` files for the `node` and `node_stats` metricsets.

metricbeat/module/logstash/node/node_integration_test.go → metricbeat/module/logstash/logstash_integration_test.go

@@ -17,7 +17,7 @@
 
 // +build integration
 
-package node
+package logstash_test
 
 import (
 	"testing"
@@ -27,30 +27,41 @@ import (
 	"github.com/elastic/beats/libbeat/tests/compose"
 	mbtest "github.com/elastic/beats/metricbeat/mb/testing"
 	"github.com/elastic/beats/metricbeat/module/logstash"
+	_ "github.com/elastic/beats/metricbeat/module/logstash/node"
+	_ "github.com/elastic/beats/metricbeat/module/logstash/node_stats"
 )
 
+var metricSets = []string{
+	"node",
+	"node_stats",
+}
+
 func TestFetch(t *testing.T) {
 	compose.EnsureUp(t, "logstash")
 
-	f := mbtest.NewReportingMetricSetV2(t, logstash.GetConfig("node"))
-	events, errs := mbtest.ReportingFetchV2(f)
+	for _, metricSet := range metricSets {
+		f := mbtest.NewReportingMetricSetV2(t, logstash.GetConfig(metricSet))
+		events, errs := mbtest.ReportingFetchV2(f)
 
-	assert.Empty(t, errs)
-	if !assert.NotEmpty(t, events) {
-		t.FailNow()
-	}
+		assert.Empty(t, errs)
+		if !assert.NotEmpty(t, events) {
+			t.FailNow()
+		}
 
-	t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(),
-		events[0].BeatEvent("logstash", "node").Fields.StringToPrint())
+		t.Logf("%s/%s event: %+v", f.Module().Name(), f.Name(),
+			events[0].BeatEvent("logstash", metricSet).Fields.StringToPrint())
+	}
 }
 
 func TestData(t *testing.T) {
 	compose.EnsureUp(t, "logstash")
 
-	config := logstash.GetConfig("node")
-	f := mbtest.NewReportingMetricSetV2(t, config)
-	err := mbtest.WriteEventsReporterV2(f, t, "")
-	if err != nil {
-		t.Fatal("write", err)
+	for _, metricSet := range metricSets {
+		config := logstash.GetConfig(metricSet)
+		f := mbtest.NewReportingMetricSetV2(t, config)
+		err := mbtest.WriteEventsReporterV2(f, t, metricSet)
+		if err != nil {
+			t.Fatal("write", err)
+		}
 	}
 }

metricbeat/module/logstash/node/_meta/data.json

@@ -1,23 +1,26 @@
 {
     "@timestamp": "2017-10-12T08:05:34.853Z",
-    "beat": {
+    "agent": {
         "hostname": "host.example.com",
         "name": "host.example.com"
     },
     "logstash": {
         "node": {
-            "host": "5256c6d0f05a",
+            "host": "Shaunaks-MBP-2",
             "jvm": {
-                "pid": 1,
-                "version": "1.8.0_161"
+                "pid": 3674,
+                "version": "1.8.0_171"
             },
-            "version": "6.2.3"
+            "version": "7.0.0-alpha1"
         }
     },
     "metricset": {
         "host": "127.0.0.1:9600",
         "module": "logstash",
         "name": "node",
         "rtt": 115
+    },
+    "service": {
+        "name": "logstash"
     }
 }

metricbeat/module/logstash/node_stats/_meta/data.json

@@ -1,16 +1,16 @@
 {
     "@timestamp": "2017-10-12T08:05:34.853Z",
-    "beat": {
+    "agent": {
         "hostname": "host.example.com",
         "name": "host.example.com"
     },
     "logstash": {
         "node": {
             "stats": {
                 "events": {
-                    "filtered": 0,
-                    "in": 0,
-                    "out": 0
+                    "filtered": 30750,
+                    "in": 1,
+                    "out": 30750
                 }
             }
         }
@@ -21,5 +21,8 @@
         "name": "node_stats",
         "namespace": "logstash.node.stats",
         "rtt": 115
+    },
+    "service": {
+        "name": "logstash"
     }
 }