From 727703534ebe624abf801c36079bbc564631297d Mon Sep 17 00:00:00 2001 From: "Janvi Jatakia (from Dev Box)" Date: Tue, 5 Mar 2024 14:40:00 -0800 Subject: [PATCH 1/2] Updating the app monitoring parameters for ama-metrics charts --- .../templates/ama-metrics-daemonset.yaml | 12 ++++++++++++ .../azure-monitor-metrics-addon/values-template.yaml | 3 +++ 2 files changed, 15 insertions(+) diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml index bcba0f287..fcddfd730 100644 --- a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml +++ b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml @@ -131,6 +131,12 @@ spec: value: "advanced" # WINDOWS: only supported mode is 'advanced', any other value will be the default/non-advance mode - name: MINIMAL_INGESTION_PROFILE value: "true" # only supported value is the string "true" + - name: APPMONITORING_AUTOINSTRUMENTATION_ENABLED + value: "{{ .Values.AzureMonitorMetrics.IsAppMonitoringAutoInstrumentationEnabled }}" + - name: APPMONITORING_OPENTELEMETRYMETRICS_ENABLED + value: "{{ .Values.AzureMonitorMetrics.IsAppMonitoringOpenTelemetryMetricsEnabled }}" + - name: APPMONITORING_OPENTELEMETRYMETRICS_PORT + value: "{{ .Values.AzureMonitorMetrics.OpenTelemetryMetricsPort }}" securityContext: privileged: false volumeMounts: @@ -398,6 +404,12 @@ spec: value: "advanced" # WINDOWS: only supported mode is 'advanced', any other value will be the default/non-advance mode - name: MINIMAL_INGESTION_PROFILE value: "true" # only supported value is the string "true" + - name: APPMONITORING_AUTOINSTRUMENTATION_ENABLED + value: "{{ .Values.AzureMonitorMetrics.IsAppMonitoringAutoInstrumentationEnabled }}" + - name: APPMONITORING_OPENTELEMETRYMETRICS_ENABLED + value: "{{ .Values.AzureMonitorMetrics.IsAppMonitoringOpenTelemetryMetricsEnabled }}" + - name: APPMONITORING_OPENTELEMETRYMETRICS_PORT + value: "{{ .Values.AzureMonitorMetrics.OpenTelemetryMetricsPort }}" securityContext: privileged: false volumeMounts: diff --git a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values-template.yaml b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values-template.yaml index 873c46e55..fd6de6c08 100644 --- a/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values-template.yaml +++ b/otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values-template.yaml @@ -60,6 +60,9 @@ AzureMonitorMetrics: TargetAllocatorMemoryLimit: 8Gi TargetAllocatorCPURequest: 10m TargetAllocatorMemoryRequest: 50Mi + IsAppMonitoringAutoInstrumentationEnabled: false + IsAppMonitoringOpenTelemetryMetricsEnabled: false + OpenTelemetryMetricsPort: "28333" # The below 2 settings are not Azure Monitor Metrics adapter chart. They are substituted in a different manner. # Please update these with the latest ones from here so that you get the image that is currently deployed by the AKS RP - # Repository: https://msazure.visualstudio.com/CloudNativeCompute/_git/aks-rp?path=/ccp/charts/addon-charts/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml&version=GBrashmi/prom-addon-arm64&line=136&lineEnd=136&lineStartColumn=56&lineEndColumn=85&lineStyle=plain&_a=contents From cd6cb810ceacb5302f54eed6a2adadb04b4d982b Mon Sep 17 00:00:00 2001 From: Kaveesh Dubey Date: Wed, 6 Mar 2024 10:10:35 -0800 Subject: [PATCH 2/2] .trivy --- .trivyignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.trivyignore b/.trivyignore index d4b1812b9..018f886f4 100644 --- a/.trivyignore +++ b/.trivyignore @@ -28,6 +28,7 @@ GHSA-mhpq-9638-x6pw CVE-2023-48795 CVE-2023-3978 CVE-2023-44487 +CVE-2023-50658 # MEDIUM - go vulnerabilities # MEDIUM - mariner CVE-2023-5678