diff --git a/controllers/nginx/pkg/metric/collector/nginx.go b/controllers/nginx/pkg/metric/collector/nginx.go index a51b7de39..9fc58952d 100644 --- a/controllers/nginx/pkg/metric/collector/nginx.go +++ b/controllers/nginx/pkg/metric/collector/nginx.go @@ -43,13 +43,15 @@ type ( } ) -func buildNS(system, namespace, class string) string { +func buildNS(namespace, class string) string { if namespace == "" { namespace = "all" } + if class == "" { class = "all" } + if strings.Compare(system, namespace) == 1 { namespace = "" } @@ -65,7 +67,7 @@ func NewNginxStatus(namespace, class string, ngxHealthPort int, ngxVtsPath strin ngxVtsPath: ngxVtsPath, } - ns := buildNS(system, namespace, class) + ns := buildNS(namespace, class) p.data = &nginxStatusData{ active: prometheus.NewDesc( diff --git a/controllers/nginx/pkg/metric/collector/vts.go b/controllers/nginx/pkg/metric/collector/vts.go index 9ec488cb9..4d80d66c4 100644 --- a/controllers/nginx/pkg/metric/collector/vts.go +++ b/controllers/nginx/pkg/metric/collector/vts.go @@ -62,7 +62,7 @@ func NewNGINXVTSCollector(namespace, class string, ngxHealthPort int, ngxVtsPath ngxVtsPath: ngxVtsPath, } - ns := buildNS(system, namespace, class) + ns := buildNS(namespace, class) p.data = &vtsData{ bytes: prometheus.NewDesc(