Added cli config for changing prometheus port & path (#288)

* added prometheus metrics port option

* fix propper config

* added option to change path

* added path config to prometheus

* updated readme

* fixed string that should be int

Author: roffe

Documentation/README.md

@@ -116,6 +116,8 @@ Usage of ./kube-router:
       --kubeconfig string                   Path to kubeconfig file with authorization information (the master location is set by the master flag).
       --masquerade-all                      SNAT all traffic to cluster IP/node port.
       --master string                       The address of the Kubernetes API server (overrides any value in kubeconfig).
+      --metrics-port int                    Prometheus metrics port to use, ( default 8080 )
+      --metrics-path string                 Path to serve Prometheus metrics on, ( default /metrics )
       --nodeport-bindon-all-ip              For service of NodePort type create IPVS service that listens on all IP's of the node.
       --nodes-full-mesh                     Each node in the cluster will setup BGP peering with rest of the nodes. (default true)
       --peer-router-asns uintSlice          ASN numbers of the BGP peer to which cluster nodes will advertise cluster ip and node's pod cidr. (default [])

app/controllers/network_services_controller.go

@@ -83,6 +83,8 @@ type NetworkServicesController struct {
 	globalHairpin       bool
 	client              *kubernetes.Clientset
 	nodeportBindOnAllIp bool
+	MetricsPort         int
+	MetricsPath         string
 }
 
 // internal representation of kubernetes service
@@ -133,8 +135,8 @@ func (nsc *NetworkServicesController) Run(stopCh <-chan struct{}, wg *sync.WaitG
 	prometheus.MustRegister(serviceActiveConn)
 	prometheus.MustRegister(servicePpsIn)
 	prometheus.MustRegister(servicePpsOut)
-	http.Handle("/metrics", promhttp.Handler())
-	go http.ListenAndServe(":8080", nil)
+	http.Handle(nsc.MetricsPath, promhttp.Handler())
+	go http.ListenAndServe(":"+strconv.Itoa(nsc.MetricsPort), nil)
 
 	// enable ipvs connection tracking
 	err = ensureIpvsConntrack()
@@ -1565,6 +1567,8 @@ func NewNetworkServicesController(clientset *kubernetes.Clientset, config *optio
 	nsc := NetworkServicesController{}
 	nsc.syncPeriod = config.IpvsSyncPeriod
 	nsc.globalHairpin = config.GlobalHairpinMode
+	nsc.MetricsPort = config.MetricsPort
+	nsc.MetricsPath = config.MetricsPath
 
 	nsc.serviceMap = make(serviceInfoMap)
 	nsc.endpointsMap = make(endpointsInfoMap)

app/options/options.go

@@ -37,6 +37,8 @@ type KubeRouterConfig struct {
 	EnableOverlay       bool
 	PeerPasswords       []string
 	EnablePprof         bool
+	MetricsPort         int
+	MetricsPath         string
 	// FullMeshPassword    string
 }
 
@@ -109,6 +111,9 @@ func (s *KubeRouterConfig) AddFlags(fs *pflag.FlagSet) {
 		"Password for authenticating against the BGP peer defined with \"--peer-router-ips\".")
 	fs.BoolVar(&s.EnablePprof, "enable-pprof", false,
 		"Enables pprof for debugging performance and memory leak issues.")
+	fs.IntVar(&s.MetricsPort, "metrics-port", 8080, "Prometheus metrics port")
+	fs.StringVar(&s.MetricsPath, "metrics-path", "/metrics", "Prometheus metrics path")
+
 	// fs.StringVar(&s.FullMeshPassword, "nodes-full-mesh-password", s.FullMeshPassword,
 	// 	"Password that cluster-node BGP servers will use to authenticate one another when \"--nodes-full-mesh\" is set.")
 }