From de8c554d122246ee68f2fd558782dfb157661bab Mon Sep 17 00:00:00 2001 From: ido Date: Thu, 24 Oct 2024 14:30:04 +0300 Subject: [PATCH 1/2] fix composer port --- charts/composer/Chart.yaml | 2 +- charts/composer/templates/deployment.yaml | 2 +- charts/composer/templates/service.yaml | 4 ++-- charts/composer/templates/servicemonitor.yaml | 2 +- charts/evm-stack/Chart.lock | 6 +++--- charts/evm-stack/Chart.yaml | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/charts/composer/Chart.yaml b/charts/composer/Chart.yaml index 2011b20454..b6ed6e2f9d 100644 --- a/charts/composer/Chart.yaml +++ b/charts/composer/Chart.yaml @@ -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: 1.0.0-rc.1 +version: 1.0.0-rc.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 diff --git a/charts/composer/templates/deployment.yaml b/charts/composer/templates/deployment.yaml index 118356dc84..16f02e60cf 100644 --- a/charts/composer/templates/deployment.yaml +++ b/charts/composer/templates/deployment.yaml @@ -39,7 +39,7 @@ spec: ports: {{- if .Values.metrics.enabled }} - containerPort: {{ .Values.ports.metrics }} - name: composer-metrics + name: composer-metric {{- end }} - containerPort: {{ .Values.ports.healthApi }} name: health-api diff --git a/charts/composer/templates/service.yaml b/charts/composer/templates/service.yaml index b03e325407..8103ed9017 100644 --- a/charts/composer/templates/service.yaml +++ b/charts/composer/templates/service.yaml @@ -23,7 +23,7 @@ spec: selector: app: composer ports: - - name: composer-metrics + - name: composer-metric port: {{ .Values.ports.metrics }} - targetPort: composer-metrics + targetPort: composer-metric {{- end }} diff --git a/charts/composer/templates/servicemonitor.yaml b/charts/composer/templates/servicemonitor.yaml index b88fc369c1..dff5af8a17 100644 --- a/charts/composer/templates/servicemonitor.yaml +++ b/charts/composer/templates/servicemonitor.yaml @@ -16,7 +16,7 @@ spec: matchLabels: app: composer endpoints: - - port: composer-metrics + - port: composer-metric path: / {{- with .Values.serviceMonitor.interval }} interval: {{ . }} diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock index f4789a8b13..7a23d63357 100644 --- a/charts/evm-stack/Chart.lock +++ b/charts/evm-stack/Chart.lock @@ -7,7 +7,7 @@ dependencies: version: 0.28.1 - name: composer repository: file://../composer - version: 1.0.0-rc.1 + version: 1.0.0-rc.2 - name: evm-faucet repository: file://../evm-faucet version: 0.1.2 @@ -20,5 +20,5 @@ dependencies: - name: blockscout-stack repository: https://blockscout.github.io/helm-charts version: 1.6.2 -digest: sha256:bbb5436bef71e57402482f74e2d2deabec5e4d957845bcb743b710ca49e2dc78 -generated: "2024-10-22T10:51:25.483623794-04:00" +digest: sha256:cbef2e78861e88ca4396d44dc1d96a7b27c32c691896ed16097a1081d63c6d91 +generated: "2024-10-24T14:29:08.887894+03:00" diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index 1df4d02cc4..a8bead43eb 100644 --- a/charts/evm-stack/Chart.yaml +++ b/charts/evm-stack/Chart.yaml @@ -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.7.2 +version: 0.7.3 dependencies: - name: celestia-node @@ -26,7 +26,7 @@ dependencies: version: 0.28.1 repository: "file://../evm-rollup" - name: composer - version: 1.0.0-rc.1 + version: 1.0.0-rc.2 repository: "file://../composer" condition: composer.enabled - name: evm-faucet From 20d01a4e39f3f860b4385a169102102d52b89658 Mon Sep 17 00:00:00 2001 From: ido Date: Thu, 24 Oct 2024 15:00:13 +0300 Subject: [PATCH 2/2] add composer PrometheusRule --- charts/composer/templates/_helpers.tpl | 4 ++-- charts/composer/templates/prometheusrule.yaml | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 charts/composer/templates/prometheusrule.yaml diff --git a/charts/composer/templates/_helpers.tpl b/charts/composer/templates/_helpers.tpl index 6e45bc120a..adbe2be05a 100644 --- a/charts/composer/templates/_helpers.tpl +++ b/charts/composer/templates/_helpers.tpl @@ -16,14 +16,14 @@ composer Common labels */}} {{- define "composer.labels" -}} -{{ include "rollup.selectorLabels" . }} +{{ include "composer.selectorLabels" . }} {{- end }} {{/* Selector labels */}} {{- define "composer.selectorLabels" -}} -app: {{ include "rollup.appName" . }} +app: {{ include "composer.appName" . }} {{- end }} {{/* diff --git a/charts/composer/templates/prometheusrule.yaml b/charts/composer/templates/prometheusrule.yaml new file mode 100644 index 0000000000..186f4a7a79 --- /dev/null +++ b/charts/composer/templates/prometheusrule.yaml @@ -0,0 +1,20 @@ +{{- if .Values.alerting.enabled -}} +apiVersion: monitoring.coreos.com/v1 +kind: PrometheusRule +metadata: + name: {{ template "composer.appName" . }} +{{- if .Values.alerting.prometheusRule.namespace }} + namespace: {{ .Values.alerting.prometheusRule.namespace | quote }} +{{- end }} + labels: + {{- include "composer.labels" . | nindent 4 }} + {{- if .Values.alerting.prometheusRule.additionalLabels }} + {{- toYaml .Values.alerting.prometheusRule.additionalLabels | nindent 4 }} + {{- end }} +spec: +{{- if .Values.alerting.prometheusRule.rules }} + groups: + - name: {{ template "composer.appName" . }} + rules: {{- toYaml .Values.alerting.prometheusRule.rules | nindent 4 }} +{{- end }} +{{- end }}