Merge pull request #141 from mrohlof-protofy/master

Make Prometheus ServiceMonitor optional

Readme.md

@@ -426,6 +426,7 @@ Options to configure ServiceMonitor for Prometheus Operator.
 |-----|-----------|-------|
 |**features.prometheus.enabled**|Set IMGPROXY_PROMETHEUS_BIND environment variable to bind metrics to port 8081|`false`|
 |**features.prometheus.namespace**|Set IMGPROXY_PROMETHEUS_NAMESPACE environment variable to prepend prefix to the names of metrics|`""`|
+|**resources.serviceMonitor.enabled**|Use a ServiceMonitor to collect metrics|`true`|
 |**resources.serviceMonitor.honorLabels**|Chooses the metric's labels on collisions with target labels|`true`|
 |**resources.serviceMonitor.interval**|Interval at which metrics should be scraped (if it differs from default one)|`0`|
 |**resources.serviceMonitor.namespace**|Namespace with PrometheusOperator|`monitoring`|

imgproxy/README.md

@@ -466,6 +466,7 @@ Options to configure ServiceMonitor for Prometheus Operator.
 |-----|-----------|-------|
 |**features.prometheus.enabled**|Set IMGPROXY_PROMETHEUS_BIND environment variable to bind metrics to port 8081|`false`|
 |**features.prometheus.namespace**|Set IMGPROXY_PROMETHEUS_NAMESPACE environment variable to prepend prefix to the names of metrics|`""`|
+|**resources.serviceMonitor.enabled**|Use a ServiceMonitor to collect metrics|`true`|
 |**resources.serviceMonitor.honorLabels**|Chooses the metric's labels on collisions with target labels|`true`|
 |**resources.serviceMonitor.interval**|Interval at which metrics should be scraped (if it differs from default one)|`0`|
 |**resources.serviceMonitor.namespace**|Namespace with PrometheusOperator|`monitoring`|

imgproxy/templates/service-monitor.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.features.prometheus.enabled }}
+{{- if and (.Values.features.prometheus.enabled) (.Values.resources.serviceMonitor.enabled) }}
 {{- with .Values.resources.serviceMonitor }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
@@ -36,4 +36,4 @@ spec:
   {{- end }}
   {{- end }}
 {{- end -}}
-{{- end -}}
+{{- end -}}

imgproxy/values.yaml

@@ -221,6 +221,7 @@ resources:
     pathType: ImplementationSpecific
 
   serviceMonitor:
+    enabled: true
     honorLabels: true
     interval: 0
     namespace: ""