diff --git a/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml b/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml index 0409120..7bc174a 100644 --- a/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml +++ b/charts/amazon-cloudwatch-observability/templates/operator-deployment.yaml @@ -26,7 +26,7 @@ spec: containers: - image: {{ template "cloudwatch-agent-operator.image" . }} args: - - {{ printf "--auto-instrumentation-config=%s" (dict "java" (.Values.manager.autoInstrumentationResources.java) "python" (.Values.manager.autoInstrumentationResources.python) "dotnet" (.Values.manager.autoInstrumentationResources.dotnet) "nodejs" (.Values.manager.autoInstrumentationResources.nodejs) | toJson) | quote }} + - {{ printf "--auto-instrumentation-config=%s" (dict "java" (merge .Values.manager.autoInstrumentationResources.java .Values.manager.autoInstrumentationConfiguration.java) "python" (merge .Values.manager.autoInstrumentationResources.python .Values.manager.autoInstrumentationConfiguration.python) "dotnet" (.Values.manager.autoInstrumentationResources.dotnet) "nodejs" (.Values.manager.autoInstrumentationResources.nodejs) | toJson) | quote }} - {{ printf "--auto-annotation-config=%s" (.Values.manager.autoAnnotateAutoInstrumentation | toJson) | quote }} - "--auto-instrumentation-java-image={{ template "auto-instrumentation-java.image" . }}" - "--auto-instrumentation-python-image={{ template "auto-instrumentation-python.image" . }}" @@ -56,4 +56,4 @@ spec: kubernetes.io/os: linux {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 6}} - {{- end }} \ No newline at end of file + {{- end }} diff --git a/charts/amazon-cloudwatch-observability/values.yaml b/charts/amazon-cloudwatch-observability/values.yaml index 00bf80d..51d95d5 100644 --- a/charts/amazon-cloudwatch-observability/values.yaml +++ b/charts/amazon-cloudwatch-observability/values.yaml @@ -422,6 +422,13 @@ manager: repositoryDomain: public.ecr.aws/aws-observability repository: adot-autoinstrumentation-node tag: v0.2.0 + autoInstrumentationConfiguration: + java: + runtime_metrics: + enabled: "true" + python: + runtime_metrics: + enabled: "true" autoInstrumentationResources: java: limits: