Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions packages/nginx/changelog.yml
Original file line number Diff line number Diff line change
@@ -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

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

drive-by, because I happened to be looking, this is #3691

- version: "1.4.1"
changes:
- description: Update documentation with additional context for new users.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{{#if ignore_older}}
ignore_older: {{ignore_older}}
{{/if}}
paths:
{{#each paths}}
- {{this}}
Expand Down
8 changes: 8 additions & 0 deletions packages/nginx/data_stream/access/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any specific reason we are having 72h as a default?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like at least a few other data streams set the same default, so I went with that.

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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
{{#if ignore_older}}
ignore_older: {{ignore_older}}
{{/if}}
paths:
{{#each paths}}
- {{this}}
Expand Down
8 changes: 8 additions & 0 deletions packages/nginx/data_stream/error/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion packages/nginx/manifest.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions packages/system/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "1.18.0"
changes:
- description: Add ignore_older to remaining logs
type: enhancement
link: https://github.com/elastic/integrations/pull/3690
- version: "1.17.0"
changes:
- description: Add processor and tag fields
Expand Down
11 changes: 7 additions & 4 deletions packages/system/data_stream/auth/agent/stream/log.yml.hbs
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
{{#if ignore_older}}
ignore_older: {{ignore_older}}
{{/if}}
paths:
{{#each paths as |path i|}}
- {{path}}
- {{path}}
{{/each}}
exclude_files: [".gz$"]
multiline:
pattern: "^\\s"
match: after
pattern: "^\\s"
match: after
processors:
- add_locale: ~
- add_locale: ~
8 changes: 8 additions & 0 deletions packages/system/data_stream/auth/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 7 additions & 4 deletions packages/system/data_stream/syslog/agent/stream/log.yml.hbs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
paths:
{{#each paths as |path i|}}
- {{path}}
- {{path}}
{{/each}}
exclude_files: [".gz$"]
multiline:
pattern: "^\\s"
match: after
pattern: "^\\s"
match: after
processors:
- add_locale: ~
- add_locale: ~
{{#if processors.length}}
processors:
{{processors}}
Expand All @@ -17,4 +17,7 @@ tags:
{{#each tags as |tag i|}}
- {{tag}}
{{/each}}
{{/if}}
{{#if ignore_older}}
ignore_older: {{ignore_older}}
{{/if}}
8 changes: 8 additions & 0 deletions packages/system/data_stream/syslog/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion packages/system/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
format_version: 1.0.0
name: system
title: System
version: 1.17.0
version: 1.18.0
license: basic
description: Collect system logs and metrics from your servers with Elastic Agent.
type: integration
Expand Down