Skip to content

feat: Added scrape timeout configuration on servicemonitor #1067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HujinoKun wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Added scrape timeout configuration on servicemonitor #1067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/main/charts/bamboo/templates/service-monitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ spec:
sourceLabels:
- __meta_kubernetes_pod_name
targetLabel: instance
scrapeTimeout: {{ printf "%.0fs" .Values.monitoring.serviceMonitor.scrapeTimeoutSeconds }}
selector:
matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }}
Expand Down
6 changes: 4 additions & 2 deletions src/main/charts/bamboo/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,8 +1089,6 @@ monitoring:
jmxExporterImageRepo: bitnamilegacy/jmx-exporter
jmxExporterImageTag: 0.18.0



# -- Port number on which metrics will be available
#
jmxExporterPort: 9999
Expand Down Expand Up @@ -1124,6 +1122,10 @@ monitoring:
#
scrapeIntervalSeconds: 30

# -- How long until a scrape request times out. It cannot be greater than the scrape interval.
#
scrapeTimeoutSeconds: 20

grafana:

# -- Create ConfigMaps with Grafana dashboards
Expand Down
2 changes: 2 additions & 0 deletions src/main/charts/bitbucket/templates/service-monitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ spec:
sourceLabels:
- __meta_kubernetes_pod_name
targetLabel: instance
scrapeTimeout: {{ printf "%.0fs" .Values.monitoring.serviceMonitor.scrapeTimeoutSeconds }}

- interval: {{ printf "%.0fs" .Values.monitoring.serviceMonitor.scrapeIntervalSeconds }}
path: /metrics
Expand All @@ -29,6 +30,7 @@ spec:
sourceLabels:
- __meta_kubernetes_pod_name
targetLabel: instance
scrapeTimeout: {{ printf "%.0fs" .Values.monitoring.serviceMonitor.scrapeTimeoutSeconds }}
selector:
matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }}
Expand Down
6 changes: 4 additions & 2 deletions src/main/charts/bitbucket/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1355,8 +1355,6 @@ monitoring:
jmxExporterImageRepo: bitnamilegacy/jmx-exporter
jmxExporterImageTag: 0.18.0



# -- Port number on which metrics will be available
#
jmxExporterPort: 9999
Expand Down Expand Up @@ -1390,6 +1388,10 @@ monitoring:
#
scrapeIntervalSeconds: 30

# -- How long until a scrape request times out. It cannot be greater than the scrape interval.
#
scrapeTimeoutSeconds: 20

grafana:

# -- Create ConfigMaps with Grafana dashboards
Expand Down
1 change: 1 addition & 0 deletions src/main/charts/confluence/templates/service-monitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ spec:
sourceLabels:
- __meta_kubernetes_pod_name
targetLabel: instance
scrapeTimeout: {{ printf "%.0fs" .Values.monitoring.serviceMonitor.scrapeTimeoutSeconds }}
selector:
matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions src/main/charts/confluence/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,6 +1223,10 @@ monitoring:
#
scrapeIntervalSeconds: 30

# -- How long until a scrape request times out. It cannot be greater than the scrape interval.
#
scrapeTimeoutSeconds: 20

grafana:

# -- Create ConfigMaps with Grafana dashboards
Expand Down
1 change: 1 addition & 0 deletions src/main/charts/jira/templates/service-monitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ spec:
sourceLabels:
- __meta_kubernetes_pod_name
targetLabel: instance
scrapeTimeout: {{ printf "%.0fs" .Values.monitoring.serviceMonitor.scrapeTimeoutSeconds }}
selector:
matchLabels:
{{- include "common.labels.selectorLabels" . | nindent 6 }}
Expand Down
4 changes: 4 additions & 0 deletions src/main/charts/jira/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,6 +1078,10 @@ monitoring:
#
scrapeIntervalSeconds: 30

# -- How long until a scrape request times out. It cannot be greater than the scrape interval.
#
scrapeTimeoutSeconds: 20

grafana:

# -- Create ConfigMaps with Grafana dashboards
Expand Down