From 8944541c6870d6d1a120fd3249de92677fedcfc2 Mon Sep 17 00:00:00 2001 From: Julien Orain Date: Thu, 20 Apr 2023 15:22:52 +0200 Subject: [PATCH 1/6] add ssl support to elasticsearch ingest_pipeline --- .../data_stream/ingest_pipeline/agent/stream/stream.yml.hbs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs index 822705f1693..d798b766710 100644 --- a/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs @@ -11,5 +11,8 @@ username: {{username}} password: {{password}} {{/if}} period: {{period}} +{{#if ssl}} +ssl: {{ssl}} +{{/if}} -ingest_pipeline.processor_sample_rate: {{ingest_pipeline_processor_sampling_rate}} \ No newline at end of file +ingest_pipeline.processor_sample_rate: {{ingest_pipeline_processor_sampling_rate}} From 57674eb33f9cf81c801781061353a961b7706e5e Mon Sep 17 00:00:00 2001 From: Julien Orain Date: Thu, 20 Apr 2023 15:27:02 +0200 Subject: [PATCH 2/6] Update changelog.yml --- packages/elasticsearch/changelog.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/elasticsearch/changelog.yml b/packages/elasticsearch/changelog.yml index 8fbfed57574..310cbfc8778 100644 --- a/packages/elasticsearch/changelog.yml +++ b/packages/elasticsearch/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.6.2" + changes: + - description: Add ssl support to elasticsearch ingest pipeline datastream + type: bugfix + link: https://github.com/elastic/integrations/pull/todo - version: "1.6.1" changes: - description: Add explicit mapping for event timestamp fields From 51915fae3081617de58de7531d561efc97eb27e0 Mon Sep 17 00:00:00 2001 From: Julien Orain Date: Thu, 20 Apr 2023 15:28:05 +0200 Subject: [PATCH 3/6] Update changelog.yml --- packages/elasticsearch/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/elasticsearch/changelog.yml b/packages/elasticsearch/changelog.yml index 310cbfc8778..d3638362e2e 100644 --- a/packages/elasticsearch/changelog.yml +++ b/packages/elasticsearch/changelog.yml @@ -3,7 +3,7 @@ changes: - description: Add ssl support to elasticsearch ingest pipeline datastream type: bugfix - link: https://github.com/elastic/integrations/pull/todo + link: https://github.com/elastic/integrations/pull/5939 - version: "1.6.1" changes: - description: Add explicit mapping for event timestamp fields From 63bca9e555524e24141302d6a09f97a15a74a554 Mon Sep 17 00:00:00 2001 From: Julien Orain Date: Mon, 24 Apr 2023 22:25:33 +0200 Subject: [PATCH 4/6] Update packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs Co-authored-by: Kevin Lacabane --- .../ingest_pipeline/agent/stream/stream.yml.hbs | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs b/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs index d798b766710..c3735261340 100644 --- a/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs +++ b/packages/elasticsearch/data_stream/ingest_pipeline/agent/stream/stream.yml.hbs @@ -14,5 +14,16 @@ period: {{period}} {{#if ssl}} ssl: {{ssl}} {{/if}} +{{#if leaderelection }} +{{#if condition }} +condition: ${kubernetes_leaderelection.leader} == true and {{ condition }} +{{ else }} +condition: ${kubernetes_leaderelection.leader} == true +{{/if}} +{{ else }} +{{#if condition }} +condition: {{ condition }} +{{/if}} +{{/if}} ingest_pipeline.processor_sample_rate: {{ingest_pipeline_processor_sampling_rate}} From d56057b1ca9d23f75924ca1790b07f26c0b904d3 Mon Sep 17 00:00:00 2001 From: Julien Orain Date: Mon, 24 Apr 2023 22:27:55 +0200 Subject: [PATCH 5/6] Update manifest.yml --- packages/elasticsearch/manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/elasticsearch/manifest.yml b/packages/elasticsearch/manifest.yml index d43af941f5a..df77b16c295 100644 --- a/packages/elasticsearch/manifest.yml +++ b/packages/elasticsearch/manifest.yml @@ -1,6 +1,6 @@ name: elasticsearch title: Elasticsearch -version: 1.6.1 +version: 1.6.2 description: Elasticsearch Integration type: integration icons: From 623f95f8b4ba51dd0ad004ef7221973986bfb8b3 Mon Sep 17 00:00:00 2001 From: Julien Orain Date: Tue, 25 Apr 2023 11:29:09 +0200 Subject: [PATCH 6/6] Update packages/elasticsearch/changelog.yml Co-authored-by: Kevin Lacabane --- packages/elasticsearch/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/elasticsearch/changelog.yml b/packages/elasticsearch/changelog.yml index d3638362e2e..3261b17e375 100644 --- a/packages/elasticsearch/changelog.yml +++ b/packages/elasticsearch/changelog.yml @@ -1,7 +1,7 @@ # newer versions go on top - version: "1.6.2" changes: - - description: Add ssl support to elasticsearch ingest pipeline datastream + - description: Add missing ssl, condition and leader_election support to elasticsearch ingest pipeline datastream type: bugfix link: https://github.com/elastic/integrations/pull/5939 - version: "1.6.1"