[backup] push metrics to vmagent

petmehdivet · Oct 25, 2022 · 0fbc01a · 0fbc01a
1 parent 0162362
commit 0fbc01a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/terraform/helm/fullnode/templates/_helpers.tpl b/terraform/helm/fullnode/templates/_helpers.tpl
@@ -124,9 +124,9 @@ Create the name of the service account to use
 {{ include "aptos-fullnode.fullname" . }}-e{{ .Values.chain.era }}
 {{- end -}}
 
-{{- define "backup.pushGateway" -}}
-{{- if .Values.backup.pushGateway -}}
-{{ .Values.backup.pushGateway }}
+{{- define "backup.pushMetricsEndpoint" -}}
+{{- if .Values.backup.pushMetricsEndpoint -}}
+{{ .Values.backup.pushMetricsEndpoint }}
 {{- end -}}
 {{- end -}}
 

diff --git a/terraform/helm/fullnode/templates/backup-verify.yaml b/terraform/helm/fullnode/templates/backup-verify.yaml
@@ -46,7 +46,7 @@ spec:
             - name: STRUCT_LOG_TCP_ADDR
               value: {{ include "backup.loggingAddress" $ | quote }}
             - name: PUSH_METRICS_ENDPOINT
-              value: "{{- include "backup.pushGateway" $ }}/metrics/job/{{- .Values.backup_verify.jobName | default "db_backup_verify" }}"
+              value: "{{- include "backup.pushMetricsEndpoint" $ }}/api/v1/import/prometheus?extra_label=role={{- .jobName | default "db_backup_verify" }}&extra_label=kubernetes_pod_name={{ include "backup.fullname" . }}-db-backup-verify"
             {{- include "backup.backupEnvironment" (dict "config" $.Values.backup.config "era" $.Values.chain.era) | nindent 12 }}
             {{- with .Values.backup_verify }}
             resources:

diff --git a/terraform/helm/fullnode/templates/backup.yaml b/terraform/helm/fullnode/templates/backup.yaml
@@ -62,9 +62,9 @@ spec:
           value: "1"
         - name: STRUCT_LOG_TCP_ADDR
           value: {{ include "backup.loggingAddress" $ | quote }}
-        {{- if (include "backup.pushGateway" $) }}
+        {{- if (include "backup.pushMetricsEndpoint" $) }}
         - name: PUSH_METRICS_ENDPOINT
-          value: "{{- include "backup.pushGateway" $ }}/metrics/job/{{- .jobName | default "db_backup" }}"
+          value: "{{- include "backup.pushMetricsEndpoint" $ }}/api/v1/import/prometheus?extra_label=role={{- .jobName | default "db_backup" }}&extra_label=kubernetes_pod_name={{ include "backup.fullname" . }}-db-backup"
         {{- end }}
         {{- include "backup.backupEnvironment" (dict "config" .config "era" $.Values.chain.era) | nindent 8 }}
         volumeMounts:

diff --git a/terraform/helm/fullnode/templates/restore.yaml b/terraform/helm/fullnode/templates/restore.yaml
@@ -43,9 +43,9 @@ spec:
           value: "1"
         - name: STRUCT_LOG_TCP_ADDR
           value: {{ include "backup.loggingAddress" $ | quote }}
-        {{- if (include "backup.pushGateway" $) }}
+        {{- if (include "backup.pushMetricsEndpoint" $) }}
         - name: PUSH_METRICS_ENDPOINT
-          value: "{{- include "backup.pushGateway" $ }}/metrics/job/{{- .jobName | default "db_restore" }}"
+          value: "{{- include "backup.pushMetricsEndpoint" $ }}/api/v1/import/prometheus?extra_label=role={{- .jobName | default "db_restore" }}&extra_label=kubernetes_pod_name={{ include "backup.fullname" . }}-db-restore"
         {{- end }}
         - name: CONTROLLER_UID
           valueFrom: