github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Remove duplicate prometheus metrics

Browse Source
This commit is contained in:
Jimmi Dyson 2016-07-20 16:00:21 +01:00
parent ecebdb5707
commit 21231e1e83
No known key found for this signature in database
GPG Key ID: 978CD4AF4C1E87F5
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubelet/cadvisor/cadvisor_linux.go
View File

@ -22,7 +22,6 @@ import (
"flag" "flag"
"fmt" "fmt"
"net/http" "net/http"
"regexp"
"time" "time"
"github.com/golang/glog" "github.com/golang/glog"
@ -109,18 +108,7 @@ func (cc *cadvisorClient) exportHTTP(port uint) error {
return err return err
} }
re := regexp.MustCompile(`^k8s_(?P<kubernetes_container_name>[^_\.]+)[^_]+_(?P<kubernetes_pod_name>[^_]+)_(?P<kubernetes_namespace>[^_]+)`) cadvisorhttp.RegisterPrometheusHandler(mux, cc, "/metrics", nil)
reCaptureNames := re.SubexpNames()
cadvisorhttp.RegisterPrometheusHandler(mux, cc, "/metrics", func(name string) map[string]string {
extraLabels := map[string]string{}
matches := re.FindStringSubmatch(name)
for i, match := range matches {
if len(reCaptureNames[i]) > 0 {
extraLabels[re.SubexpNames()[i]] = match
}
}
return extraLabels
})
// Only start the http server if port > 0 // Only start the http server if port > 0
if port > 0 { if port > 0 {