FEATURE | Add host to labels

Author: j6s

provider/mailbox.go

@@ -20,10 +20,10 @@ type mailboxItem struct {
 }
 
 func (mailbox Mailbox) Provide(api mailcowApi.MailcowApiClient) ([]prometheus.Collector, error) {
-	lastLogin := *prometheus.NewGaugeVec(prometheus.GaugeOpts{Name: "mailcow_mailbox_last_login"}, []string{"mailbox"})
-	quotaAllowed := *prometheus.NewGaugeVec(prometheus.GaugeOpts{Name: "mailcow_mailbox_quota_allowed"}, []string{"mailbox"})
-	quotaUsed := *prometheus.NewGaugeVec(prometheus.GaugeOpts{Name: "mailcow_mailbox_quota_used"}, []string{"mailbox"})
-	messages := *prometheus.NewGaugeVec(prometheus.GaugeOpts{Name: "mailcow_mailbox_messages"}, []string{"mailbox"})
+	lastLogin := *prometheus.NewGaugeVec(prometheus.GaugeOpts{Name: "mailcow_mailbox_last_login"}, []string{"host", "mailbox"})
+	quotaAllowed := *prometheus.NewGaugeVec(prometheus.GaugeOpts{Name: "mailcow_mailbox_quota_allowed"}, []string{"host", "mailbox"})
+	quotaUsed := *prometheus.NewGaugeVec(prometheus.GaugeOpts{Name: "mailcow_mailbox_quota_used"}, []string{"host", "mailbox"})
+	messages := *prometheus.NewGaugeVec(prometheus.GaugeOpts{Name: "mailcow_mailbox_messages"}, []string{"host", "mailbox"})
 
 	body := make([]mailboxItem, 0)
 	err := api.Get("api/v1/get/mailbox/all", &body)
@@ -33,10 +33,10 @@ func (mailbox Mailbox) Provide(api mailcowApi.MailcowApiClient) ([]prometheus.Co
 
 	for _, m := range body {
 		lastLoginTimestamp, _ := strconv.ParseFloat(m.LastImapLogin, 64)
-		lastLogin.WithLabelValues(m.Username).Set(lastLoginTimestamp)
-		quotaAllowed.WithLabelValues(m.Username).Set(float64(m.Quota))
-		quotaUsed.WithLabelValues(m.Username).Set(float64(m.QuotaUsed))
-		messages.WithLabelValues(m.Username).Set(float64(m.Messages))
+		lastLogin.WithLabelValues(api.Host, m.Username).Set(lastLoginTimestamp)
+		quotaAllowed.WithLabelValues(api.Host, m.Username).Set(float64(m.Quota))
+		quotaUsed.WithLabelValues(api.Host, m.Username).Set(float64(m.QuotaUsed))
+		messages.WithLabelValues(api.Host, m.Username).Set(float64(m.Messages))
 	}
 
 	return []prometheus.Collector{lastLogin, quotaAllowed, quotaUsed, messages}, nil

provider/mailq.go

@@ -18,7 +18,7 @@ type queueResponseItem struct {
 func (mailq Mailq) Provide(api mailcowApi.MailcowApiClient) ([]prometheus.Collector, error) {
 	gauge := *prometheus.NewGaugeVec(prometheus.GaugeOpts{
 		Name: "mailcow_mailq",
-	}, []string{"queue", "sender"})
+	}, []string{"host", "queue", "sender"})
 
 	body := make([]queueResponseItem, 0)
 	err := api.Get("api/v1/get/mailq/all", &body)
@@ -40,7 +40,7 @@ func (mailq Mailq) Provide(api mailcowApi.MailcowApiClient) ([]prometheus.Collec
 
 	for queueName, senders := range queue {
 		for sender, count := range senders {
-			gauge.WithLabelValues(queueName, sender).Set(count)
+			gauge.WithLabelValues(api.Host, queueName, sender).Set(count)
 		}
 	}
 

provider/quarantine.go

@@ -22,11 +22,11 @@ type quarantineItem struct {
 func (quarantine Quarantine) Provide(api mailcowApi.MailcowApiClient) ([]prometheus.Collector, error) {
 	countGauge := *prometheus.NewGaugeVec(prometheus.GaugeOpts{
 		Name: "mailcow_quarantine_count",
-	}, []string{"recipient", "is_virus"})
+	}, []string{"host", "recipient", "is_virus"})
 	scoreHist := *prometheus.NewHistogramVec(prometheus.HistogramOpts{
 		Name:    "mailcow_quarantine_score",
 		Buckets: []float64{0, 10, 20, 40, 60, 80, 100},
-	}, []string{"recipient"})
+	}, []string{"host", "recipient"})
 	ageHist := *prometheus.NewHistogramVec(prometheus.HistogramOpts{
 		Name: "mailcow_quarantine_age",
 		Help: "Age of quarantined items in seconds",
@@ -39,7 +39,7 @@ func (quarantine Quarantine) Provide(api mailcowApi.MailcowApiClient) ([]prometh
 			(14 * 60 * 60 * 24), // 14 days
 			(30 * 60 * 60 * 24), // 30 days
 		},
-	}, []string{"recipient"})
+	}, []string{"host", "recipient"})
 
 	body := make([]quarantineItem, 0)
 	err := api.Get("api/v1/get/quarantine/all", &body)
@@ -64,15 +64,15 @@ func (quarantine Quarantine) Provide(api mailcowApi.MailcowApiClient) ([]prometh
 		}
 
 		age := time.Now().Unix() - q.Created
-		ageHist.WithLabelValues(q.Recipient).Observe(float64(age))
-		scoreHist.WithLabelValues(q.Recipient).Observe(float64(q.Score))
+		ageHist.WithLabelValues(api.Host, q.Recipient).Observe(float64(age))
+		scoreHist.WithLabelValues(api.Host, q.Recipient).Observe(float64(q.Score))
 	}
 
 	for recipient, count := range virus {
-		countGauge.WithLabelValues(recipient, "1").Set(float64(count))
+		countGauge.WithLabelValues(api.Host, recipient, "1").Set(float64(count))
 	}
 	for recipient, count := range notVirus {
-		countGauge.WithLabelValues(recipient, "0").Set(float64(count))
+		countGauge.WithLabelValues(api.Host, recipient, "0").Set(float64(count))
 	}
 
 	return []prometheus.Collector{