feat(filters): fix batchfiltering (#464)

Author: rohitphataklm

charts/argus/Chart.yaml

@@ -6,7 +6,7 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: argus
-version: 13.0.0-rc01
+version: 13.0.0-rc02
 home: https://logicmonitor.github.io/helm-charts-qa
 appVersion: v17.0.0-rc01
 dependencies:

charts/argus/templates/_filter_config.tpl

@@ -1,8 +1,11 @@
 {{/* vim: set filetype=mustache: */}}
 
 {{- define "filter-config" -}}
+{{- $filterValues := .Values.filters }}
+{{- if .Values.disableBatchingPods }}
 {{- $disabledBatchingFilter := "contains(owner,\"Job,CronJob\") && type == \"pod\"" }}
-{{- $filterValues := append .Values.filters ($disabledBatchingFilter) }}
+{{- $filterValues = append .Values.filters ($disabledBatchingFilter) }}
+{{- end }}
 filters:
   {{ toYaml $filterValues | nindent 2 }}
 {{- end -}}

charts/argus/templates/_helpers.tpl

@@ -44,7 +44,7 @@ logicmonitor.com/provider: lm-container
 
 {{- define "monitoring.disable" }}
 {{ $alwaysDisable := list }}
-{{- if and (not .Release.IsUpgrade) (eq .Values.monitoringMode "Minimal") }}
+{{- if and (not .Release.IsUpgrade) (has .Values.monitoringMode (list "Minimal" "Essentials" "Essential")) }}
 {{ $alwaysDisable = list "resourcequotas" "limitranges" "roles" "rolebindings" "networkpolicies" "configmaps" "clusterrolebindings" "clusterroles" "priorityclasses" "storageclasses" "cronjobs" "jobs" "endpoints" "ingresses" "secrets" "serviceaccounts" "poddisruptionbudgets" "customresourcedefinitions" }}
 {{- end }}
 

charts/argus/values.schema.json

@@ -196,14 +196,16 @@
       "$id": "#/properties/monitoringMode",
       "type": "string",
       "title": "Argus Monitoring Mode",
-      "description": "Monitoring mode for Argus (Minimal/Advanced)",
-      "default": "Minimal",
+      "description": "Monitoring mode for Argus (Essential/Advanced)",
+      "default": "Essential",
       "enum": [
         "Minimal",
+        "Essentials",
+        "Essential",
         "Advanced"
       ],
       "examples": [
-        "Minimal",
+        "Essential",
         "Advanced"
       ],
       "$comment": "ui:accessKey-ignore tf:optional"