Merge pull request #35 from rfredette/ocpbugs-15253-ingress-alerts

OCPBUGS-15253: Include ingress's namespace in ingress without class metric
openshift · Oct 25, 2023 · c5cc7a7 · c5cc7a7
2 parents 03299cf + c5fdfff
commit c5cc7a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/pkg/route/ingress/metrics.go b/pkg/route/ingress/metrics.go
@@ -23,7 +23,7 @@ var (
 	ingressesWithoutClassName = prometheus.NewGaugeVec(prometheus.GaugeOpts{
 		Name: metricIngressWithoutClassName,
 		Help: "Report the number of ingresses that do not specify ingressClassName.",
-	}, []string{"name"})
+	}, []string{"name", "namespace"})
 )
 
 func (c *Controller) Create(v *semver.Version) bool {
@@ -69,7 +69,7 @@ func (c *Controller) Collect(ch chan<- prometheus.Metric) {
 		if icName == nil || *icName == "" {
 			labelVal = 1
 		}
-		ingressesWithoutClassName.WithLabelValues(ingressInstance.Name).Set(float64(labelVal))
+		ingressesWithoutClassName.WithLabelValues(ingressInstance.Name, ingressInstance.Namespace).Set(float64(labelVal))
 	}
 
 	ingressesWithoutClassName.Collect(ch)

diff --git a/pkg/route/ingress/metrics_test.go b/pkg/route/ingress/metrics_test.go
@@ -58,7 +58,7 @@ func TestMetrics(t *testing.T) {
 			},
 			ingressclassLister: &ingressclassLister{},
 			routeLister:        &routeLister{},
-			expectedResponse:   "openshift_ingress_to_route_controller_ingress_without_class_name{name=\"nil-ingressclassname\"} 1",
+			expectedResponse:   "openshift_ingress_to_route_controller_ingress_without_class_name{name=\"nil-ingressclassname\",namespace=\"test\"} 1",
 		},
 		{
 			name: "Ingress with empty IngressClassName should return 1",
@@ -75,7 +75,7 @@ func TestMetrics(t *testing.T) {
 			},
 			ingressclassLister: &ingressclassLister{},
 			routeLister:        &routeLister{},
-			expectedResponse:   "openshift_ingress_to_route_controller_ingress_without_class_name{name=\"empty-ingressclassname\"} 1",
+			expectedResponse:   "openshift_ingress_to_route_controller_ingress_without_class_name{name=\"empty-ingressclassname\",namespace=\"test\"} 1",
 		},
 		{
 			name: "Ingress with empty string IngressClassName should return 1",
@@ -94,7 +94,7 @@ func TestMetrics(t *testing.T) {
 			},
 			ingressclassLister: &ingressclassLister{},
 			routeLister:        &routeLister{},
-			expectedResponse:   "openshift_ingress_to_route_controller_ingress_without_class_name{name=\"emptystring-ingressclassname\"} 1",
+			expectedResponse:   "openshift_ingress_to_route_controller_ingress_without_class_name{name=\"emptystring-ingressclassname\",namespace=\"test\"} 1",
 		},
 		{
 			name: "Ingress with set IngressClassName should return 0",
@@ -113,7 +113,7 @@ func TestMetrics(t *testing.T) {
 			},
 			ingressclassLister: &ingressclassLister{},
 			routeLister:        &routeLister{},
-			expectedResponse:   "openshift_ingress_to_route_controller_ingress_without_class_name{name=\"set-ingressclassname\"} 0",
+			expectedResponse:   "openshift_ingress_to_route_controller_ingress_without_class_name{name=\"set-ingressclassname\",namespace=\"test\"} 0",
 		},
 		{
 			name: "Route with an unmanaged Ingress owner should return 1",