Merge pull request #82 from percona/develop

Prepare release 0.3.1

Author: AlekSi

.travis.yml

@@ -4,7 +4,8 @@ language: go
 
 go:
   - 1.8.x
-  - tip
+  - 1.9.x
+  - master
 
 env:
   - MONGODB_IMAGE=mongo:3.4
@@ -22,4 +23,11 @@ script:
   - make format build testall
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash) -X fix
+
+notifications:
+  slack:
+    on_success: change
+    on_failure: always
+    rooms:
+      secure: updWrOALfF29z30ogJ4m21WX0oOSYbRX/+abuEqXCC9zZ2QI7EoRR61hrAgNXJXUTffmUIM0vCrToYlybMsdcZHwCXWN8vr2yW3fyypfs/+rUng1qigEy1wVVIFgAC/6NruhmuUMWo1qwe4tUenQmegBiSpYRVRI10Qsnj6TggCNVz0cuoxpmzpVvNH78s1elnU4P1REWhjStuqQvKgG5cWOsvI+9l2Z+t9HdpYE7E7N3Ec73t2Z4wKhlpScbLF+mhnTWV6zgCkLaVdMshFeBEuYWmRr3D2QJWMntl/DrVaRoW76kX9nm2PQ/P4q0BdQslf5WsAiONWPOOWqK6n9RM9SegGSEXnXiqkWtmJQspa3zhjkNZStaD/g5E4yP5QnTbk4WP8ma18yQfMthXeQiQOEWj6zOTzBslu6Iyyc9QzbNijnYy3ZBBBAWGaKjFKmTrMTgl19SbAsvgi41A+zrVL5LeCwAR0/2QUdMegHZSla9WBiURgT/quA8EnA3N+ObNQBpqBETJmSPpJbqrkZI8+7oo4nFxLkwCRVyI4/XInTl5aKsRNYP95kPX3zJuUEe8x39qYhG5QcGV8G8AK0B+jrGoEB2qSN2p+Ye1XE6+Z38KktVzM3GmMOt/v+ts1ZjiaZvK0zlb7vRTMuiBmAjAnB5l5vmNSjkP6+ZL832Og=

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.3.1 (2017-09-08)
+
+* Better logging for scrape errors.
+
 ## v0.3.0 (2017-07-07)
 
 * Add standard metrics:

Makefile

@@ -31,21 +31,11 @@ style:
 
 test:
 	@echo ">> running tests"
-	rm -f coverage.txt
-	for p in $(pkgs); do \
-		rm -f coverage_temp.txt ; \
-		$(GO) test -v -short -race -covermode atomic -coverprofile coverage_temp.txt $$p ; \
-		cat coverage_temp.txt >> coverage.txt ; \
-	done
+	gocoverutil -coverprofile=coverage.txt test -short -v -race $(pkgs)
 
 testall:
 	@echo ">> running all tests"
-	rm -f coverage.txt
-	for p in $(pkgs); do \
-		rm -f coverage_temp.txt ; \
-		$(GO) test -v -race -covermode atomic -coverprofile coverage_temp.txt $$p ; \
-		cat coverage_temp.txt >> coverage.txt ; \
-	done
+	gocoverutil -coverprofile=coverage.txt test -v -race $(pkgs)
 
 format:
 	@echo ">> formatting code"
@@ -55,22 +45,23 @@ vet:
 	@echo ">> vetting code"
 	@$(GO) vet $(pkgs)
 
-build: promu
+build: init
 	@echo ">> building binaries"
 	@$(PROMU) build --prefix $(PREFIX)
 
-tarball: promu
+tarball: init
 	@echo ">> building release tarball"
 	@$(PROMU) tarball --prefix $(PREFIX) $(BIN_DIR)
 
 docker:
 	@echo ">> building docker image"
 	@docker build -t "$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_TAG)" .
 
-promu:
-	@GOOS=$(shell uname -s | tr A-Z a-z) \
+init:
+	$(GO) get -u github.com/AlekSi/gocoverutil
+	GOOS=$(shell uname -s | tr A-Z a-z) \
 		GOARCH=$(subst x86_64,amd64,$(patsubst i%86,386,$(shell uname -m))) \
 		$(GO) get -u github.com/prometheus/promu
 
 
-.PHONY: all style format build test vet tarball docker promu
+.PHONY: all style format build test vet tarball docker init

README.md

@@ -7,11 +7,6 @@
 
 Based on [MongoDB exporter](https://github.com/dcu/mongodb_exporter) by David Cuadrado (@dcu), but forked for full sharded support and structure changes.
 
-
-## Experimental
-
-The exporter is in beta/experimental state and field names are **very likely to change** and features may change or get removed!
-
 ## Features
 
 - MongoDB Server Status metrics (*cursors, operations, indexes, storage, etc*)
@@ -76,10 +71,9 @@ Point the process to any mongo port and it will detect if it is a mongos, replic
 ## Roadmap
 
 - Document more configurations options here
-- Stabilize RocksDB and WiredTiger support (*currently beta/experimental*)
+- Stabilize RocksDB and WiredTiger support
 - Move MongoDB user/password/authdb to a file (for security)
 - Write more go tests
-- Version scheme
 
 
 ## Submitting Bug Reports

VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

collector/mongod/oplog_status.go

@@ -146,7 +146,7 @@ func GetOplogStatus(session *mgo.Session) *OplogStatus {
 	collectionStats, err := GetOplogCollectionStats(session)
 	oplogTimestamps, err := GetOplogTimestamps(session)
 	if err != nil {
-		log.Error("Failed to get oplog status.")
+		log.Errorf("Failed to get oplog status: %s", err)
 		return nil
 	}
 

collector/mongod/replset_status.go

@@ -267,7 +267,7 @@ func GetReplSetStatus(session *mgo.Session) *ReplSetStatus {
 	result := &ReplSetStatus{}
 	err := session.DB("admin").Run(bson.D{{"replSetGetStatus", 1}}, result)
 	if err != nil {
-		log.Error("Failed to get replSet status.")
+		log.Errorf("Failed to get replSet status: %s", err)
 		return nil
 	}
 	return result

collector/mongod/server_status.go

@@ -221,7 +221,7 @@ func GetServerStatus(session *mgo.Session) *ServerStatus {
 	result := &ServerStatus{}
 	err := session.DB("admin").Run(bson.D{{"serverStatus", 1}, {"recordStats", 0}}, result)
 	if err != nil {
-		log.Error("Failed to get server status.")
+		log.Errorf("Failed to get server status: %s", err)
 		return nil
 	}
 

collector/mongos/server_status.go

@@ -137,7 +137,7 @@ func GetServerStatus(session *mgo.Session) *ServerStatus {
 	result := &ServerStatus{}
 	err := session.DB("admin").Run(bson.D{{"serverStatus", 1}, {"recordStats", 0}}, result)
 	if err != nil {
-		log.Error("Failed to get server status.")
+		log.Errorf("Failed to get server status: %s", err)
 		return nil
 	}