Make logstash node system test more stable (#5797)

* Make logstash node system test more stable

metricbeat/module/logstash/_meta/Dockerfile

@@ -1,4 +1,5 @@
 FROM docker.elastic.co/logstash/logstash:6.0.0
 
+COPY healthcheck.sh /
 ENV XPACK_MONITORING_ENABLED=FALSE
-HEALTHCHECK --interval=1s --retries=90 CMD curl -f http://localhost:9600/_node/stats
+HEALTHCHECK --interval=1s --retries=90 CMD sh /healthcheck.sh

metricbeat/module/logstash/_meta/healthcheck.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+# Check that both endpoints are available
+curl -f http://localhost:9600/_node || exit 1
+curl -f http://localhost:9600/_node/stats || exit 1
+curl -f http://localhost:9600/_node/stats | grep '"in":' || exit 1

metricbeat/module/logstash/node/node_integration_test.go

@@ -13,7 +13,6 @@ import (
 )
 
 func TestFetch(t *testing.T) {
-
 	compose.EnsureUpWithTimeout(t, 120, "logstash")
 
 	f := mbtest.NewEventFetcher(t, logstash.GetConfig("node"))

metricbeat/tests/system/test_logstash.py

@@ -1,6 +1,7 @@
 import os
 import metricbeat
 import unittest
+import time
 
 
 class Test(metricbeat.BaseTest):
@@ -33,7 +34,7 @@ def test_node(self):
         self.assert_fields_are_documented(evt)
 
     @unittest.skipUnless(metricbeat.INTEGRATION_TESTS, "integration test")
-    def test_node(self):
+    def test_node_stats(self):
         """
         logstash node_stats metricset test
         """