Skip to content

Commit fcddefa

Browse files
authored
Ignore "Ingest Pipeline" when "Use Logs Stream" is set (elastic#15962)
Setting the ingest pipeline breaks using the logs stream. We must have this fail-safe.
1 parent c525d06 commit fcddefa

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

packages/filestream/agent/input/filestream.yml.hbs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
{{#if use_logs_stream}}
22
index: logs
33
{{else}}
4+
45
data_stream:
56
dataset: {{data_stream.dataset}}
7+
{{#if pipeline}}
8+
pipeline: {{pipeline}}
9+
{{/if}}
10+
611
{{/if}}
712

813
paths:
@@ -14,10 +19,6 @@ paths:
1419
gzip_experimental: true
1520
{{/if}}
1621

17-
{{#if pipeline}}
18-
pipeline: {{pipeline}}
19-
{{/if}}
20-
2122
{{#if recursive_glob}}
2223
prospector.scanner.recursive_glob: {{recursive_glob}}
2324
{{/if}}

packages/filestream/changelog.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# newer versions go on top
2+
- version: "2.1.2"
3+
changes:
4+
- description: Ignore "Ingest Pipeline" when "Use Logs Stream" is set
5+
type: bugfix
6+
link: https://github.com/elastic/integrations/pull/15962
27
- version: "2.1.1"
38
changes:
49
- description: Improve documentation for the "Use the logs data stream" option.

packages/filestream/manifest.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: filestream
33
title: Custom Logs (Filestream)
44
description: Collect log data using filestream with Elastic Agent.
55
type: input
6-
version: 2.1.1
6+
version: 2.1.2
77
conditions:
88
kibana:
99
version: "^9.2.0"
@@ -42,23 +42,23 @@ policy_templates:
4242
type: bool
4343
title: Use the "logs" data stream
4444
description: |
45-
When enabled, data ingested by this integration is written to the "logs" data stream, and the configured dataset name is ignored. You also need to [Turn on wired streams](https://www.elastic.co/docs/solutions/observability/streams/wired-streams#streams-wired-streams-enable) in Streams [Settings](/app/streams) and to enable **Allow agents to write to Streams** for the output policy in the Fleet [Settings](/app/fleet/settings) tab. [Learn more](https://www.elastic.co/docs/solutions/observability/streams/wired-streams).
45+
When enabled, data ingested by this integration is written to the "logs" data stream. **The 'Ingest Pipeline' and the configured 'Dataset name' are ignored**. You also need to [Turn on wired streams](https://www.elastic.co/docs/solutions/observability/streams/wired-streams#streams-wired-streams-enable) in Streams [Settings](/app/streams) and to enable **Allow agents to write to Streams** for the output policy in the Fleet [Settings](/app/fleet/settings) tab. [Learn more](https://www.elastic.co/docs/solutions/observability/streams/wired-streams).
4646
required: false
4747
show_user: true
4848
default: false
4949
- name: data_stream.dataset
5050
type: text
5151
title: Dataset name
5252
description: |
53-
Dataset to write data to. Changing the dataset will send the data to a different index. You can't use `-` in the name of a dataset and only valid characters for [Elasticsearch index names](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-index_.html).
53+
Dataset to write data to. Changing the dataset will send the data to a different index. You can't use `-` in the name of a dataset and only valid characters for [Elasticsearch index names](https://www.elastic.co/guide/en/elasticsearch/reference/current/docs-index_.html). **This field is ignored when 'Use the "logs" data stream' is enabled**.
5454
default: filestream.generic
5555
required: true
5656
show_user: true
5757
- name: pipeline
5858
type: text
5959
title: Ingest Pipeline
6060
description: |
61-
The Ingest Node pipeline ID to be used by the integration.
61+
The Ingest Node pipeline ID to be used by the integration. **This field is ignored when 'Use the "logs" data stream' is enabled**.
6262
required: false
6363
show_user: true
6464
- name: parsers

0 commit comments

Comments
 (0)