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

Merge pull request #29291 from jimmidyson/prometheus-duplicate-labels

Browse Source 
Automatic merge from submit-queue

Remove duplicate prometheus metrics

This was a relic from before Kubernetes set Docker labels properly. Cadvisor now properly exposes the Docker labels (e.g. `io.kubernetes.pod.name` as `io_kubernetes_pod_name`, etc) so this is no longer required & actually results in unnecessary duplicate Prometheus labels.
This commit is contained in:
k8s-merge-robot 2016-07-25 12:19:55 -07:00 committed by GitHub
commit 84724b789e
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"
"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<kubernetes_container_name>[^_\.]+)[^_]+_(?P<kubernetes_pod_name>[^_]+)_(?P<kubernetes_namespace>[^_]+)`)
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 {