diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index 6524e792b3a..b01f0649116 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -22,7 +22,6 @@ import ( "flag" "fmt" "net/http" - "regexp" "time" "github.com/golang/glog" @@ -109,18 +108,7 @@ func (cc *cadvisorClient) exportHTTP(port uint) error { return err } - re := regexp.MustCompile(`^k8s_(?P[^_\.]+)[^_]+_(?P[^_]+)_(?P[^_]+)`) - 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 - }) + cadvisorhttp.RegisterPrometheusHandler(mux, cc, "/metrics", nil) // Only start the http server if port > 0 if port > 0 {