From 963a98bfb5d8f5796e43917535bfa54af57a2f4c Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 7 Oct 2024 21:24:14 +0300 Subject: [PATCH] import WALinuxAgent-2.7.0.6-10.el9 --- .../wla-Disable-automatic-log-collector.patch | 39 +++++++++++++++++++ SPECS/WALinuxAgent.spec | 9 ++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 SOURCES/wla-Disable-automatic-log-collector.patch diff --git a/SOURCES/wla-Disable-automatic-log-collector.patch b/SOURCES/wla-Disable-automatic-log-collector.patch new file mode 100644 index 0000000..3a03283 --- /dev/null +++ b/SOURCES/wla-Disable-automatic-log-collector.patch @@ -0,0 +1,39 @@ +From 21616a198bee14a9a95a6dacedcd1b1eca175fc6 Mon Sep 17 00:00:00 2001 +From: Ani Sinha +Date: Mon, 6 May 2024 11:50:49 +0530 +Subject: [PATCH] Disable automatic log collector + +RH-Author: Ani Sinha +RH-MergeRequest: 11: Disable automatic log collector +RH-Jira: RHEL-7273 +RH-Acked-by: Emanuele Giuseppe Esposito +RH-Acked-by: Miroslav Rezanina +RH-Commit: [1/1] 7a8002c626b45eb5e90fa0fe82694639d1e5b93d (anisinha/centos-wa-linux-agent) + +Log collector is enabled by default. Due to security concerns from our customers +disable it. + +Jira: https://issues.redhat.com/browse/RHEL-7273 +Upstream: RHEL only. + +Signed-off-by: Ani Sinha +--- + config/waagent.conf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/waagent.conf b/config/waagent.conf +index 14cd01c8..25ee83d3 100644 +--- a/config/waagent.conf ++++ b/config/waagent.conf +@@ -73,7 +73,7 @@ Logs.Verbose=n + # Logs.Console=y + + # Enable periodic log collection, default is y +-Logs.Collect=y ++Logs.Collect=n + + # How frequently to collect logs, default is each hour + Logs.CollectPeriod=3600 +-- +2.39.3 + diff --git a/SPECS/WALinuxAgent.spec b/SPECS/WALinuxAgent.spec index e1d1415..cbe888c 100644 --- a/SPECS/WALinuxAgent.spec +++ b/SPECS/WALinuxAgent.spec @@ -4,7 +4,7 @@ Name: WALinuxAgent Version: 2.7.0.6 -Release: 9%{?dist} +Release: 10%{?dist} Summary: The Microsoft Azure Linux Agent License: ASL 2.0 @@ -24,6 +24,8 @@ Patch3: wla-redhat-Fix-command-sequence-for-restarting-net-inter.patch Patch4: wla-redhat-Use-NetworkManager-to-set-DHCP-hostnames-on-r.patch # For bz#2093965 - [Azure][WALA][RHEL-9] The description of "Logs.Collect" is incorrect Patch5: wla-Update-Log-Collector-default-in-Comments-and-Readme-.patch +# For RHEL-7273 - [Azure][WALA] Consider to disable Log collector +Patch6: wla-Disable-automatic-log-collector.patch # Source-git patches @@ -159,6 +161,11 @@ rm -rf %{_unitdir}/waagent.service.d/ %endif %changelog +* Thu May 09 2024 Miroslav Rezanina - 2.7.0.6-10 +- wla-Disable-automatic-log-collector.patch [RHEL-7273] +- Resolves: RHEL-7273 + ([Azure][WALA] Consider to disable Log collector) + * Thu Apr 13 2023 MSVSphere Packaging Team - 2.7.0.6-9 - Rebuilt for MSVSphere 9.2 beta