Skip to content

Commit 46bb08f

Browse files
leehinmanleehinman
committed
stop starting unnecessary log input on Windows
1 parent 132f577 commit 46bb08f

File tree

2 files changed

+30
-3
lines changed

2 files changed

+30
-3
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.12.2"
3+
changes:
4+
- description: Stop starting unnecessary log input on Windows
5+
type: bugfix
6+
link: https://github.com/elastic/integrations/pull/16337
27
- version: "2.12.1"
38
changes:
49
- description: Remove duplicate security-solution-default tag references

‎packages/system/manifest.yml‎

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: 3.4.0
22
name: system
33
title: System
4-
version: "2.12.1"
4+
version: "2.12.2"
55
description: Collect system logs and metrics from your servers with Elastic Agent.
66
type: integration
77
categories:
@@ -54,24 +54,46 @@ policy_templates:
5454
vars:
5555
- name: condition
5656
title: Condition
57+
<<<<<<< HEAD
5758
description: "Condition to filter when to apply this input. Refer to\n[Host provider](https://www.elastic.co/guide/en/fleet/current/host-provider.html)\nto find the available keys and to\n[Conditions](https://www.elastic.co/guide/en/fleet/current/dynamic-input-configuration.html#conditions)\non how to use the available keys in conditions. It defaults to\n'${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\" \nand ${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\")'\n"
59+
=======
60+
description: |
61+
Condition to filter when to apply this input. Refer to
62+
[Host provider](https://www.elastic.co/guide/en/fleet/current/host-provider.html)
63+
to find the available keys and to
64+
[Conditions](https://www.elastic.co/guide/en/fleet/current/dynamic-input-configuration.html#conditions)
65+
on how to use the available keys in conditions. It defaults to
66+
'(${host.platform} != "windows") and (${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"
67+
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"))'
68+
>>>>>>> 5bf075cd68 (stop starting unnecessary log input on Windows)
5869
type: text
5970
multi: false
6071
required: false
6172
show_user: true
62-
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 ${host.os_version} != "15 SP1" 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")
73+
default: (${host.platform} != "windows") and (${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" 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"))
6374
- type: journald
6475
title: Collect logs from System instances using Journald
6576
description: Collecting System auth and syslog logs using Journald
6677
vars:
6778
- name: condition
6879
title: Condition
80+
<<<<<<< HEAD
6981
description: "Condition to filter when to apply this input. Refer to\n[Host provider](https://www.elastic.co/guide/en/fleet/current/host-provider.html)\nto find the available keys and to\n[Conditions](https://www.elastic.co/guide/en/fleet/current/dynamic-input-configuration.html#conditions)\non how to use the available keys in conditions. It defaults to\n'${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\" \nor ${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\"))'\n"
82+
=======
83+
description: |
84+
Condition to filter when to apply this input. Refer to
85+
[Host provider](https://www.elastic.co/guide/en/fleet/current/host-provider.html)
86+
to find the available keys and to
87+
[Conditions](https://www.elastic.co/guide/en/fleet/current/dynamic-input-configuration.html#conditions)
88+
on how to use the available keys in conditions. It defaults to
89+
'(${host.platform} != "windows") and (${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"
90+
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")))'
91+
>>>>>>> 5bf075cd68 (stop starting unnecessary log input on Windows)
7092
type: text
7193
multi: false
7294
required: false
7395
show_user: true
74-
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 (${host.os_version} == "15 SP1" 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"))
96+
default: (${host.platform} != "windows") and (${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" 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")))
7597
- type: winlog
7698
title: "Collect events from the Windows event log"
7799
description: "Collecting events from Windows event log"

0 commit comments

Comments
 (0)