chart: add service monitor scrape timeout and fix scrape interval

pixelfederation · May 26, 2023 · 33cc2c6 · 33cc2c6
1 parent 400811a
commit 33cc2c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/charts/ec2-price-exporter/templates/servicemonitor.yaml b/charts/ec2-price-exporter/templates/servicemonitor.yaml
@@ -9,6 +9,8 @@ spec:
   endpoints:
     - targetPort: {{ .Values.service.port }}
       path: {{ .Values.serviceMonitor.metricsPath }}
+      interval: {{ .Values.serviceMonitor.interval }}
+      scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
       {{- with .Values.serviceMonitor.metricRelabelings }}
       metricRelabelings:
         {{ toYaml . | nindent 8 }}
@@ -17,7 +19,7 @@ spec:
   namespaceSelector:
     matchNames:
     - {{ .Release.Namespace }}
-  interval: {{ .Values.serviceMonitor.interval }}
+
   selector:
     matchLabels:
       {{- include "ec2-price-exporter.selectorLabels" . | nindent 6 }}

diff --git a/charts/ec2-price-exporter/values.yaml b/charts/ec2-price-exporter/values.yaml
@@ -77,7 +77,8 @@ autoscaling:
 serviceMonitor:
   enabled: false
   metricsPath: "/metrics"
-  interval: 60s
+  interval: 30s
+  scrapeTimeout: 30s
   metricRelabelings: []
 
 nodeSelector: {}