From cd877c78b22c91441bfcdf4fe30454b7d44ff035 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A1lint=20R=C3=A9thelyi?= <rethelyibalint@gmail.com>
Date: Mon, 9 Aug 2021 19:32:12 +0200
Subject: [PATCH] update prometheus metrics realy
---
.gitlab-ci.yml | 2 +-
db/db.go | 6 +++++-
k8s/apply.sh | 2 +-
k8s/{values.yml => values.yaml} | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
rename k8s/{values.yml => values.yaml} (94%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 675fdb5..e408d66 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,7 +105,7 @@ Upgrade helm:
script:
- bash
- cd "$CI_PROJECT_DIR"/k8s
- - envsubst < values.yml | helm upgrade --install --wait becskasszasch . -n apps --values -
+ - envsubst < values.yaml | helm upgrade --install --wait becskasszasch . -n apps --values -
rules:
- if: $CI_COMMIT_TAG
when: manual
diff --git a/db/db.go b/db/db.go
index dd1301f..64652dd 100644
--- a/db/db.go
+++ b/db/db.go
@@ -127,9 +127,13 @@ func init() {
}
for _, p := range prod {
s, _ := GetSpends(p.ID)
+ var a float64
if s != nil {
- spendsNow.With(prometheus.Labels{"product": p.Name}).Add(float64(s[0].Amount))
+ for _, u := range s {
+ a += float64(u.Amount)
+ }
}
+ spendsNow.With(prometheus.Labels{"product": p.Name}).Add(a)
}
}
diff --git a/k8s/apply.sh b/k8s/apply.sh
index 2c1c6aa..71da4ca 100755
--- a/k8s/apply.sh
+++ b/k8s/apply.sh
@@ -4,4 +4,4 @@ set -o allexport
source secret.env
set +o allexport
-envsubst < values.yml | helm upgrade --install --wait becskasszasch . -n apps --values -
+envsubst < values.yaml | helm upgrade --install --wait becskasszasch . -n apps --values -
diff --git a/k8s/values.yml b/k8s/values.yaml
similarity index 94%
rename from k8s/values.yml
rename to k8s/values.yaml
index 9ee0513..31eddb1 100644
--- a/k8s/values.yml
+++ b/k8s/values.yaml
@@ -7,5 +7,5 @@ POSTGRES: "${POSTGRES}"
POSTGRES_PASS: "${POSTGRES_PASS}"
POSTGRES_USER: "${POSTGRES_USER}"
POSTGRES_DB: "${POSTGRES_DB}"
-Tag: "v1.5.7"
+Tag: "v1.5.8"
REGISTRY_CONF: "${REGISTRY_CONF}"
--
GitLab