Update: typo and scrape configuration

Signed-off-by: Nicolas Lamirault <nicolas.lamirault@gmail.com>
portefaix · May 17, 2021 · 169d098 · 169d098
1 parent 245c5df
commit 169d098
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/charts/speedtest-exporter/README.md b/charts/speedtest-exporter/README.md
@@ -35,7 +35,9 @@ A Helm chart for Prometheus Speedtest exporter
 | prometheus.monitor.additionalLabels | object | `{}` |  |
 | prometheus.monitor.enabled | bool | `false` |  |
 | prometheus.monitor.honorLabels | bool | `false` |  |
+| prometheus.monitor.interval | string | `"60m"` |  |
 | prometheus.monitor.namespace | string | `""` |  |
+| prometheus.monitor.scrapeTimeout | string | `"60s"` |  |
 | readOnlyRootFilesystem | bool | `true` |  |
 | replicas | int | `1` |  |
 | resources | object | `{}` |  |

diff --git a/charts/speedtest-exporter/ci/test-values.yaml b/charts/speedtest-exporter/ci/test-values.yaml
@@ -2,7 +2,6 @@
 #
 
 additionalLabels:
-  prometheus: k8s
   exporter: speedtest
 
 additionalAnnotations:
@@ -19,5 +18,7 @@ resources:
 prometheus:
   monitor:
     enabled: true
+    interval: 15m
+    scrapeTimeout: 60s
     additionalLabels:
       release: kube-prometheus-stack
diff --git a/charts/speedtest-exporter/templates/deployment.yaml b/charts/speedtest-exporter/templates/deployment.yaml
@@ -58,7 +58,7 @@ spec:
 {{- end }}
         ports:
         - containerPort: 9090
-          name: https
+          name: http
           protocol: TCP
         livenessProbe:
           httpGet:

diff --git a/charts/speedtest-exporter/templates/service.yaml b/charts/speedtest-exporter/templates/service.yaml
@@ -13,7 +13,7 @@ metadata:
 spec:
   type: "{{ .Values.service.type }}"
   ports:
-  - name: "http"
+  - name: http
     protocol: TCP
     port: {{ .Values.service.port }}
     {{- if .Values.service.nodePort }}

diff --git a/charts/speedtest-exporter/templates/servicemonitor.yaml b/charts/speedtest-exporter/templates/servicemonitor.yaml
@@ -23,13 +23,9 @@ spec:
       app: {{ template "speedtest-exporter.name" . }}
   endpoints:
     - port: http
+      interval: {{ .Values.prometheus.monitor.interval }}
+      scrapeTimeout: {{ .Values.prometheus.monitor.scrapeTimeout }}
       {{- if .Values.prometheus.monitor.honorLabels }}
       honorLabels: true
       {{- end }}
-    {{ if .Values.prometheus.monitor.enabled }}
-    - port: metrics
-      {{- if .Values.prometheus.monitor.honorLabels }}
-      honorLabels: true
-      {{- end }}
-    {{ end }}
 {{- end }}
diff --git a/charts/speedtest-exporter/values.yaml b/charts/speedtest-exporter/values.yaml
@@ -85,6 +85,8 @@ resources: {}
 prometheus:
   monitor:
     enabled: false
+    interval: 60m
+    scrapeTimeout: 60s
     additionalLabels: {}
       # release: kube-prometheus-stack
     namespace: ""