Merge branch 'master' into auth

alicebob · alicebob · commit cc86e0a09fef · 2018-02-22T16:52:49.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 asprom
+dist/
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -0,0 +1,15 @@
+builds:
+  - binary: asprom
+    goos:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+archive:
+    files:
+        - LICENSE
+    wrap_in_directory: true
+release:
+    github:
+        owner: alicebob
+        name: asprom
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,31 @@
+# builder
+FROM golang:1.9.3-alpine3.7 AS builder
+
+WORKDIR /go/src/github.com/alicebob
+
+ARG ASPROM_VERSION=1.0.1
+
+RUN apk add --no-cache git \
+    && git clone https://github.com/alicebob/asprom.git \
+    && cd asprom \
+    && git fetch --all --tags --prune \
+    && git checkout tags/$ASPROM_VERSION
+
+WORKDIR /go/src/github.com/alicebob/asprom
+
+RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o asprom .
+
+
+
+# final
+FROM alpine:3.7
+
+RUN apk --no-cache add ca-certificates
+
+WORKDIR /root/
+
+COPY --from=builder /go/src/github.com/alicebob/asprom .
+
+EXPOSE 9145
+
+CMD ["./asprom"]
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: all build test
+.PHONY: all build test release
 
 all: build test
 
@@ -7,3 +7,6 @@ build:
 
 test:
 	go test
+
+release:
+	goreleaser --rm-dist
diff --git a/README.md b/README.md
@@ -9,3 +9,15 @@ Statistics collected:
   * aerospike_sets_*: statistics per set: objects, memory usage
   * aerospike_latency_*: read/write/etc latency rates(!), per namespace
   * aerospike_ops_*: read/write/etc ops per second, per namespace
