DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 32ffa87221 into 22c3226377

Browse source
This commit is contained in:
zoues 2017-04-04 12:17:08 +00:00 committed by GitHub
commit 8f4ffb9256
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
controllers/nginx/pkg/metric/collector/nginx.go
View file

@ -18,6 +18,7 @@ package collector
import ( import (
"fmt" "fmt"
"strings"
"github.com/golang/glog" "github.com/golang/glog"
"github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus"
@ -46,10 +47,15 @@ func buildNS(namespace, class string) string {
if namespace == "" { if namespace == "" {
namespace = "all" namespace = "all"
} }
if class == "" { if class == "" {
class = "all" class = "all"
} }
if strings.Compare(system, namespace) == 1 {
namespace = ""
}
return fmt.Sprintf("%v_%v", namespace, class) return fmt.Sprintf("%v_%v", namespace, class)
} }