fix(argus): handle empty cf list and trimmed collector props (#85)

Author: vkumbhar94

charts/argus/Chart.yaml

@@ -11,6 +11,6 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: argus
-version: 2.2.0-rc05
+version: 2.2.0-rc06
 home: https://logicmonitor.github.io/helm-charts-qa
 appVersion: v8.2.0-rc1

charts/argus/templates/_collector_conf.tpl

@@ -11,4 +11,31 @@
 trimmedCollectorAgentConf:
 {{- toYaml $propList | nindent 2 }}
 {{- end }}
+{{- end }}
+
+
+{{ define "collector-conf" }}
+{{ $result := list }}
+
+{{- $keys := dict }}
+{{- range .Values.collector.collectorConf.agentConf }}
+{{- $_ := set $keys .key true }}
+{{- end }}
+
+{{- if gt (len .Values.collector.collectorConf.agentConf) 0 }}
+{{- $result = (concat $result .Values.collector.collectorConf.agentConf | uniq ) }}
+{{- end }}
+
+{{- if not .Values.collector.disableLightweightCollector }}
+    {{- $abc := include "trimmed-collector-config-agentConf" . | fromYaml }}
+    {{- $trimmedList := get $abc "trimmedCollectorAgentConf" }}
+    {{- range $trimmedList }}
+        {{- if not (hasKey $keys .key) }}
+            {{- $result = append $result . }}
+        {{- end }}
+    {{- end }}
+{{- end }}
+
+resultList:
+{{- toYaml $result | nindent 2 }}
 {{- end }}

charts/argus/templates/collector-conf.yaml

@@ -14,8 +14,6 @@ metadata:
 data:
   collector-conf.yaml: |
     agentConf:
-      {{- if not .Values.collector.disableLightweightCollector }}
-      {{- $abc := include "trimmed-collector-config-agentConf" . | fromYaml }}
-      {{- get $abc "trimmedCollectorAgentConf" | toYaml | nindent 6 }}
-      {{- end }}
-      {{- toYaml .Values.collector.collectorConf.agentConf | nindent 6 }}
+    {{- $abc := include "collector-conf" . | fromYaml }}
+    {{- $result := get $abc "resultList" }}
+    {{- toYaml $result | nindent 6 }}