Merge branch 'release-1.2'

josedonizetti · Oct 30, 2016 · 5b16d6b · 5b16d6b
2 parents 04dfd2f + e3d7c39
commit 5b16d6b
Show file tree

Hide file tree

Showing 138 changed files with 16,792 additions and 2,227 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,15 @@ This is a breaking change to the Kubernetes service discovery.
 * [ENHANCEMENT] Add Azure SD metrics.
 * [ENHANCEMENT] Add fuzzy search to `/graph` textarea.
 * [ENHANCEMENT] Always show instance labels on target page.
+
+## 1.2.2 / 2016-10-30
+
 * [BUGFIX] Correctly handle on() in alerts.
+* [BUGFIX] UI: Deal properly with aborted requests.
+* [BUGFIX] UI: Decode URL query parameters properly.
+* [BUGFIX] Storage: Deal better with data corruption (non-monotonic timestamps).
+* [BUGFIX] Remote storage: Re-add accidentally removed timeout flag.
+* [BUGFIX] Updated a number of vendored packages to pick up upstream bug fixes.
 
 ## 1.2.1 / 2016-10-10
 

diff --git a/cmd/prometheus/config.go b/cmd/prometheus/config.go
@@ -213,6 +213,11 @@ func init() {
 		"The name of the database to use for storing samples in InfluxDB.",
 	)
 
+	cfg.fs.DurationVar(
+		&cfg.remote.StorageTimeout, "storage.remote.timeout", 30*time.Second,
+		"The timeout to use when sending samples to the remote storage.",
+	)
+
 	// Alertmanager.
 	cfg.fs.Var(
 		&cfg.alertmanagerURLs, "alertmanager.url",

diff --git a/storage/local/series.go b/storage/local/series.go
@@ -14,6 +14,7 @@
 package local
 
 import (
+	"fmt"
 	"sort"
 	"sync"
 	"time"
@@ -496,6 +497,10 @@ func (s *memorySeries) preloadChunksForRange(
 	if throughIdx == len(s.chunkDescs) {
 		throughIdx--
 	}
+	if fromIdx > throughIdx {
+		// Guard against nonsensical result. The caller will quarantine the series with a meaningful log entry.
+		return nopIter, fmt.Errorf("fromIdx=%d is greater than throughIdx=%d, likely caused by data corruption", fromIdx, throughIdx)
+	}
 
 	pinIndexes := make([]int, 0, throughIdx-fromIdx+1)
 	for i := fromIdx; i <= throughIdx; i++ {

diff --git a/vendor/github.com/golang/protobuf/proto/decode.go b/vendor/github.com/golang/protobuf/proto/decode.go
diff --git a/vendor/github.com/golang/protobuf/proto/encode.go b/vendor/github.com/golang/protobuf/proto/encode.go
diff --git a/vendor/github.com/golang/protobuf/proto/equal.go b/vendor/github.com/golang/protobuf/proto/equal.go