fix(charts): rollup application monitoring

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: 0.1.4
+version: 0.1.5
 
 # 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

charts/composer/templates/_helpers.tpl

@@ -5,6 +5,27 @@ Namepsace to deploy elements into.
 {{- default .Release.Namespace .Values.global.namespaceOverride | trunc 63 | trimSuffix "-" -}}
 {{- end }}
 
+{{/*
+application name to deploy elements into.
+*/}}
+{{- define "composer.appName" -}}
+composer
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "composer.labels" -}}
+{{ include "rollup.selectorLabels" . }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "composer.selectorLabels" -}}
+app: {{ include "rollup.appName" . }}
+{{- end }}
+
 {{/*
 Single entry of rollup names
 */}}

charts/composer/templates/deployment.yaml

@@ -39,7 +39,7 @@ spec:
           ports:
             {{- if .Values.metrics.enabled }}
             - containerPort: {{ .Values.ports.metrics }}
-              name: metrics
+              name: composer-metrics
             {{- end }}
             - containerPort: {{ .Values.ports.healthApi }}
               name: health-api

charts/composer/templates/service.yaml

@@ -15,15 +15,15 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: metrics
+  name: composer-metrics
   namespace: {{ include "composer.namespace" . }}
   labels:
     app: composer
 spec:
   selector:
     app: composer
   ports:
-    - name: metrics
+    - name: composer-metrics
       port: {{ .Values.ports.metrics }}
-      targetPort: geth-metr
+      targetPort: composer-metrics
 {{- end }}

charts/composer/templates/servicemonitor.yaml

@@ -16,7 +16,7 @@ spec:
     matchLabels:
       app: composer
   endpoints:
-    - port: metrics
+    - port: composer-metrics
       path: /
       {{- with .Values.serviceMonitor.interval }}
       interval: {{ . }}

charts/composer/values.yaml

@@ -50,6 +50,29 @@ serviceMonitor:
   additionalLabels:
     release: kube-prometheus-stack
 
+alerting:
+  enabled: false
+  interval: ""
+  additionalLabels:
+    release: kube-prometheus-stack
+  annotations: {}
+  # scrapeTimeout: 10s
+  # path: /metrics
+  prometheusRule:
+    enabled: true
+    additionalLabels:
+      release: kube-prometheus-stack
+    namespace: monitoring
+    rules:
+    - alert: Composer_Node_Down
+      expr: up{container="composer"} == 0  # Insert your query Expression
+      for: 1m  # Rough number but should be enough to init warn
+      labels:
+        severity: warning
+      annotations:
+        summary: Composer is Down (instance {{ $labels.instance }})
+        description: "composer node '{{ $labels.namespace }}' has disappeared from Prometheus target discovery.\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
+
 # When deploying in a production environment should use a secret provider
 # This is configured for use with GCP, need to set own resource names
 # and keys

charts/evm-bridge-withdrawer/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.3.0
+version: 0.3.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

charts/evm-bridge-withdrawer/templates/_helpers.tpl

@@ -8,3 +8,24 @@ Namepsace to deploy elements into.
 {{- define "evm-bridge-withdrawer.image" -}}
 {{ .Values.images.evmBridgeWithdrawer.repo }}:{{ if .Values.global.dev }}{{ .Values.images.evmBridgeWithdrawer.devTag }}{{ else }}{{ .Values.images.evmBridgeWithdrawer.tag }}{{ end }}
 {{- end }}
+
+{{/*
+application name to deploy elements into.
+*/}}
+{{- define "evm-bridge-withdrawer.appName" -}}
+evm-bridge-withdrawer
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "evm-bridge-withdrawer.labels" -}}
+{{ include "evm-bridge-withdrawer.selectorLabels" . }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "evm-bridge-withdrawer.selectorLabels" -}}
+app: {{ include "evm-bridge-withdrawer.appName" . }}
+{{- end }}

