feat(argus): release argus charts v8.3.0 (#129)

Co-authored-by: Shubhashri Shirode <[email protected]>
logicmonitor · Feb 6, 2024 · 1f17fae · 1f17fae
1 parent e572fd0
commit 1f17fae
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 4 deletions.
diff --git a/charts/argus/Chart.yaml b/charts/argus/Chart.yaml
@@ -6,9 +6,9 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: argus
-version: 8.1.0
+version: 8.3.0
 home: https://logicmonitor.github.io/helm-charts
-appVersion: v12.1.0
+appVersion: v12.4.0
 dependencies:
   - name: lmutil
     repository: https://logicmonitor.github.io/helm-charts

diff --git a/charts/argus/templates/_collector_config.tpl b/charts/argus/templates/_collector_config.tpl
@@ -4,6 +4,7 @@
 replicas: {{ .Values.collector.replicas }}
 size: {{ .Values.collector.size | quote}}
 useEA: {{ .Values.collector.useEA | default false}}
+version: {{ .Values.collector.version | default 0 }}
 lm:
   escalationChainID: {{ .Values.collector.lm.escalationChainID | default 0 }}
 {{- end -}}
diff --git a/charts/argus/templates/collector-conf.yaml b/charts/argus/templates/collector-conf.yaml
@@ -16,4 +16,5 @@ data:
     agentConf:
     {{- $abc := include "collector-conf" . | fromYaml }}
     {{- $result := get $abc "resultList" }}
-    {{- toYaml $result | nindent 6 }}
+    {{- toYaml $result | nindent 6 }}
+  collector-ids.csv: "0"
diff --git a/charts/argus/templates/deployment.yaml b/charts/argus/templates/deployment.yaml
@@ -43,6 +43,9 @@ spec:
           securityContext: {{ include "lmutil.container-sec-context-nonroot" (list . "lmutil.custom-container-sec-context-nonroot") | nindent 12 }}
           image: {{ include "argus-image" . }}
           imagePullPolicy: {{ .Values.image.pullPolicy | default (.Values.global.image.pullPolicy | default "Always") }}
+          volumeMounts:
+            - mountPath: /etc/collector_id
+              name: collector-ids
           {{ with .Values.resources }}
           resources:
             {{ toYaml . | nindent 12 }}
@@ -82,4 +85,11 @@ spec:
               value: {{ template "lmutil.name" . }}
             - name: APP_KUBERNETES_IO_INSTANCE
               value: {{ .Release.Name }}
-        {{ include "lm-credentials-and-proxy-details" . | nindent 12 }}
+        {{ include "lm-credentials-and-proxy-details" . | nindent 12 }}
+      volumes:
+        - name: collector-ids
+          configMap:
+            name: {{ include "lmutil.fullname" . }}-collector
+            items:
+              - key: collector-ids.csv
+                path: collector-ids.csv
diff --git a/uitmpl/lm-container-6.1.0-ui-jsonpaths.json b/uitmpl/lm-container-6.1.0-ui-jsonpaths.json
@@ -0,0 +1,27 @@
+{
+  "accessId": "$.global.accessID",
+  "accessKey": "$.global.accessKey",
+  "account": "$.global.account",
+  "clusterGroupID": [
+    "$.argus.clusterTreeParentID",
+    "$.argus.clusterTreeParentID"
+  ],
+  "clusterName": [
+    "$.argus.clusterName",
+    "$.argus.clusterName"
+  ],
+  "collectorEscalationChainID": "$.argus.collector.lm.escalationChainID",
+  "collectorGroupID": "$.argus.collector.lm.groupID",
+  "collectorReplicas": "$.argus.collector.replicas",
+  "collectorSize": "$.argus.collector.size",
+  "collectorUseEA": "$.argus.collector.useEA",
+  "enableRBAC": "$.argus.rbac.create",
+  "etcdDiscoveryToken": "$.argus.etcdDiscoveryToken",
+  "excludeRules": "$.argus.filters",
+  "k8sEventEnable": "$.argus.lm.lmlogs.k8sevent.enable",
+  "k8sPodLogEnable": "$.argus.lm.lmlogs.k8spodlog.enable",
+  "proxyPass": "$.global.proxy.pass",
+  "proxyURL": "$.global.proxy.url",
+  "proxyUser": "$.global.proxy.user",
+  "resourceGroupID": "$.argus.resourceContainerID"
+}