Geth: enable prometheus metric on start-geth + service monitor template

charts/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.7.8
+version: 0.7.9
 
 # 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/rollup/files/scripts/start-geth.sh

@@ -6,4 +6,6 @@ exec geth --datadir $data_dir/ --networkid=$evm_network_id \
   --http --http.addr "0.0.0.0" --http.port $executor_host_http_port --http.corsdomain='*' --http.vhosts "*" --http.api eth,net,web3,debug,txpool \
   --ws --ws.addr "0.0.0.0" --ws.port $executor_host_ws_port --ws.origins='*' \
   --grpc --grpc.addr "0.0.0.0" --grpc.port $executor_host_grpc_port \
-  {{ if .Values.config.rollup.archiveNode }}--gcmode "archive" --txlookuplimit "0" {{- end }}
+  {{ if .Values.config.rollup.archiveNode }}--gcmode "archive" --txlookuplimit "0" {{- end }} \
+  {{ if .Values.config.rollup.metrics.enabled }} --metrics --metrics.addr "0.0.0.0"  --metrics.port {{ .Values.ports.metrics }} {{- end }}
+

charts/rollup/templates/_helpers.tpl

@@ -1,3 +1,27 @@
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "rollup.name" -}}
+{{- default .Values.config.rollup.name | trunc 63 | trimSuffix "-" }}-astria-dev-cluster
+{{- end }}
+
+{{/*
+Common labels
+*/}}
+{{- define "rollup.labels" -}}
+{{ include "rollup.selectorLabels" . }}
+{{- end }}
+
+{{/*
+Selector labels
+*/}}
+{{- define "rollup.selectorLabels" -}}
+app: {{ include "rollup.name" . }}
+name: geth-metrics
+{{- end }}
+
+
+
 {{/*
 Return if ingress is stable.
 */}}

charts/rollup/templates/deployment.yaml

@@ -50,6 +50,10 @@ spec:
               name: ws-rpc
             - containerPort: {{ .Values.ports.executionGRPC }}
               name: execution-grpc
+            {{- if .Values.config.rollup.metrics.enabled }} 
+            - containerPort: {{ .Values.ports.metrics }}
+              name: geth-metrics
+            {{- end }}              
         - name: composer
           image: {{ .Values.images.composer }}
           command: [ "/usr/local/bin/astria-composer" ]

charts/rollup/templates/service.yaml

@@ -42,3 +42,18 @@ spec:
     - name: blockscout-svc
       port: {{ .Values.ports.blockscout }}
       targetPort: blockscout
+---
+{{- if .Values.config.rollup.metrics.enabled }} 
+kind: Service
+apiVersion: v1
+metadata:
+  name: {{ .Values.config.rollup.name }}-metrics
+  namespace: {{ .Values.global.namespace }}
+spec:
+  selector:
+    app: {{ .Values.config.rollup.name }}-astria-dev-cluster
+  ports:
+    - name: geth-metrics
+      port: {{ .Values.ports.metrics }}
+      targetPort: geth-metrics
+{{- end }}

charts/rollup/templates/servicemonitor.yaml

@@ -0,0 +1,28 @@
+{{- if .Values.config.rollup.serviceMonitor.enabled }}
+apiVersion: monitoring.coreos.com/v1
+kind: ServiceMonitor
+metadata:
+  name: geth-metrics
+  labels:
+    {{- include "rollup.labels" . | nindent 4 }}
+    {{- with .Values.config.rollup.serviceMonitor.additionalLabels }}
+    {{- toYaml . | nindent 4 }}
+    {{- end }}
+spec:
+  jobLabel: geth-metrics
+  namespaceSelector:
+    matchNames:
+      - {{ .Values.global.namespace }}
+  selector:
+    matchLabels:
+      app: {{ .Values.config.rollup.name }}-astria-dev-cluster
+  endpoints:
+    - port: {{ .Values.config.rollup.serviceMonitor.port }}
+      path: /debug/metrics/prometheus
+      {{- with .Values.config.rollup.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
+      {{- with .Values.config.rollup.serviceMonitor.scrapeTimeout  }}
+      scrapeTimeout: {{ . }}
+      {{- end }}
+{{- end }}

charts/rollup/values.yaml

@@ -39,6 +39,15 @@ config:
       # The block height of the Ethereum L1 chain that the
       # OptimismPortal contract was deployed at.
       initialEthereumL1BlockHeight: 1
+    metrics:
+      # set to enable prometheus metrics
+      enabled: false
+    serviceMonitor:
+      # set to enable port svc and service monitor
+      enabled: false
+      port: 6060
+      additionalLabels:
+        release: kube-prometheus-stack
 
   faucet:
     proxyCount: 1
@@ -219,3 +228,4 @@ ports:
   gossipnet: 2451
   faucet: 8080
   blockscout: 4000
+  metrics: 6060