+
+## Binaries
+
+The [releases](https://github.com/alicebob/asprom/releases) page has binaries.
+
+## Building
+
+- install the [Go compiler](https://golang.org/dl)
+- run `make`
+- copy the `./asprom` binary to where you need it
+
+It's also easy to crosscompile with Go. You can build asprom for Linux on a Mac with: `GOOS=linux GOARCH=amd64 go build` and then copy the `asprom` binary over to your Linux machines.
diff --git a/latency.go b/latency.go
@@ -75,7 +75,7 @@ func (lc latencyCollector) collect(conn *as.Connection, ch chan<- prometheus.Met
 		}
 		ns, op, err := readNS(key)
 		if err != nil {
-			log.Print("weird latency key %q: %s", key, err)
+			log.Printf("weird latency key %q: %s", key, err)
 			continue
 		}
 		for threshold, data := range metrics {
diff --git a/main.go b/main.go
@@ -13,8 +13,10 @@ package main
 
 import (
 	"flag"
+	"fmt"
 	"log"
 	"net/http"
+	"os"
 	"time"
 
 	as "github.com/aerospike/aerospike-client-go"
@@ -32,10 +34,12 @@ const (
 )
 
 var (
-	addr     = flag.String("listen", ":9145", "listen address for prometheus")
-	nodeAddr = flag.String("node", "127.0.0.1:3000", "aerospike node")
-	username = flag.String("username", "", "username. Leave empty for no authentication")
-	password = flag.String("password", "", "password")
+	version     = "master"
+	showVersion = flag.Bool("version", false, "show version")
+	addr        = flag.String("listen", ":9145", "listen address for prometheus")
+	nodeAddr    = flag.String("node", "127.0.0.1:3000", "aerospike node")
+	username    = flag.String("username", "", "username. Leave empty for no authentication")
+	password    = flag.String("password", "", "password")
 
 	landingPage = `<html>
 <head><title>Aerospike exporter</title></head>
@@ -59,6 +63,11 @@ func main() {
 		log.Fatal("usage error")
 	}
 
+	if *showVersion {
+		fmt.Printf("asprom %s\n", version)
+		os.Exit(0)
+	}
+
 	col := newAsCollector(*nodeAddr, *username, *password)
 
 	req := prometheus.NewRegistry()
diff --git a/stats.go b/stats.go
@@ -13,18 +13,45 @@ var (
 	// See `asinfo -l -v statistics` for the full list.
 	StatsMetrics = []metric{
 		gauge("cluster_size", "cluster size"),
+		// cluster_key=C0758EC6A81F
+		// cluster_integrity=true
+		// cluster_is_member=true
+		counter("uptime", "uptime"),
 		gauge("system_free_mem_pct", "system free mem pct"),
+		// system_swapping=false
+		gauge("heap_allocated_kbytes", "heap allocated kbytes"),
+		gauge("heap_active_kbytes", "heap active kbytes"),
+		gauge("heap_mapped_kbytes", "heap mapped kbytes"),
+		gauge("heap_efficiency_pct", "heap efficiency pct"),
+		gauge("heap_site_count", "heap site count"),
 		gauge("objects", "objects"),
-		gauge("sub_objects", "sub objects"),
+		gauge("tombstones", "tombstones"),
+		gauge("tsvc_queue", "tsvc queue"),
 		gauge("info_queue", "info queue"),
 		gauge("delete_queue", "delete queue"),
+		// rw_in_progress=0
+		// proxy_in_progress=0
+		// tree_gc_queue=0
 		gauge("client_connections", "client connections"),
 		gauge("heartbeat_connections", "heartbeat connections"),
 		gauge("fabric_connections", "fabric connections"),
+		counter("heartbeat_received_self", "heartbeat received self"),
+		counter("heartbeat_received_foreign", "heartbeat received foreign"),
+		counter("reaped_fds", "reaped fds"),
+		counter("info_complete", "info complete"),
+		counter("demarshal_error", "demarshal error"),
+		counter("early_tsvc_client_error", "early tsvc client error"),
+		counter("early_tsvc_batch_sub_error", "early tsvc batch sub error"),
+		counter("early_tsvc_udf_sub_error", "early tsvc udf sub error"),
 		gauge("batch_index_initiate", "batch index initiate"),
+		// batch_index_queue=0:0,0:0,0:0,0:0
 		gauge("batch_index_complete", "batch index complete"),
 		gauge("batch_index_error", "batch index error"),
 		gauge("batch_index_timeout", "batch index timeout"),
+		gauge("batch_index_unused_buffers", "batch index unused buffers"),
+		gauge("batch_index_huge_buffers", "batch index huge buffers"),
+		counter("batch_index_created_buffers", "batch index created buffers"),
+		counter("batch_index_destroyed_buffers", "batch index destroyed buffers"),
 		gauge("batch_initiate", "batch initiate"),
 		gauge("batch_queue", "batch queue"),
 		gauge("batch_error", "batch error"),
@@ -34,15 +61,22 @@ var (
 		gauge("query_long_running", "query long running"),
 		gauge("sindex_ucgarbage_found", "sindex ucgarbage found"),
 		gauge("sindex_gc_locktimedout", "sindex gc locktimedout"),
-		gauge("sindex_gc_inactivity_dur", "sindex gc inactivity dur"),
-		gauge("sindex_gc_activity_dur", "sindex gc activity dur"),
 		gauge("sindex_gc_list_creation_time", "sindex gc list creation time"),
 		gauge("sindex_gc_list_deletion_time", "sindex gc list deletion time"),
 		gauge("sindex_gc_objects_validated", "sindex gc objects validated"),
 		gauge("sindex_gc_garbage_found", "sindex gc garbage found"),
 		gauge("sindex_gc_garbage_cleaned", "sindex gc garbage cleaned"),
-		counter("fabric_msgs_sent", "fabric msgs sent"),
-		counter("fabric_msgs_rcvd", "fabric msgs rcvd"),
+		// paxos_principal=BB9508FED001500
+		// migrate_allowed=true
+		gauge("migrate_partitions_remaining", "migrate partitions remaining"),
+		gauge("fabric_bulk_send_rate", "fabric bulk send rate"),
+		gauge("fabric_bulk_recv_rate", "fabric bulk recv rate"),
+		gauge("fabric_ctrl_send_rate", "fabric ctrl send rate"),
+		gauge("fabric_ctrl_recv_rate", "fabric ctrl recv rate"),
+		gauge("fabric_meta_send_rate", "fabric meta send rate"),
+		gauge("fabric_meta_recv_rate", "fabric meta recv rate"),
+		gauge("fabric_rw_send_rate", "fabric rw send rate"),
+		gauge("fabric_rw_recv_rate", "fabric rw recv rate"),
 		counter("xdr_ship_success", "xdr ship success"),
 		counter("xdr_ship_delete_success", "xdr ship delete success"),
 		counter("xdr_ship_source_error", "xdr ship source error"),

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ func (lc latencyCollector) collect(conn *as.Connection, ch chan<- prometheus.Met`
`75`	`75`	`}`
`76`	`76`	`ns, op, err := readNS(key)`
`77`	`77`	`if err != nil {`
`78`		`- log.Print("weird latency key %q: %s", key, err)`
	`78`	`+ log.Printf("weird latency key %q: %s", key, err)`
`79`	`79`	`continue`
`80`	`80`	`}`
`81`	`81`	`for threshold, data := range metrics {`