Skip to content

Commit

Permalink
chore(charts): fix service monitor labels (#1112)
Browse files Browse the repository at this point in the history
## Summary
Updates service monitor setup and labels to get monitoring working.
  • Loading branch information
joroshiba authored May 24, 2024
1 parent 1860dec commit 51cf68c
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 30 deletions.
2 changes: 1 addition & 1 deletion charts/evm-rollup/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.18.1
version: 0.18.2

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
2 changes: 1 addition & 1 deletion charts/sequencer-relayer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.8.0
version: 0.8.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
1 change: 0 additions & 1 deletion charts/sequencer-relayer/templates/servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ spec:
selector:
matchLabels:
app: sequencer-relayer
name: sequencer-relayer-metrics
endpoints:
- port: metric
path: /
Expand Down
6 changes: 3 additions & 3 deletions charts/sequencer/Chart.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
dependencies:
- name: sequencer-relayer
repository: file://../sequencer-relayer
version: 0.8.0
digest: sha256:7ba5131675eb9bc1cb6f73a20fb8a4187658873397183b48aa6d281e4494e3bb
generated: "2024-05-20T15:16:02.948351-07:00"
version: 0.8.1
digest: sha256:aea57e7ee44fd5bf1c851792b6a540a222d76a91518948f2b609966a65f694c4
generated: "2024-05-24T10:23:31.097578-07:00"
4 changes: 2 additions & 2 deletions charts/sequencer/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.15.0
version: 0.15.1

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand All @@ -25,7 +25,7 @@ appVersion: "0.13.0"

dependencies:
- name: sequencer-relayer
version: "0.8.0"
version: "0.8.1"
repository: "file://../sequencer-relayer"
condition: sequencer-relayer.enabled

Expand Down
26 changes: 4 additions & 22 deletions charts/sequencer/templates/servicemonitor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
- {{ include "sequencer.namespace" . }}
selector:
matchLabels:
{{- include "sequencer.selectorLabels" . | nindent 6 }}
app: {{ .Values.config.moniker }}-sequencer
endpoints:
- port: cometbft-metric
path: /metrics
Expand All @@ -25,26 +25,7 @@ spec:
{{- with .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ . }}
{{- end }}
---
{{- if .Values.config.sequencer.metrics.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: sequencer-metrics
labels:
{{- include "sequencer.labels" . | nindent 4 }}
{{- with .Values.serviceMonitor.additionalLabels }}
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
jobLabel: sequencer-metric
namespaceSelector:
matchNames:
- {{ include "sequencer.namespace" . }}
selector:
matchLabels:
{{- include "sequencer.selectorLabels" . | nindent 6 }}
endpoints:
{{- if .Values.config.sequencer.metrics.enabled }}
- port: seq-metric
path: /
{{- with .Values.serviceMonitor.interval }}
Expand All @@ -53,5 +34,6 @@ spec:
{{- with .Values.serviceMonitor.scrapeTimeout }}
scrapeTimeout: {{ . }}
{{- end }}
{{- end }}
{{- end }}
---
{{- end }}

0 comments on commit 51cf68c

Please sign in to comment.