fix small problems in metrics

projecteru2 · Jul 1, 2024 · 1433d90 · 1433d90
1 parent 3015462
commit 1433d90
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/internal/eru/agent/metrics.go b/internal/eru/agent/metrics.go
@@ -38,6 +38,7 @@ func (mgr *Manager) GetMetricsCollector() *MetricsCollector {
 
 func (e *MetricsCollector) Describe(ch chan<- *prometheus.Desc) {
 	ch <- vmHealthyDesc
+	ch <- coreHealthyDesc
 }
 
 func (e *MetricsCollector) Collect(ch chan<- prometheus.Metric) {

diff --git a/internal/network/drivers/ovn/metrics.go b/internal/network/drivers/ovn/metrics.go
@@ -9,7 +9,7 @@ import (
 )
 
 var (
-	calicoHealthyDesc = prometheus.NewDesc(
+	ovnHealthyDesc = prometheus.NewDesc(
 		prometheus.BuildFQName("node", "ovn", "healthy"),
 		"ovn healthy status.",
 		[]string{"node"},
@@ -25,13 +25,13 @@ func (d *Driver) GetMetricsCollector() prometheus.Collector {
 }
 
 func (e *MetricsCollector) Describe(ch chan<- *prometheus.Desc) {
-	ch <- calicoHealthyDesc
+	ch <- ovnHealthyDesc
 }
 
 func (e *MetricsCollector) Collect(ch chan<- prometheus.Metric) {
 	healthy := utils.Bool2Int(e.healthy.Load())
 	ch <- prometheus.MustNewConstMetric(
-		calicoHealthyDesc,
+		ovnHealthyDesc,
 		prometheus.GaugeValue,
 		float64(healthy),
 		configs.Hostname(),

diff --git a/internal/network/drivers/vlan/metrics.go b/internal/network/drivers/vlan/metrics.go
@@ -9,9 +9,9 @@ import (
 )
 
 var (
-	calicoHealthyDesc = prometheus.NewDesc(
-		prometheus.BuildFQName("network", "ovn", "healthy"),
-		"ovn healthy status.",
+	vlanHealthyDesc = prometheus.NewDesc(
+		prometheus.BuildFQName("network", "vlan", "healthy"),
+		"vlan healthy status.",
 		[]string{"node"},
 		nil)
 )
@@ -25,13 +25,13 @@ func (d *Handler) GetMetricsCollector() prometheus.Collector {
 }
 
 func (e *MetricsCollector) Describe(ch chan<- *prometheus.Desc) {
-	ch <- calicoHealthyDesc
+	ch <- vlanHealthyDesc
 }
 
 func (e *MetricsCollector) Collect(ch chan<- prometheus.Metric) {
 	healthy := utils.Bool2Int(e.healthy.Load())
 	ch <- prometheus.MustNewConstMetric(
-		calicoHealthyDesc,
+		vlanHealthyDesc,
 		prometheus.GaugeValue,
 		float64(healthy),
 		configs.Hostname(),