From ca800a4b3f9dea53c4684cf15465c1a6f99e8e6a Mon Sep 17 00:00:00 2001 From: klacabane Date: Tue, 8 Nov 2022 17:42:47 +0100 Subject: [PATCH 1/4] fix logstash mappings --- .../data_stream/node_stats/fields/fields.yml | 118 ++++++++---------- .../node_stats/fields/package-fields.yml | 4 +- 2 files changed, 58 insertions(+), 64 deletions(-) diff --git a/packages/logstash/data_stream/node_stats/fields/fields.yml b/packages/logstash/data_stream/node_stats/fields/fields.yml index 3a7837659fd..443922e0bca 100644 --- a/packages/logstash/data_stream/node_stats/fields/fields.yml +++ b/packages/logstash/data_stream/node_stats/fields/fields.yml @@ -151,72 +151,64 @@ type: long - name: pipelines type: nested - fields: - - name: id - type: keyword - description: id - - name: hash - type: keyword - - name: ephemeral_id - type: keyword - - name: reloads - type: group - fields: - - name: failures - type: long - - name: successes - type: long - - name: queue - type: group - fields: - - name: events_count - type: long - - name: type - type: keyword - - name: queue_size_in_bytes - type: long - - name: max_queue_size_in_bytes - type: long - - name: events - type: group - fields: - - name: in - type: long - - name: out - type: long - - name: filtered - type: long - - name: duration_in_millis - type: long - - name: queue_push_duration_in_millis - type: long - - name: vertices - type: nested - fields: - - name: long_counters.name - type: keyword - - name: long_counters - type: nested - fields: - - name: value - type: long - - name: duration_in_millis - type: long - - name: events_in - type: long - - name: pipeline_ephemeral_id - type: keyword - description: pipeline_ephemeral_id - - name: events_out - type: long - description: events_out - - name: queue_push_duration_in_millis - type: long - description: queue_push_duration_in_millis - - name: reloads + - name: pipelines.id + type: keyword + - name: pipelines.hash + type: keyword + - name: pipelines.ephemeral_id + type: keyword + - name: pipelines.reloads type: group fields: - name: failures type: long - name: successes type: long + - name: pipelines.queue + type: group + fields: + - name: events_count + type: long + - name: type + type: keyword + - name: queue_size_in_bytes + type: long + - name: max_queue_size_in_bytes + type: long + - name: pipelines.events + type: group + fields: + - name: in + type: long + - name: out + type: long + - name: filtered + type: long + - name: duration_in_millis + type: long + - name: queue_push_duration_in_millis + type: long + - name: pipelines.vertices + type: nested + - name: pipelines.vertices.id + type: keyword + description: id + - name: pipelines.vertices.long_counters + type: nested + - name: pipelines.vertices.long_counters.name + type: keyword + - name: pipelines.vertices.long_counters.value + type: long + - name: pipelines.vertices.duration_in_millis + type: long + - name: pipelines.vertices.events_in + type: long + - name: pipelines.vertices.pipeline_ephemeral_id + type: keyword + description: pipeline_ephemeral_id + - name: pipelines.vertices.events_out + type: long + description: events_out + - name: pipelines.vertices.queue_push_duration_in_millis + type: long + description: queue_push_duration_in_millis diff --git a/packages/logstash/data_stream/node_stats/fields/package-fields.yml b/packages/logstash/data_stream/node_stats/fields/package-fields.yml index b446c06e0ef..91d4e5d8341 100644 --- a/packages/logstash/data_stream/node_stats/fields/package-fields.yml +++ b/packages/logstash/data_stream/node_stats/fields/package-fields.yml @@ -1,6 +1,8 @@ -- name: logstash.cluster.id +- name: cluster_uuid type: alias path: logstash.elasticsearch.cluster.id +- name: logstash.cluster.id + type: keyword - name: timestamp type: alias path: "@timestamp" From 3a82022dd4e8d6b91452c9beabd69ad0dac939b1 Mon Sep 17 00:00:00 2001 From: klacabane Date: Tue, 8 Nov 2022 18:11:49 +0100 Subject: [PATCH 2/4] add reloads mapping --- packages/logstash/data_stream/node_stats/fields/fields.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/logstash/data_stream/node_stats/fields/fields.yml b/packages/logstash/data_stream/node_stats/fields/fields.yml index 443922e0bca..0819e2bd9bd 100644 --- a/packages/logstash/data_stream/node_stats/fields/fields.yml +++ b/packages/logstash/data_stream/node_stats/fields/fields.yml @@ -16,6 +16,13 @@ - name: stats type: group fields: + - name: reloads + type: group + fields: + - name: failures + type: long + - name: successes + type: long - name: timestamp type: date - name: jvm From 9860fa37667addc46bbb36f1f367371b0ea25044 Mon Sep 17 00:00:00 2001 From: klacabane Date: Wed, 9 Nov 2022 11:44:20 +0100 Subject: [PATCH 3/4] add changelog entry --- packages/logstash/changelog.yml | 5 +++++ packages/logstash/manifest.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/logstash/changelog.yml b/packages/logstash/changelog.yml index 038dafd1d7e..b42c572e8fc 100644 --- a/packages/logstash/changelog.yml +++ b/packages/logstash/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "2.1.1-preview1" + changes: + - description: Fix mappings + type: bugfix + link: https://github.com/elastic/integrations/pull/4594 - version: "2.1.0-preview1" changes: - description: Suffix `stack_monitoring` to the datasets diff --git a/packages/logstash/manifest.yml b/packages/logstash/manifest.yml index cfddef29f74..98e4a647c90 100644 --- a/packages/logstash/manifest.yml +++ b/packages/logstash/manifest.yml @@ -1,6 +1,6 @@ name: logstash title: Logstash -version: 2.1.0-preview1 +version: 2.1.1-preview1 description: Collect logs and metrics from Logstash with Elastic Agent. type: integration icons: From 1a12d8c1d0877f75b49a5e133f798e81a843aabf Mon Sep 17 00:00:00 2001 From: klacabane Date: Wed, 16 Nov 2022 12:15:18 +0100 Subject: [PATCH 4/4] changelog --- packages/logstash/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/logstash/changelog.yml b/packages/logstash/changelog.yml index b42c572e8fc..0e05c408ba4 100644 --- a/packages/logstash/changelog.yml +++ b/packages/logstash/changelog.yml @@ -1,7 +1,7 @@ # newer versions go on top - version: "2.1.1-preview1" changes: - - description: Fix mappings + - description: Fix mappings of type nested type: bugfix link: https://github.com/elastic/integrations/pull/4594 - version: "2.1.0-preview1"