Skip to content

Commit 8421dd4

Browse files
feat(argus): default disable resources (#444)
* feat(argus): default disable resources * feat(chores): body chars limit updated * feat(argus): updated app version * feat(argus): added pdb and crd * feat(argus): added resources * feat(argus): updated argus app version * feat(argus): removed comments
1 parent fc6f5fd commit 8421dd4

File tree

7 files changed

+74
-5
lines changed

7 files changed

+74
-5
lines changed

charts/argus/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ maintainers:
66
77
name: LogicMonitor
88
name: argus
9-
version: 11.1.0-rt01
9+
version: 11.1.1-rc01
1010
home: https://logicmonitor.github.io/helm-charts-qa
11-
appVersion: v15.1.0-rt01
11+
appVersion: v15.2.0-rc02
1212
dependencies:
1313
- name: lmutil
1414
repository: https://logicmonitor.github.io/helm-charts-qa
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{{/* vim: set filetype=mustache: */}}
2+
3+
{{- define "filter-config" -}}
4+
{{- $disabledBatchingFilter := "contains(owner,\"Job,CronJob\") && type == \"pod\"" }}
5+
{{- $filterValues := append .Values.filters ($disabledBatchingFilter) }}
6+
filters:
7+
{{ toYaml $filterValues | nindent 2 }}
8+
{{- end -}}

charts/argus/templates/_helpers.tpl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ logicmonitor.com/provider: lm-container
4444

4545
{{- define "monitoring.disable" }}
4646
{{ $alwaysDisable := list }}
47+
{{- if eq .Values.monitoringMode "Minimal" }}
48+
{{ $alwaysDisable = list "resourcequotas" "limitranges" "roles" "rolebindings" "networkpolicies" "configmaps" "clusterrolebindings" "clusterroles" "priorityclasses" "storageclasses" "cronjobs" "jobs" "endpoints" "ingresses" "secrets" "serviceaccounts" "poddisruptionbudgets" "customresourcedefinitions" }}
49+
{{- end }}
50+
4751
{{ $resultList := ( concat $alwaysDisable $.Values.monitoring.disable | uniq ) }}
4852
{{- toYaml $resultList | nindent 0}}
4953
{{- end }}

charts/argus/templates/configmap.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ data:
1616
config.yaml: |
1717
{{- include "argus-config" . | fromYaml | toYaml | nindent 4 }}
1818
filters-config.yaml: |
19-
filters: {{- toYaml .Values.filters | nindent 6 }}
19+
{{- include "filter-config" . | fromYaml | toYaml | nindent 4 }}
2020
collectorConfig: |
2121
{{- include "collector-config" . | fromYaml | toYaml | nindent 4 }}

charts/argus/values.schema.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,34 @@
180180
],
181181
"$comment": "ui:accessId-ignore tf:optional"
182182
},
183+
"disableBatchingPods": {
184+
"$id": "#/properties/disableBatchingPods",
185+
"type": "boolean",
186+
"title": "Disable Pods created by Jobs / CronJobs",
187+
"description": "Disable Pods created by Jobs / CronJobs",
188+
"default": "true",
189+
"examples": [
190+
"true",
191+
"false"
192+
],
193+
"$comment": "ui:accessKey-ignore tf:optional"
194+
},
195+
"monitoringMode": {
196+
"$id": "#/properties/monitoringMode",
197+
"type": "string",
198+
"title": "Argus Monitoring Mode",
199+
"description": "Monitoring mode for Argus (Minimal/Advanced)",
200+
"default": "Minimal",
201+
"enum": [
202+
"Minimal",
203+
"Advanced"
204+
],
205+
"examples": [
206+
"Minimal",
207+
"Advanced"
208+
],
209+
"$comment": "ui:accessKey-ignore tf:optional"
210+
},
183211
"accessKey": {
184212
"$id": "#/properties/accessKey",
185213
"type": "string",

charts/argus/values.yaml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ log:
6565
level: "info"
6666

6767
ksmUrl: ""
68+
monitoringMode: "Minimal"
69+
disableBatchingPods: true
6870

6971
collectorsetcontroller:
7072
address: collectorset-controller
@@ -95,7 +97,24 @@ daemons:
9597
sysIpsWaitTimeout: '5m'
9698
monitoring:
9799
# list of resources to disable monitoring
98-
disable: []
100+
disable:
101+
- resourcequotas
102+
- limitranges
103+
- roles
104+
- rolebindings
105+
- networkpolicies
106+
- configmaps
107+
- clusterrolebindings
108+
- clusterroles
109+
- priorityclasses
110+
- storageclasses
111+
- cronjobs
112+
- jobs
113+
- endpoints
114+
- secrets
115+
- serviceaccounts
116+
- poddisruptionbudgets
117+
- customresourcedefinitions
99118
# annotations to be ignored while performing an update operation
100119
annotations:
101120
ignore: []

commitlint.config.js

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1-
module.exports = { extends: ['@commitlint/config-conventional'] };
1+
module.exports = {
2+
extends: ['@commitlint/config-conventional'],
3+
rules: {
4+
'body-max-line-length' : [
5+
2,
6+
'always',
7+
1000
8+
]
9+
}
10+
};
11+

0 commit comments

Comments
 (0)