From 7c8acde480a1e57fba0675695bc160173b20cabf Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Mon, 13 Jul 2020 14:02:15 +0200 Subject: [PATCH 1/2] [logstash] fix expected logstash host and name This commit fix expected logstash host and name in Logstash tests with 6.x. When using a headless service (4a6067e), Logstash 6.x use the full name of the service. --- logstash/examples/default/test/goss.yaml | 4 ++-- logstash/examples/elasticsearch/test/goss.yaml | 4 ++-- logstash/examples/oss/test/goss.yaml | 4 ++-- logstash/examples/security/test/goss.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index 35b897737..c2087c1a7 100644 --- a/logstash/examples/default/test/goss.yaml +++ b/logstash/examples/default/test/goss.yaml @@ -9,10 +9,10 @@ http: status: 200 timeout: 2000 body: - - '"host" : "helm-logstash-default-logstash-0"' + - '"host" : "helm-logstash-default-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' - '"version" : "6.8.11"' - '"http_address" : "0.0.0.0:9600"' - - '"name" : "helm-logstash-default-logstash-0"' + - '"name" : "helm-logstash-default-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' file: /usr/share/logstash/config/logstash.yml: diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index 47838d9b3..543934026 100644 --- a/logstash/examples/elasticsearch/test/goss.yaml +++ b/logstash/examples/elasticsearch/test/goss.yaml @@ -21,10 +21,10 @@ http: status: 200 timeout: 2000 body: - - '"host" : "helm-logstash-elasticsearch-logstash-0"' + - '"host" : "helm-logstash-elasticsearch-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' - '"version" : "6.8.11"' - '"http_address" : "0.0.0.0:9600"' - - '"name" : "helm-logstash-elasticsearch-logstash-0"' + - '"name" : "helm-logstash-elasticsearch-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' http://elasticsearch-master:9200/_cat/indices: status: 200 timeout: 2000 diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index 65756e91f..b796a9e09 100644 --- a/logstash/examples/oss/test/goss.yaml +++ b/logstash/examples/oss/test/goss.yaml @@ -9,10 +9,10 @@ http: status: 200 timeout: 2000 body: - - '"host" : "helm-logstash-oss-logstash-0"' + - '"host" : "helm-logstash-oss-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' - '"version" : "6.8.11"' - '"http_address" : "0.0.0.0:9600"' - - '"name" : "helm-logstash-oss-logstash-0"' + - '"name" : "helm-logstash-oss-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' file: /usr/share/logstash/config/logstash.yml: diff --git a/logstash/examples/security/test/goss.yaml b/logstash/examples/security/test/goss.yaml index 7a562d6d0..7e5fbd7ca 100644 --- a/logstash/examples/security/test/goss.yaml +++ b/logstash/examples/security/test/goss.yaml @@ -21,10 +21,10 @@ http: status: 200 timeout: 2000 body: - - '"host" : "helm-logstash-security-logstash-0"' + - '"host" : "helm-logstash-security-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' - '"version" : "6.8.11"' - '"http_address" : "0.0.0.0:9600"' - - '"name" : "helm-logstash-security-logstash-0"' + - '"name" : "helm-logstash-security-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' https://security-master:9200/_cat/indices: status: 200 timeout: 2000 From 96ffccda5cc21e24ca142978c0f1ae90a33388a5 Mon Sep 17 00:00:00 2001 From: Julien Mailleret <8582351+jmlrt@users.noreply.github.com> Date: Mon, 13 Jul 2020 18:11:29 +0200 Subject: [PATCH 2/2] remove logstash host and name tests --- logstash/examples/default/test/goss.yaml | 2 -- logstash/examples/elasticsearch/test/goss.yaml | 2 -- logstash/examples/oss/test/goss.yaml | 2 -- logstash/examples/security/test/goss.yaml | 2 -- 4 files changed, 8 deletions(-) diff --git a/logstash/examples/default/test/goss.yaml b/logstash/examples/default/test/goss.yaml index c2087c1a7..62cba40f1 100644 --- a/logstash/examples/default/test/goss.yaml +++ b/logstash/examples/default/test/goss.yaml @@ -9,10 +9,8 @@ http: status: 200 timeout: 2000 body: - - '"host" : "helm-logstash-default-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' - '"version" : "6.8.11"' - '"http_address" : "0.0.0.0:9600"' - - '"name" : "helm-logstash-default-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' file: /usr/share/logstash/config/logstash.yml: diff --git a/logstash/examples/elasticsearch/test/goss.yaml b/logstash/examples/elasticsearch/test/goss.yaml index 543934026..fedc67ddf 100644 --- a/logstash/examples/elasticsearch/test/goss.yaml +++ b/logstash/examples/elasticsearch/test/goss.yaml @@ -21,10 +21,8 @@ http: status: 200 timeout: 2000 body: - - '"host" : "helm-logstash-elasticsearch-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' - '"version" : "6.8.11"' - '"http_address" : "0.0.0.0:9600"' - - '"name" : "helm-logstash-elasticsearch-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' http://elasticsearch-master:9200/_cat/indices: status: 200 timeout: 2000 diff --git a/logstash/examples/oss/test/goss.yaml b/logstash/examples/oss/test/goss.yaml index b796a9e09..8d4b310aa 100644 --- a/logstash/examples/oss/test/goss.yaml +++ b/logstash/examples/oss/test/goss.yaml @@ -9,10 +9,8 @@ http: status: 200 timeout: 2000 body: - - '"host" : "helm-logstash-oss-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' - '"version" : "6.8.11"' - '"http_address" : "0.0.0.0:9600"' - - '"name" : "helm-logstash-oss-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' file: /usr/share/logstash/config/logstash.yml: diff --git a/logstash/examples/security/test/goss.yaml b/logstash/examples/security/test/goss.yaml index 7e5fbd7ca..4d110b06c 100644 --- a/logstash/examples/security/test/goss.yaml +++ b/logstash/examples/security/test/goss.yaml @@ -21,10 +21,8 @@ http: status: 200 timeout: 2000 body: - - '"host" : "helm-logstash-security-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' - '"version" : "6.8.11"' - '"http_address" : "0.0.0.0:9600"' - - '"name" : "helm-logstash-security-logstash-0.helm-logstash-default-logstash-headless.default.svc.cluster.local"' https://security-master:9200/_cat/indices: status: 200 timeout: 2000