From 8a2dd314baf7736d03eb16f8a7a47c4aa3268c61 Mon Sep 17 00:00:00 2001 From: Amol Agrawal Date: Tue, 31 Oct 2023 17:09:22 +0000 Subject: [PATCH 1/4] update mdsd to 1.28.11 --- .trivyignore | 2 +- kubernetes/linux/setup.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.trivyignore b/.trivyignore index a2f6401da..ea7a17b81 100644 --- a/.trivyignore +++ b/.trivyignore @@ -10,4 +10,4 @@ GHSA-jq35-85cj-fj4p GHSA-m425-mq94-257g # ruby HIGH -CVE-2017-10784 +CVE-2017-10784 \ No newline at end of file diff --git a/kubernetes/linux/setup.sh b/kubernetes/linux/setup.sh index 268d2efb9..a41aa3ce2 100644 --- a/kubernetes/linux/setup.sh +++ b/kubernetes/linux/setup.sh @@ -39,7 +39,7 @@ mv /usr/lib/ruby/gems/3.1.0/specifications/default/uri-0.11.0.gemspec /usr/lib/r gem uninstall time --version 0.2.0 gem uninstall uri --version 0.11.0 -sudo tdnf install -y azure-mdsd-1.27.4 +sudo tdnf install -y azure-mdsd-1.28.11 cp -f $TMPDIR/mdsd.xml /etc/mdsd.d cp -f $TMPDIR/envmdsd /etc/mdsd.d rm /usr/sbin/telegraf From c89eee077fc5de2bef9816ce434cf21edbdb527a Mon Sep 17 00:00:00 2001 From: Amol Agrawal Date: Wed, 1 Nov 2023 17:13:31 +0000 Subject: [PATCH 2/4] update mdsd version in yamls --- charts/azuremonitor-containers-geneva/values.yaml | 2 +- charts/azuremonitor-containers/values.yaml | 2 +- kubernetes/ama-logs.yaml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/azuremonitor-containers-geneva/values.yaml b/charts/azuremonitor-containers-geneva/values.yaml index 8764fb7e0..6e5969829 100644 --- a/charts/azuremonitor-containers-geneva/values.yaml +++ b/charts/azuremonitor-containers-geneva/values.yaml @@ -17,7 +17,7 @@ image: repository: mcr.microsoft.com/azuremonitor/containerinsights/ciprod tag: "3.1.15" pullPolicy: IfNotPresent - agentVersion: "azure-mdsd-1.17.1" + agentVersion: "azure-mdsd-1.28.11" nameOverride: "" enableInternalMetrics: false fullnameOverride: "" diff --git a/charts/azuremonitor-containers/values.yaml b/charts/azuremonitor-containers/values.yaml index b93eedef5..78e52229d 100644 --- a/charts/azuremonitor-containers/values.yaml +++ b/charts/azuremonitor-containers/values.yaml @@ -28,7 +28,7 @@ amalogs: tagWindows: "win-3.1.15" pullPolicy: IfNotPresent dockerProviderVersion: "18.0.1-0" - agentVersion: "azure-mdsd-1.17.0" + agentVersion: "azure-mdsd-1.28.11" winAgentVersion: "0.0.0-0" # there is no base agent version for windows agent # The priority used by the ama-logs priority class for the daemonset pods diff --git a/kubernetes/ama-logs.yaml b/kubernetes/ama-logs.yaml index 04cb1844e..0d002fa19 100644 --- a/kubernetes/ama-logs.yaml +++ b/kubernetes/ama-logs.yaml @@ -343,7 +343,7 @@ spec: component: ama-logs-agent tier: node annotations: - agentVersion: "azure-mdsd-1.17.0" + agentVersion: "azure-mdsd-1.28.11" dockerProviderVersion: "18.0.1-0" schema-versions: "v1" kubernetes.azure.com/no-http-proxy-vars: "true" @@ -668,7 +668,7 @@ spec: labels: rsName: "ama-logs-rs" annotations: - agentVersion: "azure-mdsd-1.17.0" + agentVersion: "azure-mdsd-1.28.11" dockerProviderVersion: "18.0.1-0" schema-versions: "v1" kubernetes.azure.com/no-http-proxy-vars: "true" From ab29175795e669047aa1feb376a95a168c872a89 Mon Sep 17 00:00:00 2001 From: Amol Agrawal Date: Wed, 1 Nov 2023 17:15:08 +0000 Subject: [PATCH 3/4] revert unnecessary change --- .trivyignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.trivyignore b/.trivyignore index ea7a17b81..a2f6401da 100644 --- a/.trivyignore +++ b/.trivyignore @@ -10,4 +10,4 @@ GHSA-jq35-85cj-fj4p GHSA-m425-mq94-257g # ruby HIGH -CVE-2017-10784 \ No newline at end of file +CVE-2017-10784 From aad8fa0e92f7bd830625e34b65a8ef1545fe55ed Mon Sep 17 00:00:00 2001 From: Amol Agrawal Date: Wed, 1 Nov 2023 18:29:12 +0000 Subject: [PATCH 4/4] update trivyignore --- .trivyignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.trivyignore b/.trivyignore index a2f6401da..6a63a0ae1 100644 --- a/.trivyignore +++ b/.trivyignore @@ -8,6 +8,8 @@ GHSA-jq35-85cj-fj4p #telegraf HIGH GHSA-m425-mq94-257g +CVE-2023-46129 +CVE-2023-47090 # ruby HIGH CVE-2017-10784