Add ingress label to exported metrics (#300)

voyagermesh · Jul 17, 2017 · 035f90e · 035f90e
1 parent 6a900c9
commit 035f90e
Show file tree

Hide file tree

Showing 8 changed files with 129 additions and 96 deletions.
diff --git a/glide.lock b/glide.lock
diff --git a/pkg/cmds/exporter.go b/pkg/cmds/exporter.go
@@ -5,7 +5,6 @@ import (
 	"net/http"
 	_ "net/http/pprof"
 
-	hpe "github.com/appscode/haproxy_exporter/exporter"
 	"github.com/appscode/log"
 	"github.com/appscode/pat"
 	acs "github.com/appscode/voyager/client/clientset"
@@ -55,10 +54,6 @@ func export() {
 	extClient = acs.NewForConfigOrDie(config)
 
 	log.Infoln("Starting Voyager exporter...")
-	selectedServerMetrics, err = hpe.FilterServerMetrics(haProxyServerMetricFields)
-	if err != nil {
-		log.Fatal(err)
-	}
 	m := pat.New()
 	m.Get("/metrics", promhttp.Handler())
 	pattern := fmt.Sprintf("/%s/v1beta1/namespaces/%s/ingresses/%s/metrics", PathParamAPIGroup, PathParamNamespace, PathParamName)

diff --git a/pkg/cmds/exporter_handler.go b/pkg/cmds/exporter_handler.go
@@ -26,8 +26,6 @@ const (
 )
 
 var (
-	selectedServerMetrics map[int]*prometheus.GaugeVec
-
 	registerers = cmap.New() // URL.path => *prometheus.Registry
 )
 
@@ -92,7 +90,7 @@ func ExportMetrics(w http.ResponseWriter, r *http.Request) {
 					http.Error(w, err.Error(), http.StatusInternalServerError)
 					return
 				}
-				exporter, err := hpe.NewExporter(scrapeURL, selectedServerMetrics, haProxyTimeout)
+				exporter, err := hpe.NewExporter(scrapeURL, name, haProxyServerMetricFields, haProxyTimeout)
 				if err != nil {
 					http.Error(w, err.Error(), http.StatusInternalServerError)
 					return
@@ -127,7 +125,7 @@ func ExportMetrics(w http.ResponseWriter, r *http.Request) {
 					http.Error(w, err.Error(), http.StatusInternalServerError)
 					return
 				}
-				exporter, err := hpe.NewExporter(scrapeURL, selectedServerMetrics, haProxyTimeout)
+				exporter, err := hpe.NewExporter(scrapeURL, name, haProxyServerMetricFields, haProxyTimeout)
 				if err != nil {
 					http.Error(w, err.Error(), http.StatusInternalServerError)
 					return

diff --git a/pkg/cmds/run.go b/pkg/cmds/run.go
@@ -110,10 +110,6 @@ func run() {
 	w.PurgeOffshootsWithDeprecatedLabels()
 	go w.Run()
 
-	selectedServerMetrics, err = hpe.FilterServerMetrics(haProxyServerMetricFields)
-	if err != nil {
-		log.Fatal(err)
-	}
 	m := pat.New()
 	m.Get("/metrics", promhttp.Handler())
 	pattern := fmt.Sprintf("/%s/v1beta1/namespaces/%s/ingresses/%s/metrics", PathParamAPIGroup, PathParamNamespace, PathParamName)

diff --git a/vendor/github.com/appscode/haproxy_exporter/exporter/haproxy_exporter.go b/vendor/github.com/appscode/haproxy_exporter/exporter/haproxy_exporter.go
diff --git a/vendor/github.com/spf13/cobra/command.go b/vendor/github.com/spf13/cobra/command.go
diff --git a/vendor/gopkg.in/yaml.v2/emitterc.go b/vendor/gopkg.in/yaml.v2/emitterc.go
diff --git a/vendor/gopkg.in/yaml.v2/yamlh.go b/vendor/gopkg.in/yaml.v2/yamlh.go