change parameter name address -> bind, modify guage -> gauge

Author: gywndi

.DS_Store

@@ -9,7 +9,7 @@
 go build .
 ./query-exporter                          \
   --threads=8                             \
-  --address="0.0.0.0:9104"                \
+  --bind="0.0.0.0:9104"                \
   --config-database="config-database.yml" \
   --config-metrics="config-metrics.yml"
 ```
@@ -19,7 +19,7 @@ go build .
 export LOG_LEVEL="debug" 
 ./query-exporter                          \
   --threads=8                             \
-  --address="0.0.0.0:9104"                \
+  --bind="0.0.0.0:9104"                \
   --config-database="config-database.yml" \
   --config-metrics="config-metrics.yml"
 ```
@@ -67,24 +67,24 @@ metric01:
     timeout: 1
     metrics:
       process_count:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "sessions"
       process_session_min_time:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "min_time"
       process_session_max_time:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "max_time"
   - query: "select count(*) cnt from information_schema.innodb_trx"
     metrics:
       innodb_trx_count:
-        type: guage
+        type: gauge
         description: innodb current trx count
         labels: []
         value: "cnt"
@@ -103,17 +103,17 @@ metric02:
     timeout: 2
     metrics:
       process_count:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "sessions"
       process_session_min_time:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "min_time"
       process_session_max_time:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "max_time"

README.md

@@ -118,10 +118,10 @@ func (e *QueryCollector) scrape(instance Instance, ch chan<- prometheus.Metric)
 				switch strings.ToLower(metric.Type) {
 				case "counter":
 					ch <- prometheus.MustNewConstMetric(metric.metricDesc, prometheus.CounterValue, val, labelVals...)
-				case "guage":
+				case "gauge":
 					ch <- prometheus.MustNewConstMetric(metric.metricDesc, prometheus.GaugeValue, val, labelVals...)
 				default:
-					log.Errorf("[%s] Metric type support only counter|guage, skip", instance.Name)
+					log.Errorf("[%s] Metric type support only counter|gauge, skip", instance.Name)
 					continue
 				}
 			}

collector.go

@@ -13,17 +13,17 @@ metric01:
     timeout: 2
     metrics:
       process_count:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "sessions"
       process_session_min_time:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "min_time"
       process_session_max_time:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "max_time"
@@ -42,24 +42,24 @@ metric02:
     timeout: 1
     metrics:
       process_count:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "sessions"
       process_session_min_time:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "min_time"
       process_session_max_time:
-        type: guage
+        type: gauge
         description: Session count
         labels: ["user","host", "db", "command"]
         value: "max_time"
   - query: "select count(*) cnt from information_schema.innodb_trx"
     metrics:
       innodb_trx_count:
-        type: guage
+        type: gauge
         description: innodb current trx count
         labels: []
         value: "cnt"

config-metrics.yml

@@ -13,14 +13,14 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-var address string
+var bind string
 var group map[string]Instances
 var collectors map[string]*Collector
 
 const (
 	defaultQueryTimeout   = 1
 	defaultThreadCount    = 32
-	defaultAddress        = "0.0.0.0:9104"
+	defaultBind           = "0.0.0.0:9104"
 	defaultConfigDatabase = "config-database.yml"
 	defaultConfigMetrics  = "config-metrics.yml"
 )
@@ -32,13 +32,13 @@ func main() {
 	var threads int64
 	var cfg1, cfg2 string
 	flag.Int64Var(&threads, "threads", defaultThreadCount, "collector thread count")
-	flag.StringVar(&address, "address", defaultAddress, "http server port")
+	flag.StringVar(&bind, "address", defaultBind, "http server port")
 	flag.StringVar(&cfg1, "config-database", defaultConfigDatabase, "configuration databases")
 	flag.StringVar(&cfg2, "config-metrics", defaultConfigMetrics, "configuration metrics")
 	flag.Parse()
 
 	// ===========================
-	log.Debugf("[address] %s", address)
+	log.Debugf("[bind] %s", bind)
 	log.Debugf("[threads] %d", threads)
 	log.Debugf("[config-database] %s", cfg1)
 	log.Debugf("[config-metrics] %s", cfg2)
@@ -125,7 +125,7 @@ func main() {
 		}
 
 		// Regist http handler
-		log.Infof("Regist handler %s/%s", address, path)
+		log.Infof("Regist handler %s/%s", bind, path)
 		http.HandleFunc("/"+path, func(w http.ResponseWriter, r *http.Request) {
 			h := promhttp.HandlerFor(prometheus.Gatherers{
 				prometheus.DefaultGatherer,
@@ -139,8 +139,8 @@ func main() {
 	// ===========================
 	// start server
 	// ===========================
-	log.Infof("Starting http server - %s", address)
-	if err = http.ListenAndServe(address, nil); err != nil {
+	log.Infof("Starting http server - %s", bind)
+	if err = http.ListenAndServe(bind, nil); err != nil {
 		log.Fatalf("Failed to start http server: %s", err)
 	}
 }