feat(argus): default disable resources

charts/argus/Chart.yaml

@@ -6,9 +6,9 @@ maintainers:
   - email: [email protected]
     name: LogicMonitor
 name: argus
-version: 11.1.0-rt01
+version: 11.1.1-rc01
 home: https://logicmonitor.github.io/helm-charts-qa
-appVersion: v15.1.0-rt01
+appVersion: v15.2.0-rc02
 dependencies:
   - name: lmutil
     repository: https://logicmonitor.github.io/helm-charts-qa

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 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",

charts/argus/values.yaml

@@ -65,6 +65,8 @@ log:
   level: "info"
 
 ksmUrl: ""
+monitoringMode: "Minimal"
+disableBatchingPods: true
 
 collectorsetcontroller:
   address: collectorset-controller
@@ -95,7 +97,24 @@ daemons:
     sysIpsWaitTimeout: '5m'
 monitoring:
   # list of resources to disable monitoring
-  disable: []
+  disable:
+  - resourcequotas
+  - limitranges
+  - roles
+  - rolebindings
+  - networkpolicies
+  - configmaps
+  - clusterrolebindings
+  - clusterroles
+  - priorityclasses
+  - storageclasses
+  - cronjobs
+  - jobs
+  - endpoints
+  - secrets
+  - serviceaccounts
+  - poddisruptionbudgets
+  - customresourcedefinitions
   # annotations to be ignored while performing an update operation
   annotations:
     ignore: []

commitlint.config.js

@@ -1 +1,11 @@
-module.exports = { extends: ['@commitlint/config-conventional'] };
+module.exports = {
+    extends: ['@commitlint/config-conventional'],
+    rules: {
+        'body-max-line-length' : [
+            2,
+            'always',
+            1000
+        ]
+    }
+};
+