Updating the app monitoring parameters for ama-metrics charts (#768)

This pull request mainly focuses on the addition of new environment variables in the `ama-metrics-daemonset.yaml` file and the introduction of corresponding new values in the `values-template.yaml` file. The newly added environment variables are `APPMONITORING_AUTOINSTRUMENTATION_ENABLED`, `APPMONITORING_OPENTELEMETRYMETRICS_ENABLED`, and `APPMONITORING_OPENTELEMETRYMETRICS_PORT`, which are designed to enhance the application monitoring capabilities. Here are the most important changes: * [`otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml`](diffhunk://#diff-4cf95e8016084d1f16fc5becb6aef6efa6a517801fd92b274f9b1da545d88ceeR134-R139): Added three new environment variables `APPMONITORING_AUTOINSTRUMENTATION_ENABLED`, `APPMONITORING_OPENTELEMETRYMETRICS_ENABLED`, and `APPMONITORING_OPENTELEMETRYMETRICS_PORT`. These variables are set to values from `.Values.AzureMonitorMetrics`. [[1]](diffhunk://#diff-4cf95e8016084d1f16fc5becb6aef6efa6a517801fd92b274f9b1da545d88ceeR134-R139) [[2]](diffhunk://#diff-4cf95e8016084d1f16fc5becb6aef6efa6a517801fd92b274f9b1da545d88ceeR407-R412) * [`otelcollector/deploy/addon-chart/azure-monitor-metrics-addon/values-template.yaml`](diffhunk://#diff-e1d8bf79f3e7963e3b4147b3a101d9c21f4264064f412ab884e04e8e5792b1e3R63-R65): Introduced three new values `IsAppMonitoringAutoInstrumentationEnabled`, `IsAppMonitoringOpenTelemetryMetricsEnabled`, and `OpenTelemetryMetricsPort` under `AzureMonitorMetrics`. These values are set to `false` and `"28333"` respectively. --------- Co-authored-by: Janvi Jatakia (from Dev Box) <[email protected]> Co-authored-by: Kaveesh Dubey <[email protected]>
Azure · Mar 6, 2024 · df76058 · df76058
1 parent a747f79
commit df76058
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git 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
diff --git a/...ector/deploy/addon-chart/azure-monitor-metrics-addon/templates/ama-metrics-daemonset.yaml b/...ector/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
@@ -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