diff --git a/packages/logstash/changelog.yml b/packages/logstash/changelog.yml index af1f26b9821..301a4584f12 100644 --- a/packages/logstash/changelog.yml +++ b/packages/logstash/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "2.3.0-preview1" + changes: + - description: Add ability to set condition for logs and metrics. + type: enhancement + link: https://github.com/elastic/integrations/pull/5557 - version: "2.2.3-preview1" changes: - description: Clarify that the metrics collected power the Stack Monitoring application diff --git a/packages/logstash/data_stream/log/agent/stream/log.yml.hbs b/packages/logstash/data_stream/log/agent/stream/log.yml.hbs index db3a4e3a254..c1733cbbd3c 100644 --- a/packages/logstash/data_stream/log/agent/stream/log.yml.hbs +++ b/packages/logstash/data_stream/log/agent/stream/log.yml.hbs @@ -13,4 +13,7 @@ processors: - add_fields: target: '' fields: - ecs.version: 1.10.0 \ No newline at end of file + ecs.version: 1.10.0 +{{#if condition}} +condition: {{ condition }} +{{/if}} diff --git a/packages/logstash/data_stream/node/agent/stream/stream.yml.hbs b/packages/logstash/data_stream/node/agent/stream/stream.yml.hbs index 1fb75b1a64a..ad98bd5909f 100644 --- a/packages/logstash/data_stream/node/agent/stream/stream.yml.hbs +++ b/packages/logstash/data_stream/node/agent/stream/stream.yml.hbs @@ -12,4 +12,7 @@ password: {{password}} period: {{period}} {{#if ssl}} ssl: {{ssl}} -{{/if}} \ No newline at end of file +{{/if}} +{{#if condition}} +condition: {{ condition }} +{{/if}} diff --git a/packages/logstash/data_stream/node_stats/agent/stream/stream.yml.hbs b/packages/logstash/data_stream/node_stats/agent/stream/stream.yml.hbs index 377fd6aa7f4..091663a7f88 100644 --- a/packages/logstash/data_stream/node_stats/agent/stream/stream.yml.hbs +++ b/packages/logstash/data_stream/node_stats/agent/stream/stream.yml.hbs @@ -12,4 +12,7 @@ password: {{password}} period: {{period}} {{#if ssl}} ssl: {{ssl}} -{{/if}} \ No newline at end of file +{{/if}} +{{#if condition}} +condition: {{ condition }} +{{/if}} diff --git a/packages/logstash/data_stream/slowlog/agent/stream/log.yml.hbs b/packages/logstash/data_stream/slowlog/agent/stream/log.yml.hbs index 679cc8d4df3..7c198a02ce9 100644 --- a/packages/logstash/data_stream/slowlog/agent/stream/log.yml.hbs +++ b/packages/logstash/data_stream/slowlog/agent/stream/log.yml.hbs @@ -9,4 +9,7 @@ processors: - add_fields: target: '' fields: - ecs.version: 1.10.0 \ No newline at end of file + ecs.version: 1.10.0 +{{#if condition}} +condition: {{ condition }} +{{/if}} diff --git a/packages/logstash/manifest.yml b/packages/logstash/manifest.yml index 9e6e19c445c..6d455b478ec 100644 --- a/packages/logstash/manifest.yml +++ b/packages/logstash/manifest.yml @@ -1,6 +1,6 @@ name: logstash title: Logstash -version: 2.2.3-preview1 +version: 2.3.0-preview1 description: Collect logs and metrics from Logstash with Elastic Agent. type: integration icons: @@ -32,6 +32,14 @@ policy_templates: - type: logfile title: "Logs" description: "Collect application and slowlog logs from Logstash instances" + vars: + - name: condition + title: Condition + description: Condition to filter when to collect this input + type: text + multi: false + required: false + show_user: false - type: logstash/metrics title: "Metrics (Stack Monitoring)" description: "Collect node metrics and stats from Logstash instances to power the Stack Monitoring application in Kibana" @@ -69,3 +77,10 @@ policy_templates: #certificate_authorities: ["/etc/ca.crt"] #certificate: "/etc/client.crt" #key: "/etc/client.key" + - name: condition + title: Condition + description: Condition to filter when to collect this input + type: text + multi: false + required: false + show_user: false