Add scrape interval and timeout for cadvisor service monitor (#120)

charts/cadvisor/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A chart for a Cadvisor deployment
 name: cadvisor
-version: 2.2.1
+version: 2.2.2
 appVersion: 0.44.0
 home: https://github.com/google/cadvisor
 sources:

charts/cadvisor/README.md

@@ -68,6 +68,8 @@ The following table lists the configurable parameters of the cAdvisor chart and
 | `podSecurityContext.privileged`| set podSecurityContext privileged to true        | `false`                    |
 | `metrics.enabled`              | create ServiceMonitor CR for Prometheus operator | `false`                    |
 | `metrics.relabelings`          | add pre-scraping relabeling to ServiceMonitor    | `[]`                       |
+| `metrics.interval`             | scraping interval for the ServiceMonitor         | `30s`                       |
+| `metrics.scrapeTimeout`        | scraping timeout for the ServiceMonitor          | `30s`                       |
 | `metrics.metricsRelabelings`   | add pre-ingestion relabeling to ServiceMonitor   | `[]`                       |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

charts/cadvisor/templates/servicemonitor.yaml

@@ -18,6 +18,8 @@ spec:
       - {{ .Release.Namespace }}
   endpoints:
     - path: /metrics
+      interval: {{ .Values.metrics.interval }}
+      scrapeTimeout: {{ .Values.metrics.scrapeTimeout }}
       port: http
       {{- if .Values.metrics.relabelings }}
       relabelings:

charts/cadvisor/values.yaml

@@ -75,6 +75,8 @@ affinity: {}
 # This will create a ServiceMonitor Custom Resource indicating the prometheus operator what to scrape.
 metrics:
   enabled: false
+  interval: 30s
+  scrapeTimeout: 30s
   # This will allow you to specify relabelings on the metrics before ingestion. E.g. to use the kubernetes monitoring
   # mixin with this chart set metrics.enabled above to true and use:
   # relabelings: