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

remove const system form buildDS

Browse source
This commit is contained in:
zoues 2017-03-23 09:15:18 +08:00
parent 18d03d99d3
commit 32ffa87221
2 changed files with 5 additions and 3 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

@ -43,13 +43,15 @@ type (
} }
) )
func buildNS(system, namespace, class string) string { 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 { if strings.Compare(system, namespace) == 1 {
namespace = "" namespace = ""
} }
@ -65,7 +67,7 @@ func NewNginxStatus(namespace, class string, ngxHealthPort int, ngxVtsPath strin
ngxVtsPath: ngxVtsPath, ngxVtsPath: ngxVtsPath,
} }
ns := buildNS(system, namespace, class) ns := buildNS(namespace, class)
p.data = &nginxStatusData{ p.data = &nginxStatusData{
active: prometheus.NewDesc( active: prometheus.NewDesc(

2
controllers/nginx/pkg/metric/collector/vts.go
View file

@ -62,7 +62,7 @@ func NewNGINXVTSCollector(namespace, class string, ngxHealthPort int, ngxVtsPath
ngxVtsPath: ngxVtsPath, ngxVtsPath: ngxVtsPath,
} }
ns := buildNS(system, namespace, class) ns := buildNS(namespace, class)
p.data = &vtsData{ p.data = &vtsData{
bytes: prometheus.NewDesc( bytes: prometheus.NewDesc(