charts/evm-bridge-withdrawer/templates/prometheusrule.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.alerting.enabled -}}
+apiVersion: monitoring.coreos.com/v1
+kind: PrometheusRule
+metadata:
+  name: evm-bridge-withdrawer-alerting
+{{- if .Values.alerting.prometheusRule.namespace }}
+  namespace: {{ .Values.alerting.prometheusRule.namespace | quote }}
+{{- end }}
+  labels:
+    {{- include "evm-bridge-withdrawer.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 "evm-bridge-withdrawer.appName" . }}
+    rules: {{- toYaml .Values.alerting.prometheusRule.rules | nindent 4 }}
+{{- end }}
+{{- end }}

charts/evm-bridge-withdrawer/templates/service.yaml

@@ -4,9 +4,11 @@ apiVersion: v1
 metadata:
   name: evm-bridge-withdrawer-metrics
   namespace: {{ include "evm-bridge-withdrawer.namespace" . }}
+  labels:
+    {{- include "evm-bridge-withdrawer.labels" . | nindent 4 }}
 spec:
   selector:
-    app: evm-bridge-withdrawer
+    {{- include "evm-bridge-withdrawer.labels" . | nindent 4 }}
   ports:
     {{- if .Values.metrics.enabled }}
     - name: metrics

charts/evm-bridge-withdrawer/templates/servicemonitor.yaml

@@ -17,7 +17,7 @@ spec:
     matchLabels:
       app: evm-bridge-withdrawer
   endpoints:
-    - port: metric
+    - port: metrics
       path: /
       {{- with .Values.serviceMonitor.interval }}
       interval: {{ . }}

charts/evm-bridge-withdrawer/values.yaml

@@ -54,6 +54,29 @@ serviceMonitor:
   additionalLabels:
     release: kube-prometheus-stack
 
+alerting:
+  enabled: false
+  interval: ""
+  additionalLabels:
+    release: kube-prometheus-stack
+  annotations: {}
+  # scrapeTimeout: 10s
+  # path: /metrics
+  prometheusRule:
+    enabled: true
+    additionalLabels:
+      release: kube-prometheus-stack
+    namespace: monitoring
+    rules:
+    - alert: Bridge_Withdrawer_Down
+      expr: up{container="evm-bridge-withdrawer"} == 0  # Insert your query Expression
+      for: 1m  # Rough number but should be enough to init warn
+      labels:
+        severity: warning
+      annotations:
+        summary: Bridge Withdrawer is Down (instance {{ $labels.instance }})
+        description: "bridge withdrawer node '{{ $labels.namespace }}' has disappeared from Prometheus target discovery.\n  VALUE = {{ $value }}\n  LABELS = {{ $labels }}"
+
 # When deploying in a production environment should use a secret provider
 # This is configured for use with GCP, need to set own resource names
 # and keys

charts/evm-rollup/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.27.5
+version: 0.27.6
 
 # 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

charts/evm-rollup/templates/prometheusrule.yaml

@@ -12,7 +12,7 @@ metadata:
     {{- toYaml .Values.alerting.prometheusRule.additionalLabels | nindent 4 }}
   {{- end }}
 spec:
-{{- if .Values.config.rollup.alerting.prometheusRule.rules }}
+{{- if .Values.alerting.prometheusRule.rules }}
   groups:
   - name: {{ template "rollup.name" . }}
     rules: {{- toYaml .Values.alerting.prometheusRule.rules | nindent 4 }}

charts/evm-stack/Chart.lock

@@ -4,21 +4,21 @@ dependencies:
   version: 0.3.6
 - name: evm-rollup
   repository: file://../evm-rollup
-  version: 0.27.5
+  version: 0.27.6
 - name: composer
   repository: file://../composer
-  version: 0.1.4
+  version: 0.1.5
 - name: evm-faucet
   repository: file://../evm-faucet
   version: 0.1.2
 - name: evm-bridge-withdrawer
   repository: file://../evm-bridge-withdrawer
-  version: 0.3.0
+  version: 0.3.1
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
   version: 15.2.4
 - name: blockscout-stack
   repository: https://blockscout.github.io/helm-charts
   version: 1.6.2
-digest: sha256:2d7e2f23cd9bbdb43b7cf42112db9ede0a7d5eee9e426b0b2344e43fcf52e1b1
-generated: "2024-10-02T09:43:51.238571-04:00"
+digest: sha256:0428a6d56fd86c170e322ad79c7b5f87628b6187a1df5ad47ae7c2281b7f12da
+generated: "2024-10-14T15:11:45.153501+02:00"

charts/evm-stack/Chart.yaml

@@ -15,26 +15,26 @@ 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.6.2
+version: 0.6.3
 
 dependencies:
   - name: celestia-node
     version: 0.3.6
     repository: "file://../celestia-node"
     condition: celestia-node.enabled
   - name: evm-rollup
-    version: 0.27.5
+    version: 0.27.6
     repository: "file://../evm-rollup"
   - name: composer
-    version: 0.1.4
+    version: 0.1.5
     repository: "file://../composer"
     condition: composer.enabled
   - name: evm-faucet
     version: 0.1.2
     repository: "file://../evm-faucet"
     condition: evm-faucet.enabled
   - name: evm-bridge-withdrawer
-    version: 0.3.0
+    version: 0.3.1
     repository: "file://../evm-bridge-withdrawer"
     condition: evm-bridge-withdrawer.enabled
   - name: postgresql