update prometheus metrics realy

.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

db/db.go

@@ -127,10 +127,14 @@ 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)
+	}
 
 }
 

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 -

k8s/values.yml → 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}"