From 54d3245506509a869eb9c302edec29decd3bfafb Mon Sep 17 00:00:00 2001
From: Fu Qiao <qiaofu@amazon.com>
Date: Wed, 17 Dec 2025 13:15:39 -0800
Subject: [PATCH] Move args into command and add neuron-monitor-blocker volume

---
 .../linux/neuron-monitor-daemonset.yaml       | 20 ++++++++++++++-----
 .../values.yaml                               |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/charts/amazon-cloudwatch-observability/templates/linux/neuron-monitor-daemonset.yaml b/charts/amazon-cloudwatch-observability/templates/linux/neuron-monitor-daemonset.yaml
index 6885d2e1..60519057 100644
--- a/charts/amazon-cloudwatch-observability/templates/linux/neuron-monitor-daemonset.yaml
+++ b/charts/amazon-cloudwatch-observability/templates/linux/neuron-monitor-daemonset.yaml
@@ -32,11 +32,14 @@ spec:
   - name: "metrics"
     port: {{ .Values.neuronMonitor.service.port }}
   command:
-    - "/opt/bin/entrypoint.sh"
-  args:
-    port: "{{ .Values.neuronMonitor.service.port }}"
-    cert-file: "/etc/amazon-cloudwatch-observability-neuron-cert/server.crt"
-    key-file: "/etc/amazon-cloudwatch-observability-neuron-cert/server.key"
+  - "/bin/bash"
+  - "-c"
+  - |
+    /opt/bin/entrypoint.sh \
+      --cert-file /etc/amazon-cloudwatch-observability-neuron-cert/server.crt \
+      --key-file /etc/amazon-cloudwatch-observability-neuron-cert/server.key \
+      --port {{ .Values.neuronMonitor.service.port }} \
+      --neuron-monitor-config /etc/neuron-monitor-config/monitor.json
   securityContext:
     privileged: true
   volumeMounts:
@@ -46,6 +49,9 @@ spec:
   - mountPath: /opt-aws
     name: "aws-config"
     readOnly: true
+  - mountPath: /neuron-monitor-blocker
+    name: neuron-monitor-blocker
+    readOnly: true
   volumes:
   - name: neurontls
     secret:
@@ -58,6 +64,10 @@ spec:
   - name: "aws-config"
     hostPath:
       path: /opt/aws
+  - name: neuron-monitor-blocker
+    hostPath:
+      path: /var/neuron-monitor-blocker
+      type: ""
   monitorConfig: |
     {
       "period": "5s",
diff --git a/charts/amazon-cloudwatch-observability/values.yaml b/charts/amazon-cloudwatch-observability/values.yaml
index 8b837113..0361b98c 100644
--- a/charts/amazon-cloudwatch-observability/values.yaml
+++ b/charts/amazon-cloudwatch-observability/values.yaml
@@ -1106,7 +1106,7 @@ neuronMonitor:
   name:
   image:
     repository: neuron-monitor
-    tag: 1.6.0
+    tag: 1.7.0
     repositoryDomainMap:
       public: public.ecr.aws/neuron
   resources: