diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 675fdb5a37f937f15f0ef56b1c0d6cfecbc96b82..e408d6648fd66798d3b186ff21ba9d4305da9afc 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 dd1301f77fa58e3439276a5bfb37c894e24367af..64652dda3628d3b1e784956a73e1650da37ad920 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 2c1c6aa8c485c0c93a67d891fd757b20a1f71968..71da4cad2cc0893cff8466c156c28c1afc581a8e 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 9ee0513ddd84db32454f38acfd78ed7159760b4f..31eddb1704791ed1b9c4722db126904f862a56d7 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}"