Skip to content

Commit d8f55f0

Browse files
herrBezherrBez
authored
Merge branch 'main' into fix-nginx-host-field
2 parents bb24da6 + ec5fc71 commit d8f55f0

File tree

126 files changed

+2131
-258
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+2131
-258
lines changed

‎packages/elastic_agent/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.6.7"
3+
changes:
4+
- description: Add mapping for error fields for beats logs.
5+
type: enhancement
6+
link: "https://github.com/elastic/integrations/pull/15768"
27
- version: "2.6.6"
38
changes:
49
- description: Fixes Unhealthy Elastic Agent alert rule to include degraded status

‎packages/elastic_agent/data_stream/apm_server_logs/fields/ecs.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,11 @@
1212
external: ecs
1313
- name: agent.version
1414
external: ecs
15+
- name: error.code
16+
external: ecs
17+
- name: error.id
18+
external: ecs
19+
- name: error.message
20+
external: ecs
1521
- name: log.level
1622
external: ecs

‎packages/elastic_agent/data_stream/auditbeat_logs/fields/ecs.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,11 @@
1212
external: ecs
1313
- name: agent.version
1414
external: ecs
15+
- name: error.code
16+
external: ecs
17+
- name: error.id
18+
external: ecs
19+
- name: error.message
20+
external: ecs
1521
- name: log.level
1622
external: ecs

‎packages/elastic_agent/data_stream/cloud_defend_logs/fields/ecs.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
external: ecs
1313
- name: agent.version
1414
external: ecs
15+
- name: error.code
16+
external: ecs
17+
- name: error.id
18+
external: ecs
19+
- name: error.message
20+
external: ecs
1521
- external: ecs
1622
name: log.level
1723
- external: ecs

‎packages/elastic_agent/data_stream/cloudbeat_logs/fields/ecs.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
external: ecs
1313
- name: agent.version
1414
external: ecs
15+
- name: error.code
16+
external: ecs
17+
- name: error.id
18+
external: ecs
19+
- name: error.message
20+
external: ecs
1521
- external: ecs
1622
name: log.level
1723
- external: ecs

‎packages/elastic_agent/data_stream/elastic_agent_logs/fields/ecs.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@
1414
external: ecs
1515
- name: log.level
1616
external: ecs
17+
- name: error.code
18+
external: ecs
19+
- name: error.id
20+
external: ecs
21+
- name: error.message
22+
external: ecs

‎packages/elastic_agent/data_stream/filebeat_input_logs/fields/base-fields.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,9 @@
66
external: ecs
77
- name: "@timestamp"
88
external: ecs
9+
- name: error.code
10+
external: ecs
11+
- name: error.id
12+
external: ecs
13+
- name: error.message
14+
external: ecs

‎packages/elastic_agent/data_stream/filebeat_logs/fields/ecs.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,11 @@
1212
external: ecs
1313
- name: agent.version
1414
external: ecs
15+
- name: error.code
16+
external: ecs
17+
- name: error.id
18+
external: ecs
19+
- name: error.message
20+
external: ecs
1521
- name: log.level
1622
external: ecs

‎packages/elastic_agent/data_stream/fleet_server_logs/fields/ecs.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
external: ecs
1515
- name: log.level
1616
external: ecs
17+
- name: error.code
18+
external: ecs
19+
- name: error.id
20+
external: ecs
1721
- name: error.message
1822
external: ecs
1923
- name: http.request.id

‎packages/elastic_agent/data_stream/heartbeat_logs/fields/ecs.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,9 @@
1414
external: ecs
1515
- name: log.level
1616
external: ecs
17+
- name: error.code
18+
external: ecs
19+
- name: error.id
20+
external: ecs
21+
- name: error.message
22+
external: ecs

0 commit comments

Comments
 (0)