diff --git a/packages/nginx/changelog.yml b/packages/nginx/changelog.yml index 360892bac5b..b321ab7fffa 100644 --- a/packages/nginx/changelog.yml +++ b/packages/nginx/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.5.0" + changes: + - description: Add ignore_older to log data streams + type: enhancement + link: https://github.com/elastic/integrations/pull/3690 - version: "1.4.1" changes: - description: Update documentation with additional context for new users. diff --git a/packages/nginx/data_stream/access/agent/stream/stream.yml.hbs b/packages/nginx/data_stream/access/agent/stream/stream.yml.hbs index 531705c5f3f..8fb8db0c708 100644 --- a/packages/nginx/data_stream/access/agent/stream/stream.yml.hbs +++ b/packages/nginx/data_stream/access/agent/stream/stream.yml.hbs @@ -1,3 +1,6 @@ +{{#if ignore_older}} +ignore_older: {{ignore_older}} +{{/if}} paths: {{#each paths}} - {{this}} diff --git a/packages/nginx/data_stream/access/manifest.yml b/packages/nginx/data_stream/access/manifest.yml index 4892e1f828c..137825e3843 100644 --- a/packages/nginx/data_stream/access/manifest.yml +++ b/packages/nginx/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". title: Nginx access logs description: Collect Nginx access logs - input: httpjson diff --git a/packages/nginx/data_stream/error/agent/stream/stream.yml.hbs b/packages/nginx/data_stream/error/agent/stream/stream.yml.hbs index e860976a65e..dc6349ad322 100644 --- a/packages/nginx/data_stream/error/agent/stream/stream.yml.hbs +++ b/packages/nginx/data_stream/error/agent/stream/stream.yml.hbs @@ -1,3 +1,6 @@ +{{#if ignore_older}} +ignore_older: {{ignore_older}} +{{/if}} paths: {{#each paths}} - {{this}} diff --git a/packages/nginx/data_stream/error/manifest.yml b/packages/nginx/data_stream/error/manifest.yml index 1a741682a6c..70e51bec93b 100644 --- a/packages/nginx/data_stream/error/manifest.yml +++ b/packages/nginx/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". title: Nginx error logs description: Collect Nginx error logs - input: httpjson diff --git a/packages/nginx/manifest.yml b/packages/nginx/manifest.yml index ca01603cf30..84fb05f31c7 100644 --- a/packages/nginx/manifest.yml +++ b/packages/nginx/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: nginx title: Nginx -version: 1.4.1 +version: 1.5.0 license: basic description: Collect logs and metrics from Nginx HTTP servers with Elastic Agent. type: integration diff --git a/packages/system/changelog.yml b/packages/system/changelog.yml index f811e3f8e32..70a232e852c 100644 --- a/packages/system/changelog.yml +++ b/packages/system/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.19.0" + changes: + - description: Add ignore_older to remaining logs + type: enhancement + link: https://github.com/elastic/integrations/pull/3691 - version: "1.18.0" changes: - description: Separate grok parsing into stages and anchor the patterns in the system.auth pipeline. diff --git a/packages/system/data_stream/auth/agent/stream/log.yml.hbs b/packages/system/data_stream/auth/agent/stream/log.yml.hbs index 62b8bb2e9f0..184333c457f 100644 --- a/packages/system/data_stream/auth/agent/stream/log.yml.hbs +++ b/packages/system/data_stream/auth/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/system/data_stream/auth/manifest.yml b/packages/system/data_stream/auth/manifest.yml index 13bc263d200..2c53aedd718 100644 --- a/packages/system/data_stream/auth/manifest.yml +++ b/packages/system/data_stream/auth/manifest.yml @@ -4,6 +4,14 @@ type: logs streams: - input: logfile vars: + - 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". - name: paths type: text title: Paths diff --git a/packages/system/data_stream/syslog/agent/stream/log.yml.hbs b/packages/system/data_stream/syslog/agent/stream/log.yml.hbs index 13835734a55..8a671a7142a 100644 --- a/packages/system/data_stream/syslog/agent/stream/log.yml.hbs +++ b/packages/system/data_stream/syslog/agent/stream/log.yml.hbs @@ -17,4 +17,7 @@ tags: {{#each tags as |tag i|}} - {{tag}} {{/each}} +{{/if}} +{{#if ignore_older}} +ignore_older: {{ignore_older}} {{/if}} \ No newline at end of file diff --git a/packages/system/data_stream/syslog/manifest.yml b/packages/system/data_stream/syslog/manifest.yml index 23363957f5b..db2fb291b20 100644 --- a/packages/system/data_stream/syslog/manifest.yml +++ b/packages/system/data_stream/syslog/manifest.yml @@ -26,6 +26,14 @@ streams: show_user: false 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: System syslog logs (log) description: Collect System syslog logs using log input diff --git a/packages/system/manifest.yml b/packages/system/manifest.yml index 0d1dd066e93..ccff9cd3baa 100644 --- a/packages/system/manifest.yml +++ b/packages/system/manifest.yml @@ -1,7 +1,7 @@ format_version: 1.0.0 name: system title: System -version: 1.18.0 +version: 1.19.0 license: basic description: Collect system logs and metrics from your servers with Elastic Agent. type: integration