Add account to labels on logpush events, bump golangci

lablabs · May 8, 2024 · 0a1f4f0 · 0a1f4f0
1 parent 3717ea1
commit 0a1f4f0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -14,4 +14,4 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6 # https://github.com/marketplace/actions/run-golangci-lint
         with:
-          version: v1.43
+          version: v1.58.0
diff --git a/prometheus.go b/prometheus.go
@@ -252,7 +252,7 @@ var (
 		Name: logpushFailedJobsAccountMetricName.String(),
 		Help: "Number of failed logpush jobs on the account level",
 	},
-		[]string{"destination", "job_id", "final"},
+		[]string{"account", "destination", "job_id", "final"},
 	)
 
 	logpushFailedJobsZone = prometheus.NewCounterVec(prometheus.CounterOpts{
@@ -453,9 +453,9 @@ func fetchLogpushAnalyticsForAccount(account cloudflare.Account, wg *sync.WaitGr
 		return
 	}
 
-	for _, account := range r.Viewer.Accounts {
-		for _, LogpushHealthAdaptiveGroup := range account.LogpushHealthAdaptiveGroups {
-			logpushFailedJobsAccount.With(prometheus.Labels{"destination": LogpushHealthAdaptiveGroup.Dimensions.DestinationType, "job_id": strconv.Itoa(LogpushHealthAdaptiveGroup.Dimensions.JobId), "final": strconv.Itoa(LogpushHealthAdaptiveGroup.Dimensions.Final)}).Add(float64(LogpushHealthAdaptiveGroup.Count))
+	for _, acc := range r.Viewer.Accounts {
+		for _, LogpushHealthAdaptiveGroup := range acc.LogpushHealthAdaptiveGroups {
+			logpushFailedJobsAccount.With(prometheus.Labels{"account": account.ID, "destination": LogpushHealthAdaptiveGroup.Dimensions.DestinationType, "job_id": strconv.Itoa(LogpushHealthAdaptiveGroup.Dimensions.JobId), "final": strconv.Itoa(LogpushHealthAdaptiveGroup.Dimensions.Final)}).Add(float64(LogpushHealthAdaptiveGroup.Count))
 		}
 	}