From 098edd55f15d72b2aac820fc202ff6f8bed5dbd9 Mon Sep 17 00:00:00 2001
From: Sergei Zyubin <sergei.zyubin@gmail.com>
Date: Fri, 17 Nov 2023 10:08:25 +0100
Subject: [PATCH] fix(helm): scrapeTimeout and interval clash, release v0.2.2
 (#395)

---
 helm/Chart.yaml       | 2 +-
 helm/README.md        | 4 ++--
 helm/README.md.gotmpl | 1 +
 helm/values.yaml      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
index 82b672e6..f1067ce8 100644
--- a/helm/Chart.yaml
+++ b/helm/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: sql-exporter
 description: Database agnostic SQL exporter for Prometheus
 type: application
-version: 0.2.1
+version: 0.2.2
 appVersion: 0.13.0
 keywords:
   - exporter
diff --git a/helm/README.md b/helm/README.md
index 5b00c4fe..a2800aea 100644
--- a/helm/README.md
+++ b/helm/README.md
@@ -1,6 +1,6 @@
 # sql-exporter
 
-![Version: 0.2.1](https://img.shields.io/badge/Version-0.2.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.13.0](https://img.shields.io/badge/AppVersion-0.13.0-informational?style=flat-square)
+![Version: 0.2.2](https://img.shields.io/badge/Version-0.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.13.0](https://img.shields.io/badge/AppVersion-0.13.0-informational?style=flat-square)
 
 Database agnostic SQL exporter for Prometheus
 
@@ -51,7 +51,7 @@ helm install sql_exporter/sql-exporter
 | serviceMonitor.enabled | bool | `true` | Enable ServiceMonitor |
 | serviceMonitor.interval | string | `"15s"` | ServiceMonitor interval |
 | serviceMonitor.path | string | `"/metrics"` | ServiceMonitor path |
-| serviceMonitor.scrapeTimeout | string | `"60s"` | ServiceMonitor scrape timeout |
+| serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout |
 
 ### Configuration
 
diff --git a/helm/README.md.gotmpl b/helm/README.md.gotmpl
index 8e768c85..4a5c03bf 100644
--- a/helm/README.md.gotmpl
+++ b/helm/README.md.gotmpl
@@ -42,6 +42,7 @@ helm install sql_exporter/sql-exporter
 | {{ .Key }} | {{ .Type }} | {{ if .Default }}{{ .Default }}{{ else }}{{ .AutoDefault }}{{ end }} | {{ if .Description }}{{ .Description }}{{ else }}{{ .AutoDescription }}{{ end }} |
   {{- end }}
 {{- end }}
+| serviceMonitor.scrapeTimeout | string | `nil` | ServiceMonitor scrape timeout |
 
 ### Configuration
 
diff --git a/helm/values.yaml b/helm/values.yaml
index e4a89d60..72a942d9 100644
--- a/helm/values.yaml
+++ b/helm/values.yaml
@@ -62,7 +62,7 @@ serviceMonitor:
   # -- ServiceMonitor path
   path: /metrics
   # -- ServiceMonitor scrape timeout
-  scrapeTimeout: 60s
+  # scrapeTimeout: 10s
 
 config:
   global: