diff --git a/charts/argus/Chart.yaml b/charts/argus/Chart.yaml index 3da3f01..2f77014 100644 --- a/charts/argus/Chart.yaml +++ b/charts/argus/Chart.yaml @@ -11,6 +11,6 @@ maintainers: - email: argus@logicmonitor.com name: LogicMonitor name: argus -version: 3.1.0 +version: 3.1.1-ea01 home: https://logicmonitor.github.io/helm-charts appVersion: v8.1.0 diff --git a/charts/argus/templates/_argus_config.tpl b/charts/argus/templates/_argus_config.tpl index a5fda9b..4ab41c0 100644 --- a/charts/argus/templates/_argus_config.tpl +++ b/charts/argus/templates/_argus_config.tpl @@ -57,4 +57,11 @@ alerting: {{- if .Values.debug }} {{- toYaml .Values.debug | nindent 0 }} {{- end }} +{{- if .Values.proxy.url }} +proxy: + url: {{ .Values.proxy.url }} +{{- else if .Values.global.proxy.url }} +proxy: + url: {{ .Values.global.proxy.url }} +{{- end }} {{- end -}} diff --git a/charts/argus/templates/collectorset.yaml b/charts/argus/templates/collectorset.yaml index 7e51e53..5e30d5e 100644 --- a/charts/argus/templates/collectorset.yaml +++ b/charts/argus/templates/collectorset.yaml @@ -34,6 +34,9 @@ spec: {{- if .Values.collector.proxy.url }} proxy: url: {{ .Values.collector.proxy.url }} + {{- else if .Values.global.proxy.url }} + proxy: + url: {{ .Values.global.proxy.url }} {{- end }} {{- if .Values.collector.proxy.user }} secretName: {{ include "argus.fullname" . }}-collector diff --git a/charts/argus/values.schema.json b/charts/argus/values.schema.json index d19d9c9..7630509 100644 --- a/charts/argus/values.schema.json +++ b/charts/argus/values.schema.json @@ -543,7 +543,7 @@ "examples": [ "" ], - "$comment": "ui:proxyURL" + "$comment": "ui:proxyURL-ignore" }, "user": { "$id": "#/properties/proxy/properties/user", @@ -554,7 +554,7 @@ "examples": [ "" ], - "$comment": "ui:proxyUser" + "$comment": "ui:proxyUser-ignore" }, "pass": { "$id": "#/properties/proxy/properties/pass", @@ -565,7 +565,7 @@ "examples": [ "" ], - "$comment": "ui:proxyPass" + "$comment": "ui:proxyPass-ignore" } }, "additionalProperties": false @@ -2114,7 +2114,8 @@ "default": "", "examples": [ "" - ] + ], + "$comment": "ui:proxyURL" }, "user": { "$id": "#/properties/proxy/properties/user", @@ -2124,7 +2125,8 @@ "default": "", "examples": [ "" - ] + ], + "$comment": "ui:proxyUser" }, "pass": { "$id": "#/properties/proxy/properties/pass", @@ -2134,7 +2136,8 @@ "default": "", "examples": [ "" - ] + ], + "$comment": "ui:proxyPass" } } }, diff --git a/charts/collectorset-controller/Chart.yaml b/charts/collectorset-controller/Chart.yaml index 645b75c..f3a2acc 100644 --- a/charts/collectorset-controller/Chart.yaml +++ b/charts/collectorset-controller/Chart.yaml @@ -6,6 +6,6 @@ maintainers: - email: argus@logicmonitor.com name: LogicMonitor name: collectorset-controller -version: 2.0.0 +version: 2.0.1-ea01 home: https://logicmonitor.github.io/helm-charts appVersion: v4.0.0 diff --git a/charts/collectorset-controller/templates/configmap.yaml b/charts/collectorset-controller/templates/configmap.yaml index 321178a..23ba265 100644 --- a/charts/collectorset-controller/templates/configmap.yaml +++ b/charts/collectorset-controller/templates/configmap.yaml @@ -18,6 +18,9 @@ data: {{- if .Values.proxy.url }} proxy: url: {{ .Values.proxy.url }} + {{ else if .Values.global.proxy.url }} + proxy: + url: {{ .Values.global.proxy.url }} {{- end }} ignoreSSL: {{ default false .Values.ignoreSSL }} collectorServiceAccountName: {{ include "collectorset-controller.serviceAccountName" . }}-collector