integration test, part 1

pending prometheus/client_golang#58, just check for presence of expected metrics
matthiasr · May 7, 2015 · a37e2f6 · a37e2f6
1 parent f5441bc
commit a37e2f6
Show file tree

Hide file tree

Showing 4 changed files with 157 additions and 100 deletions.
diff --git a/collector/fixtures/ip_vs → collector/fixtures/net/ip_vs b/collector/fixtures/ip_vs → collector/fixtures/net/ip_vs
diff --git a/collector/fixtures/ip_vs_stats → collector/fixtures/net/ip_vs_stats b/collector/fixtures/ip_vs_stats → collector/fixtures/net/ip_vs_stats
diff --git a/collector/ipvs.go b/collector/ipvs.go
@@ -16,14 +16,9 @@ import (
 	"github.com/prometheus/client_golang/prometheus"
 )
 
-const (
-	procNetIPVS      = "/proc/net/ip_vs"
-	procNetIPVSStats = "/proc/net/ip_vs_stats"
-	ipvsSubsystem    = "ipvs"
-)
-
 type ipvsCollector struct {
-	config                                                                      Config
+	Collector
+	procNetIPVS, procNetIPVSStats                                               string
 	backendConnectionsActive, backendConnectionsInact, backendWeight            *prometheus.GaugeVec
 	connections, incomingPackets, outgoingPackets, incomingBytes, outgoingBytes prometheus.Counter
 }
@@ -48,6 +43,10 @@ func init() {
 }
 
 func NewIPVSCollector(config Config) (Collector, error) {
+	return newIPVSCollector(config)
+}
+
+func newIPVSCollector(config Config) (*ipvsCollector, error) {
 	var (
 		ipvsBackendLabelNames = []string{
 			"local_address",
@@ -56,47 +55,60 @@ func NewIPVSCollector(config Config) (Collector, error) {
 			"remote_port",
 			"proto",
 		}
-		c ipvsCollector
+		c         ipvsCollector
+		procfs    string
+		subsystem string
 	)
 
-	c.config = config
+	if p, ok := config.Config["procfs"]; ok {
+		procfs = p
+	} else {
+		procfs = "/proc"
+	}
+	c.procNetIPVS = procfs + "/net/ip_vs"
+	c.procNetIPVSStats = procfs + "/net/ip_vs_stats"
+	if s, ok := config.Config["ipvs_subsystem"]; ok {
+		subsystem = s
+	} else {
+		subsystem = "ipvs"
+	}
 
 	c.connections = prometheus.NewCounter(
 		prometheus.CounterOpts{
 			Namespace: Namespace,
-			Subsystem: ipvsSubsystem,
+			Subsystem: subsystem,
 			Name:      "connections_total",
 			Help:      "The total number of connections made.",
 		},
 	)
 	c.incomingPackets = prometheus.NewCounter(
 		prometheus.CounterOpts{
 			Namespace: Namespace,
-			Subsystem: ipvsSubsystem,
+			Subsystem: subsystem,
 			Name:      "incoming_packets_total",
 			Help:      "The total number of incoming packets.",
 		},
 	)
 	c.outgoingPackets = prometheus.NewCounter(
 		prometheus.CounterOpts{
 			Namespace: Namespace,
-			Subsystem: ipvsSubsystem,
+			Subsystem: subsystem,
 			Name:      "outgoing_packets_total",
 			Help:      "The total number of outgoing packets.",
 		},
 	)
 	c.incomingBytes = prometheus.NewCounter(
 		prometheus.CounterOpts{
 			Namespace: Namespace,
-			Subsystem: ipvsSubsystem,
+			Subsystem: subsystem,
 			Name:      "incoming_bytes_total",
 			Help:      "The total amount of incoming data.",
 		},
 	)
 	c.outgoingBytes = prometheus.NewCounter(
 		prometheus.CounterOpts{
 			Namespace: Namespace,
-			Subsystem: ipvsSubsystem,
+			Subsystem: subsystem,
 			Name:      "outgoing_bytes_total",
 			Help:      "The total amount of outgoing data.",
 		},
@@ -105,7 +117,7 @@ func NewIPVSCollector(config Config) (Collector, error) {
 	c.backendConnectionsActive = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Namespace: Namespace,
-			Subsystem: ipvsSubsystem,
+			Subsystem: subsystem,
 			Name:      "backend_connections_active",
 			Help:      "The current active connections by local and remote address.",
 		},
@@ -114,7 +126,7 @@ func NewIPVSCollector(config Config) (Collector, error) {
 	c.backendConnectionsInact = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Namespace: Namespace,
-			Subsystem: ipvsSubsystem,
+			Subsystem: subsystem,
 			Name:      "backend_connections_inactive",
 			Help:      "The current inactive connections by local and remote address.",
 		},
@@ -123,7 +135,7 @@ func NewIPVSCollector(config Config) (Collector, error) {
 	c.backendWeight = prometheus.NewGaugeVec(
 		prometheus.GaugeOpts{
 			Namespace: Namespace,
-			Subsystem: ipvsSubsystem,
+			Subsystem: subsystem,
 			Name:      "backend_weight",
 			Help:      "The current backend weight by local and remote address.",
 		},
@@ -134,7 +146,7 @@ func NewIPVSCollector(config Config) (Collector, error) {
 }
 
 func (c *ipvsCollector) Update(ch chan<- prometheus.Metric) error {
-	ipvsStats, err := getIPVSStats()
+	ipvsStats, err := getIPVSStats(c.procNetIPVSStats)
 	if err != nil {
 		return fmt.Errorf("could not get IPVS stats: %s", err)
 	}
@@ -151,7 +163,7 @@ func (c *ipvsCollector) Update(ch chan<- prometheus.Metric) error {
 	c.incomingBytes.Collect(ch)
 	c.outgoingBytes.Collect(ch)
 
-	backendStats, err := getIPVSBackendStatus()
+	backendStats, err := getIPVSBackendStatus(c.procNetIPVS)
 	if err != nil {
 		return fmt.Errorf("could not get backend status: %s", err)
 	}
@@ -176,7 +188,7 @@ func (c *ipvsCollector) Update(ch chan<- prometheus.Metric) error {
 	return nil
 }
 
-func getIPVSBackendStatus() ([]ipvsBackendStatus, error) {
+func getIPVSBackendStatus(procNetIPVS string) ([]ipvsBackendStatus, error) {
 	file, err := os.Open(procNetIPVS)
 	if err != nil {
 		return nil, err
@@ -188,7 +200,7 @@ func getIPVSBackendStatus() ([]ipvsBackendStatus, error) {
 
 func parseIPVSBackendStatus(file io.Reader) ([]ipvsBackendStatus, error) {
 	var (
-		status       = []ipvsBackendStatus{}
+		status       []ipvsBackendStatus
 		scanner      = bufio.NewScanner(file)
 		proto        string
 		localAddress net.IP
@@ -248,7 +260,7 @@ func parseIPVSBackendStatus(file io.Reader) ([]ipvsBackendStatus, error) {
 	return status, nil
 }
 
-func getIPVSStats() (ipvsStats, error) {
+func getIPVSStats(procNetIPVSStats string) (ipvsStats, error) {
 	file, err := os.Open(procNetIPVSStats)
 	if err != nil {
 		return ipvsStats{}, err
@@ -262,7 +274,7 @@ func parseIPVSStats(file io.Reader) (ipvsStats, error) {
 	var (
 		statContent []byte
 		statFields  []string
-		stats       = ipvsStats{}
+		stats       ipvsStats
 	)
 
 	statContent, err := ioutil.ReadAll(file)