diff --git a/packages/nginx_ingress_controller/changelog.yml b/packages/nginx_ingress_controller/changelog.yml index 98fbd253887..ac9928fc11e 100644 --- a/packages/nginx_ingress_controller/changelog.yml +++ b/packages/nginx_ingress_controller/changelog.yml @@ -1,4 +1,9 @@ # newer versions go on top +- version: "1.14.0" + changes: + - description: Add fingerprint settings for container-logs being scraped after containerd rotating logs. + type: enhancement + link: https://github.com/elastic/integrations/pull/16913 - version: "1.13.0" changes: - description: Add filestream input ids in the data streams. WARNING Updating to this version will cause logs to be re-ingested! diff --git a/packages/nginx_ingress_controller/data_stream/access/agent/stream/stream.yml.hbs b/packages/nginx_ingress_controller/data_stream/access/agent/stream/stream.yml.hbs index 427e69af7b7..c361962b2ee 100644 --- a/packages/nginx_ingress_controller/data_stream/access/agent/stream/stream.yml.hbs +++ b/packages/nginx_ingress_controller/data_stream/access/agent/stream/stream.yml.hbs @@ -21,7 +21,14 @@ processors: {{/if}} condition: {{ condition }} prospector.scanner.symlinks: {{ symlinks }} +{{#if useFingerprint}} +file_identity.fingerprint: ~ +prospector: + scanner: + fingerprint: + {{ fingerprintYaml }} +{{/if}} parsers: - container: stream: stdout - format: auto \ No newline at end of file + format: auto diff --git a/packages/nginx_ingress_controller/data_stream/access/manifest.yml b/packages/nginx_ingress_controller/data_stream/access/manifest.yml index 0242a3df020..be25731ba37 100644 --- a/packages/nginx_ingress_controller/data_stream/access/manifest.yml +++ b/packages/nginx_ingress_controller/data_stream/access/manifest.yml @@ -44,6 +44,23 @@ streams: type: bool multi: false default: true + - name: useFingerprint + type: bool + title: Use fingerprint + multi: false + required: true + show_user: false + description: Selecting fingerprint instructs Elastic Agent to identify files based on their content byte range. + default: true + - name: fingerprintYaml + title: Fingerprint settings + show_user: false + description: Configuration settings for prospector.scanner.fingerprint. See available options in [filestream input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html#filebeat-input-filestream-scan-fingerprint). + type: yaml + default: | + enabled: true # This must be set to `true` + offset: 0 + length: 1024 - name: condition title: Condition description: Condition to filter when to apply this datastream diff --git a/packages/nginx_ingress_controller/data_stream/error/agent/stream/stream.yml.hbs b/packages/nginx_ingress_controller/data_stream/error/agent/stream/stream.yml.hbs index c180cfb7e21..63a854a19a5 100644 --- a/packages/nginx_ingress_controller/data_stream/error/agent/stream/stream.yml.hbs +++ b/packages/nginx_ingress_controller/data_stream/error/agent/stream/stream.yml.hbs @@ -30,7 +30,14 @@ processors: {{/if}} condition: {{ condition }} prospector.scanner.symlinks: {{ symlinks }} +{{#if useFingerprint}} +file_identity.fingerprint: ~ +prospector: + scanner: + fingerprint: + {{ fingerprintYaml }} +{{/if}} parsers: - container: stream: stderr - format: auto \ No newline at end of file + format: auto diff --git a/packages/nginx_ingress_controller/data_stream/error/manifest.yml b/packages/nginx_ingress_controller/data_stream/error/manifest.yml index bfd60a8f014..b5c92823fbb 100644 --- a/packages/nginx_ingress_controller/data_stream/error/manifest.yml +++ b/packages/nginx_ingress_controller/data_stream/error/manifest.yml @@ -44,6 +44,23 @@ streams: type: bool multi: false default: true + - name: useFingerprint + type: bool + title: Use fingerprint + multi: false + required: true + show_user: false + description: Selecting fingerprint instructs Elastic Agent to identify files based on their content byte range. + default: true + - name: fingerprintYaml + title: Fingerprint settings + show_user: false + description: Configuration settings for prospector.scanner.fingerprint. See available options in [filestream input](https://www.elastic.co/guide/en/beats/filebeat/current/filebeat-input-filestream.html#filebeat-input-filestream-scan-fingerprint). + type: yaml + default: | + enabled: true # This must be set to `true` + offset: 0 + length: 1024 - name: condition title: Condition description: Condition to filter when to apply this datastream diff --git a/packages/nginx_ingress_controller/manifest.yml b/packages/nginx_ingress_controller/manifest.yml index cfba5390ba4..ca0db13b1c4 100644 --- a/packages/nginx_ingress_controller/manifest.yml +++ b/packages/nginx_ingress_controller/manifest.yml @@ -1,7 +1,7 @@ format_version: 3.0.4 name: nginx_ingress_controller title: Nginx Ingress Controller Logs -version: 1.13.0 +version: 1.14.0 description: Collect Nginx Ingress Controller logs. type: integration categories: