feat(argus): release 12.0.0

Author: rohitphataklm

charts/argus/Chart.yaml

@@ -6,9 +6,9 @@ maintainers:
   - email: argus@logicmonitor.com
     name: LogicMonitor
 name: argus
-version: 11.1.1
+version: 12.0.0
 home: https://logicmonitor.github.io/helm-charts
-appVersion: v15.1.0
+appVersion: v16.0.0
 dependencies:
   - name: lmutil
     repository: https://logicmonitor.github.io/helm-charts

charts/argus/templates/_filter_config.tpl

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

charts/argus/templates/_helpers.tpl

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

charts/argus/templates/configmap.yaml

@@ -16,6 +16,6 @@ data:
   config.yaml: |
     {{- include "argus-config" . | fromYaml | toYaml | nindent 4 }}
   filters-config.yaml: |
-    filters: {{- toYaml .Values.filters | nindent 6 }}
+    {{- include "filter-config" . | fromYaml | toYaml | nindent 4 }}
   collectorConfig: |
     {{- include "collector-config" . | fromYaml | toYaml | nindent 4 }}

charts/argus/values.schema.json

@@ -180,6 +180,34 @@
       ],
       "$comment": "ui:accessId-ignore tf:optional"
     },
+    "disableBatchingPods": {
+      "$id": "#/properties/disableBatchingPods",
+      "type": "boolean",
+      "title": "Disable Pods created by Jobs / CronJobs",
+      "description": "Disable Pods created by Jobs / CronJobs",
+      "default": "true",
+      "examples": [
+        "true",
+        "false"
+      ],
+      "$comment": "ui:accessKey-ignore tf:optional"
+    },
+    "monitoringMode": {
+      "$id": "#/properties/monitoringMode",
+      "type": "string",
+      "title": "Argus Monitoring Mode",
+      "description": "Monitoring mode for Argus (Minimal/Advanced)",
+      "default": "Minimal",
+      "enum": [
+        "Minimal",
+        "Advanced"
+      ],
+      "examples": [
+        "Minimal",
+        "Advanced"
+      ],
+      "$comment": "ui:accessKey-ignore tf:optional"
+    },
     "accessKey": {
       "$id": "#/properties/accessKey",
       "type": "string",
@@ -1113,7 +1141,7 @@
                   "$id": "#/properties/lm/properties/lmlogs/properties/k8sevent/properties/enable",
                   "type": "boolean",
                   "title": "The enable schema",
-                  "description": "Once you enable the property, it starts collecting Kubernetes events.",
+                  "description": "Once you enable the property, it starts collecting Kuberentes events.",
                   "default": false,
                   "examples": [
                     false
@@ -1142,7 +1170,7 @@
                   "$id": "#/properties/lm/properties/lmlogs/properties/k8spodlog/properties/enable",
                   "type": "boolean",
                   "title": "The enable schema",
-                  "description": "Once you enable the property, it starts Kubernetes Pod's logs collection",
+                  "description": "Once you enable the property, it starts Kuberentes Pod's logs collection",
                   "default": false,
                   "examples": [
                     false
@@ -3284,4 +3312,4 @@
       "type": "object"
     }
   }
-}
+}

charts/argus/values.yaml

@@ -65,6 +65,8 @@ log:
   level: "info"
 
 ksmUrl: ""
+monitoringMode: "Minimal"
+disableBatchingPods: true
 
 collectorsetcontroller:
   address: collectorset-controller