Skip to content
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

feat(arbitrum): add metricRelabelings to serviceMonitors #327

Merged
merged 2 commits into from
Aug 1, 2024
Merged

feat(arbitrum): add metricRelabelings to serviceMonitors #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
108f138
feat(arbitrum): add metricRelabelings to serviceMonitors
cjorge-graphops Aug 1, 2024
292eca0
chore: release arbitrum charts
cjorge-graphops Aug 1, 2024
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
2 changes: 1 addition & 1 deletion charts/arbitrum-classic/Chart.yaml
View file
Open in desktop
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.2.0
version: 0.2.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
3 changes: 2 additions & 1 deletion charts/arbitrum-classic/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Deploy and scale [Arbitrum-Classic](https://github.com/OffchainLabs/arbitrum) inside Kubernetes with ease

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.4.5-e97c1a4](https://img.shields.io/badge/AppVersion-v1.4.5--e97c1a4-informational?style=flat-square)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![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: v1.4.5-e97c1a4](https://img.shields.io/badge/AppVersion-v1.4.5--e97c1a4-informational?style=flat-square)

## Features

Expand Down Expand Up @@ -165,6 +165,7 @@ We do not recommend that you upgrade the application by overriding `image.tag`.
| prometheus.serviceMonitors.enabled | Enable monitoring by creating `ServiceMonitor` CRDs ([prometheus-operator](https://github.com/prometheus-operator/prometheus-operator)) | bool | `false` |
| prometheus.serviceMonitors.interval | | string | `nil` |
| prometheus.serviceMonitors.labels | | object | `{}` |
| prometheus.serviceMonitors.metricRelabelings | | list | `[]` |
| prometheus.serviceMonitors.relabelings | | list | `[]` |
| prometheus.serviceMonitors.scrapeTimeout | | string | `nil` |
| rbac.clusterRules | Required ClusterRole rules | list | See `values.yaml` |
Expand Down
4 changes: 4 additions & 0 deletions charts/arbitrum-classic/templates/arbitrum/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,8 @@ spec:
relabelings:
{{- toYaml .Values.prometheus.serviceMonitors.relabelings | nindent 8 }}
{{- end }}
{{- if .Values.prometheus.serviceMonitors.metricRelabelings }}
metricRelabelings:
{{- toYaml .Values.prometheus.serviceMonitors.metricRelabelings | nindent 8 }}
{{- end }}
{{- end }}
1 change: 1 addition & 0 deletions charts/arbitrum-classic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ prometheus:
interval:
scrapeTimeout:
relabelings: []
metricRelabelings: []

grafana:
# -- Enable creation of Grafana dashboards. [Grafana chart](https://github.com/grafana/helm-charts/tree/main/charts/grafana#grafana-helm-chart) must be configured to search this namespace, see `sidecar.dashboards.searchNamespace`
Expand Down
2 changes: 1 addition & 1 deletion charts/arbitrum-nitro/Chart.yaml
View file
Open in desktop
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.4.3
version: 0.4.4

# 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
3 changes: 2 additions & 1 deletion charts/arbitrum-nitro/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Deploy and scale [Arbitrum-Nitro](https://github.com/OffchainLabs/nitro/) inside Kubernetes with ease

[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 0.4.3](https://img.shields.io/badge/Version-0.4.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.1.0-7d1d84c](https://img.shields.io/badge/AppVersion-v3.1.0--7d1d84c-informational?style=flat-square)
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0) ![Version: 0.4.4](https://img.shields.io/badge/Version-0.4.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v3.1.0-7d1d84c](https://img.shields.io/badge/AppVersion-v3.1.0--7d1d84c-informational?style=flat-square)

## Features

Expand Down Expand Up @@ -133,6 +133,7 @@ We do not recommend that you upgrade the application by overriding `image.tag`.
| prometheus.serviceMonitors.enabled | Enable monitoring by creating `ServiceMonitor` CRDs ([prometheus-operator](https://github.com/prometheus-operator/prometheus-operator)) | bool | `false` |
| prometheus.serviceMonitors.interval | | string | `nil` |
| prometheus.serviceMonitors.labels | | object | `{}` |
| prometheus.serviceMonitors.metricRelabelings | | list | `[]` |
| prometheus.serviceMonitors.relabelings | | list | `[]` |
| prometheus.serviceMonitors.scrapeTimeout | | string | `nil` |
| rbac.clusterRules | Required ClusterRole rules | list | See `values.yaml` |
Expand Down
3 changes: 3 additions & 0 deletions charts/arbitrum-nitro/nval.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
prometheus:
serviceMonitors:
enabled: true
4 changes: 4 additions & 0 deletions charts/arbitrum-nitro/templates/arbitrum-nitro/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,8 @@ spec:
relabelings:
{{- toYaml .Values.prometheus.serviceMonitors.relabelings | nindent 8 }}
{{- end }}
{{- if .Values.prometheus.serviceMonitors.metricRelabelings }}
metricRelabelings:
{{- toYaml .Values.prometheus.serviceMonitors.metricRelabelings | nindent 8 }}
{{- end }}
{{- end }}
1 change: 1 addition & 0 deletions charts/arbitrum-nitro/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ prometheus:
interval:
scrapeTimeout:
relabelings: []
metricRelabelings: []

grafana:
# -- Enable creation of Grafana dashboards. [Grafana chart](https://github.com/grafana/helm-charts/tree/main/charts/grafana#grafana-helm-chart) must be configured to search this namespace, see `sidecar.dashboards.searchNamespace`
Expand Down