Merge branch 'release/0.1'

.gitignore

@@ -1 +1,2 @@
 .idea/
+zookeeper_exporter

README.md

@@ -21,16 +21,16 @@ usage: zookeeper_exporter --zk.hosts=ZK.HOSTS [<flags>]
 A zookeeper metrics exporter for prometheus, with zk_version and leaderServes=no support.
 
 Flags:
-  -h, --help                  Show context-sensitive help (also try --help-long and --help-man).
+  -h, --help                   Show context-sensitive help (also try --help-long and --help-man).
       --web.listen-address="0.0.0.0:9898"  
-                              Address on which to expose metrics
-      --zk.hosts=ZK.HOSTS     list of ip:port of ZK hosts, comma separated
-      --zk.poll-interval=30   How often to poll the ZK servers
-      --zk.connect-timeout=5  Timeout value for connecting to ZK
-      --zk.connect-rw-deadline=5  
-                              Socket deadline for read & write operations
-      --version               Show application version.
-  
+                               Address on which to expose metrics
+      --zk.hosts=ZK.HOSTS      list of ip:port of ZK hosts, comma separated
+      --metrics.namespace="zookeeper__"  
+                               string to prepend to all metric names
+      --zk.poll-interval=30    How often to poll the ZK servers
+      --zk.connect-timeout=4   Timeout value for opening socket to ZK
+      --zk.connect-deadline=3  Connection deadline for read & write operations
+      --version                Show application version.
 
 $ zookeeper_exporter --zk.hosts=10.0.0.9:2181,10.0.0.10:2181  
 ~~~  

VERSION

@@ -1 +1 @@
-0.0.9
+0.1

main.go

@@ -26,20 +26,25 @@ var (
 		"list of ip:port of ZK hosts, comma separated",
 	).Required().String()
 
+	metricsNamespace = app.Flag(
+		"metrics.namespace",
+		"string to prepend to all metric names",
+	).Default("zookeeper__").String()
+
 	pollInterval = app.Flag(
 		"zk.poll-interval",
 		"How often to poll the ZK servers",
 	).Default("30").Int()
 
 	zkTimeout = app.Flag(
 		"zk.connect-timeout",
-		"Timeout value for connecting to ZK",
-	).Default("5").Int()
+		"Timeout value for opening socket to ZK",
+	).Default("4").Int()
 
 	zkRWDeadLine = app.Flag(
-		"zk.connect-rw-deadline",
-		"Socket deadline for read & write operations",
-	).Default("5").Int()
+		"zk.connect-deadline",
+		"Connection deadline for read & write operations",
+	).Default("3").Float()
 
 	log = logrus.New()
 )
@@ -82,7 +87,7 @@ func main() {
 	// Create new metrics interface
 	metrics := newMetrics()
 
-	// Start an export thread per server
+	// Start one poller per server
 	for _, ipport := range zkHosts {
 		p := newPoller(intervalDuration, *metrics, *newZKServer(ipport))
 		go p.pollForMetrics()

metrics.go

@@ -36,9 +36,6 @@ const (
 	follower   serverState = 1
 	leader     serverState = 2
 	standalone serverState = 3
-
-	// metric namespace - prepended to all metric names
-	namespace = "zookeeper__"
 )
 
 type zkMetrics struct {
@@ -75,7 +72,7 @@ func getState(s string) serverState {
 
 // prepends the namespace in front of all metric names
 func prependNamespace(rawMetricName string) string {
-	return namespace + rawMetricName
+	return *metricsNamespace + rawMetricName
 }
 
 // Creates a map of all known metrics exposed by zookeeper's mntr command

zk_server.go

@@ -13,7 +13,7 @@ import (
 const (
 	monitorCMD = "mntr"
 	okCMD      = "ruok"
-	enviCMD    = "envi"
+	enviCMD    = "envi" // Might use this in the future?
 )
 
 // zkServer object
@@ -73,7 +73,8 @@ func (zk *zkServer) getOKStatus() (string, error) {
 }
 
 func (zk *zkServer) sendCommand(cmd string) ([]byte, error) {
-	conn, err := net.Dial("tcp", zk.ipPort)
+	dialer := net.Dialer{Timeout: time.Duration(*zkTimeout) * time.Second}
+	conn, err := dialer.Dial("tcp", zk.ipPort)
 	if err != nil {
 		// log.Warnf("[%v] failed to dial zkServer: %v", zk.ipPort, err)
 		return []byte{}, err
@@ -85,12 +86,12 @@ func (zk *zkServer) sendCommand(cmd string) ([]byte, error) {
 	}()
 
 	// ensure these socket fail fast if ZK having problems
-	deadline := 3 * time.Second
+	RWDeadLine := time.Duration(*zkRWDeadLine) * time.Second
 
-	if err := conn.SetReadDeadline(time.Now().Add(deadline)); err != nil {
+	if err := conn.SetReadDeadline(time.Now().Add(RWDeadLine)); err != nil {
 		log.Errorf("[%v] failed to set Read Deadline on conn: %v", zk.ipPort, err)
 	}
-	if err := conn.SetWriteDeadline(time.Now().Add(deadline)); err != nil {
+	if err := conn.SetWriteDeadline(time.Now().Add(RWDeadLine)); err != nil {
 		log.Errorf("[%v] failed to set Write Deadline on conn: %v", zk.ipPort, err)
 	}