From 3bf9543597a7f4d1221b3c2e668e6444b57fab19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmuthu-mps=E2=80=9D?= Date: Thu, 4 Aug 2022 12:08:14 +0530 Subject: [PATCH 1/3] add ignore_older flag to iis --- packages/iis/changelog.yml | 5 +++++ packages/iis/data_stream/access/manifest.yml | 8 ++++++++ packages/iis/data_stream/error/manifest.yml | 8 ++++++++ packages/iis/manifest.yml | 2 +- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/packages/iis/changelog.yml b/packages/iis/changelog.yml index 2203b7512fa..14cb69c6eef 100644 --- a/packages/iis/changelog.yml +++ b/packages/iis/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.1.0" + changes: + - description: Add Ignore older than flag for logs stream + type: enhancement + link: https://github.com/elastic/integrations/pull/3620 - version: "1.0.0" changes: - description: Make IIS GA diff --git a/packages/iis/data_stream/access/manifest.yml b/packages/iis/data_stream/access/manifest.yml index bacb7b3740c..1ac420b62b8 100644 --- a/packages/iis/data_stream/access/manifest.yml +++ b/packages/iis/data_stream/access/manifest.yml @@ -36,6 +36,14 @@ streams: description: > Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the logs are parsed. See [Processors](https://www.elastic.co/guide/en/beats/filebeat/current/filtering-and-enhancing-data.html) for details. + - name: ignore_older + type: text + title: Ignore events older than + default: 72h + required: false + show_user: false + description: >- + If this option is specified, events that are older than the specified amount of time are ignored. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". template_path: "log.yml.hbs" title: "IIS access logs (log)" description: "Collect IIS access logs using log input" diff --git a/packages/iis/data_stream/error/manifest.yml b/packages/iis/data_stream/error/manifest.yml index 06fe5c81eb1..65bfeca0003 100644 --- a/packages/iis/data_stream/error/manifest.yml +++ b/packages/iis/data_stream/error/manifest.yml @@ -36,6 +36,14 @@ streams: description: > Processors are used to reduce the number of fields in the exported event or to enhance the event with metadata. This executes in the agent before the logs are parsed. See [Processors](https://www.elastic.co/guide/en/beats/filebeat/current/filtering-and-enhancing-data.html) for details. + - name: ignore_older + type: text + title: Ignore events older than + default: 72h + required: false + show_user: false + description: >- + If this option is specified, events that are older than the specified amount of time are ignored. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". template_path: "log.yml.hbs" title: "IIS error logs (log)" description: "Collect IIS error logs using log input" diff --git a/packages/iis/manifest.yml b/packages/iis/manifest.yml index bf1652173b1..fed236cdf27 100644 --- a/packages/iis/manifest.yml +++ b/packages/iis/manifest.yml @@ -1,6 +1,6 @@ name: iis title: IIS -version: 1.0.0 +version: 1.1.0 description: Collect logs and metrics from Internet Information Services (IIS) servers with Elastic Agent. type: integration icons: From 03ece61957c03c10e1883ddc810fc34263634aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmuthu-mps=E2=80=9D?= Date: Wed, 14 Sep 2022 16:03:52 +0530 Subject: [PATCH 2/3] updated script changes --- packages/iis/data_stream/access/agent/stream/log.yml.hbs | 3 +++ packages/iis/data_stream/error/agent/stream/log.yml.hbs | 3 +++ 2 files changed, 6 insertions(+) diff --git a/packages/iis/data_stream/access/agent/stream/log.yml.hbs b/packages/iis/data_stream/access/agent/stream/log.yml.hbs index d9170c50ff6..bc3e6d63735 100644 --- a/packages/iis/data_stream/access/agent/stream/log.yml.hbs +++ b/packages/iis/data_stream/access/agent/stream/log.yml.hbs @@ -1,3 +1,6 @@ +{{#if ignore_older}} + ignore_older: {{ignore_older}} +{{/if}} paths: {{#each paths as |path i|}} - {{path}} diff --git a/packages/iis/data_stream/error/agent/stream/log.yml.hbs b/packages/iis/data_stream/error/agent/stream/log.yml.hbs index d9170c50ff6..bc3e6d63735 100644 --- a/packages/iis/data_stream/error/agent/stream/log.yml.hbs +++ b/packages/iis/data_stream/error/agent/stream/log.yml.hbs @@ -1,3 +1,6 @@ +{{#if ignore_older}} + ignore_older: {{ignore_older}} +{{/if}} paths: {{#each paths as |path i|}} - {{path}} From be9192dce8372704117f2b10136d744e6e614978 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Cmuthu-mps=E2=80=9D?= Date: Mon, 19 Sep 2022 17:16:24 +0530 Subject: [PATCH 3/3] PR link updated --- packages/iis/changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/iis/changelog.yml b/packages/iis/changelog.yml index 14cb69c6eef..8fcaef8d2ad 100644 --- a/packages/iis/changelog.yml +++ b/packages/iis/changelog.yml @@ -3,7 +3,7 @@ changes: - description: Add Ignore older than flag for logs stream type: enhancement - link: https://github.com/elastic/integrations/pull/3620 + link: https://github.com/elastic/integrations/pull/4212 - version: "1.0.0" changes: - description: Make IIS GA