Skip to content

Commit bb239d9

Browse files
agithomasagithomas
authored
Merge branch 'main' into issue-262-new-lambda-dataset
2 parents 2c2489e + 412ecef commit bb239d9

File tree

34 files changed

+514
-96
lines changed

34 files changed

+514
-96
lines changed

‎packages/apache_tomcat/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: "1.11.0"
3+
changes:
4+
- description: Add support for defining Conditions
5+
type: enhancement
6+
link: https://github.com/elastic/integrations/pull/12879
27
- version: "1.10.0"
38
changes:
49
- description: Added support for %D attribute in access logs

‎packages/apache_tomcat/data_stream/access/agent/stream/filestream.yml.hbs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ harvester_limit: {{harvester_limit}}
2323
{{#if close.on_state_change.inactive}}
2424
close.on_state_change.inactive: {{close.on_state_change.inactive}}
2525
{{/if}}
26+
{{#if condition }}
27+
condition: {{ condition }}
28+
{{/if}}

‎packages/apache_tomcat/data_stream/cache/agent/stream/stream.yml.hbs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ tags:
2323
processors:
2424
{{processors}}
2525
{{/if}}
26+
{{#if condition }}
27+
condition: {{ condition }}
28+
{{/if}}

‎packages/apache_tomcat/data_stream/catalina/agent/stream/filestream.yml.hbs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@ fields:
3333
parsers:
3434
{{parsers}}
3535
{{/if}}
36+
{{#if condition }}
37+
condition: {{ condition }}
38+
{{/if}}

‎packages/apache_tomcat/data_stream/connection_pool/agent/stream/stream.yml.hbs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ tags:
2323
processors:
2424
{{processors}}
2525
{{/if}}
26+
{{#if condition }}
27+
condition: {{ condition }}
28+
{{/if}}

‎packages/apache_tomcat/data_stream/localhost/agent/stream/filestream.yml.hbs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,6 @@ fields:
3333
parsers:
3434
{{parsers}}
3535
{{/if}}
36+
{{#if condition }}
37+
condition: {{ condition }}
38+
{{/if}}

‎packages/apache_tomcat/data_stream/memory/agent/stream/stream.yml.hbs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@ tags:
2222
{{#if processors}}
2323
processors:
2424
{{processors}}
25-
{{/if}}
25+
{{/if}}
26+
{{#if condition }}
27+
condition: {{ condition }}
28+
{{/if}}

‎packages/apache_tomcat/data_stream/request/agent/stream/stream.yml.hbs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ tags:
2323
processors:
2424
{{processors}}
2525
{{/if}}
26+
{{#if condition }}
27+
condition: {{ condition }}
28+
{{/if}}

‎packages/apache_tomcat/data_stream/session/agent/stream/stream.yml.hbs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,6 @@ tags:
2323
processors:
2424
{{processors}}
2525
{{/if}}
26+
{{#if condition }}
27+
condition: {{ condition }}
28+
{{/if}}

‎packages/apache_tomcat/data_stream/thread_pool/agent/stream/stream.yml.hbs‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,7 @@ tags:
2222
{{#if processors}}
2323
processors:
2424
{{processors}}
25-
{{/if}}
25+
{{/if}}
26+
{{#if condition }}
27+
condition: {{ condition }}
28+
{{/if}}

0 commit comments

Comments
 (0)