Skip to content

Commit 89828a6

Browse files
Remove startWith usage in condition to fix issues with certain versions (#15662)
* Remove startWith usage in condition to fix issues with certain versions * Update changelog link for version 2.6.2 * Fix yaml issue * Fixing accidental key removal
1 parent d113743 commit 89828a6

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

packages/system/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.2"
3+
changes:
4+
- description: Remove startWith usage in condition default values to fix issues with certain versions.
5+
type: bugfix
6+
link: https://github.com/elastic/integrations/pull/15662
27
- version: "2.6.1"
38
changes:
49
- description: Fix timezone parsing in auth events

packages/system/manifest.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: 3.0.2
22
name: system
33
title: System
4-
version: "2.6.1"
4+
version: "2.6.2"
55
description: Collect system logs and metrics from your servers with Elastic Agent.
66
type: integration
77
categories:
@@ -60,12 +60,15 @@ policy_templates:
6060
to find the available keys and to
6161
[Conditions](https://www.elastic.co/guide/en/fleet/current/dynamic-input-configuration.html#conditions)
6262
on how to use the available keys in conditions. It defaults to
63-
'${host.os_version} != "12 (bookworm)" and ${host.os_version} != "13 (trixie)" and (${host.os_platform} != "amzn" or ${host.os_version} != "2023") and (${host.os_platform} != "sles" and startsWith(${host.os_version}, "15") == false)'
63+
'${host.os_version} != "12 (bookworm)" and ${host.os_version} != "13 (trixie)" and (${host.os_platform} != "amzn" or ${host.os_version} != "2023") and (${host.os_platform} != "sles" and ${host.os_version} != "15 SP1"
64+
and ${host.os_version} != "15 SP2" and ${host.os_version} != "15 SP3" and ${host.os_version} != "15 SP4" and ${host.os_version} != "15 SP5" and ${host.os_version} != "15 SP6" and ${host.os_version} != "15 SP7")'
6465
type: text
6566
multi: false
6667
required: false
6768
show_user: true
68-
default: ${host.os_version} != "12 (bookworm)" and ${host.os_version} != "13 (trixie)" and (${host.os_platform} != "amzn" or ${host.os_version} != "2023") and (${host.os_platform} != "sles" and startsWith(${host.os_version}, "15") == false)
69+
default: |
70+
${host.os_version} != "12 (bookworm)" and ${host.os_version} != "13 (trixie)" and (${host.os_platform} != "amzn" or ${host.os_version} != "2023") and (${host.os_platform} != "sles" and ${host.os_version} != "15 SP1"
71+
and ${host.os_version} != "15 SP2" and ${host.os_version} != "15 SP3" and ${host.os_version} != "15 SP4" and ${host.os_version} != "15 SP5" and ${host.os_version} != "15 SP6" and ${host.os_version} != "15 SP7")
6972
- type: journald
7073
title: Collect logs from System instances using Journald
7174
description: Collecting System auth and syslog logs using Journald
@@ -78,12 +81,15 @@ policy_templates:
7881
to find the available keys and to
7982
[Conditions](https://www.elastic.co/guide/en/fleet/current/dynamic-input-configuration.html#conditions)
8083
on how to use the available keys in conditions. It defaults to
81-
'${host.os_version} == "12 (bookworm)" or ${host.os_version} == "13 (trixie)" or (${host.os_platform} == "amzn" and ${host.os_version} == "2023") or (${host.os_platform} == "sles" and startsWith(${host.os_version}, "15") == true)'
84+
'${host.os_version} == "12 (bookworm)" or ${host.os_version} == "13 (trixie)" or (${host.os_platform} == "amzn" and ${host.os_version} == "2023") or (${host.os_platform} == "sles" and (${host.os_version} == "15 SP1"
85+
or ${host.os_version} == "15 SP2" or ${host.os_version} == "15 SP3" or ${host.os_version} == "15 SP4" or ${host.os_version} == "15 SP5" or ${host.os_version} == "15 SP6" or ${host.os_version} == "15 SP7"))'
8286
type: text
8387
multi: false
8488
required: false
8589
show_user: true
86-
default: ${host.os_version} == "12 (bookworm)" or ${host.os_version} == "13 (trixie)" or (${host.os_platform} == "amzn" and ${host.os_version} == "2023") or (${host.os_platform} == "sles" and startsWith(${host.os_version}, "15") == true)
90+
default: |
91+
${host.os_version} == "12 (bookworm)" or ${host.os_version} == "13 (trixie)" or (${host.os_platform} == "amzn" and ${host.os_version} == "2023") or (${host.os_platform} == "sles" and (${host.os_version} == "15 SP1"
92+
or ${host.os_version} == "15 SP2" or ${host.os_version} == "15 SP3" or ${host.os_version} == "15 SP4" or ${host.os_version} == "15 SP5" or ${host.os_version} == "15 SP6" or ${host.os_version} == "15 SP7"))
8793
- type: winlog
8894
title: "Collect events from the Windows event log"
8995
description: "Collecting events from Windows event log"

0 commit comments

Comments
 (0)