Merge the 2.13 release branch to master (#6117)

CHANGELOG.md

@@ -1,6 +1,8 @@
-## 2.13.0-rc.0 / 2019-09-25
+## 2.13.0 / 2019-10-04
 
+* [SECURITY/BUGFIX] UI: Fix a Stored DOM XSS vulnerability with query history [CVE-2019-10215](http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-10215). #6098
 * [CHANGE] Metrics: renamed prometheus_sd_configs_failed_total to prometheus_sd_failed_configs and changed to Gauge #5254
+* [ENHANCEMENT] Include the tsdb tool in builds. #6089
 * [ENHANCEMENT] Service discovery: add new node address types for kubernetes. #5902
 * [ENHANCEMENT] UI: show warnings if query have returned some warnings. #5964
 * [ENHANCEMENT] Remote write: reduce memory usage of the series cache. #5849

VERSION

@@ -1 +1 @@
-2.13.0-rc.0
+2.13.0

storage/remote/ewma.go

@@ -21,7 +21,10 @@ import (
 
 // ewmaRate tracks an exponentially weighted moving average of a per-second rate.
 type ewmaRate struct {
+	// Keep all 64bit atomically accessed variables at the top of this struct.
+	// See https://golang.org/pkg/sync/atomic/#pkg-note-BUG for more info.
 	newEvents int64
+
 	alpha    float64
 	interval time.Duration
 	lastRate float64

storage/remote/intern.go

@@ -40,8 +40,11 @@ type pool struct {
 }
 
 type entry struct {
-	s    string
+	// Keep all 64bit atomically accessed variables at the top of this struct.
+	// See https://golang.org/pkg/sync/atomic/#pkg-note-BUG for more info.
 	refs int64
+
+	s string
 }
 
 func newPool() *pool {

tsdb/db.go

@@ -216,7 +216,7 @@ func newDBMetrics(db *DB, r prometheus.Registerer) *dbMetrics {
 		db.mtx.RLock()
 		defer db.mtx.RUnlock()
 		if len(db.blocks) == 0 {
-			return float64(db.head.minTime)
+			return float64(db.head.MinTime())
 		}
 		return float64(db.blocks[0].meta.MinTime)
 	})

tsdb/head.go

@@ -61,18 +61,20 @@ var (
 
 // Head handles reads and writes of time series data within a time window.
 type Head struct {
+	// Keep all 64bit atomically accessed variables at the top of this struct.
+	// See https://golang.org/pkg/sync/atomic/#pkg-note-BUG for more info.
 	chunkRange       int64
+	numSeries        uint64
+	minTime, maxTime int64 // Current min and max of the samples included in the head.
+	minValidTime     int64 // Mint allowed to be added to the head. It shouldn't be lower than the maxt of the last persisted block.
+	lastSeriesID     uint64
+
 	metrics    *headMetrics
 	wal        *wal.WAL
 	logger     log.Logger
 	appendPool sync.Pool
 	seriesPool sync.Pool
 	bytesPool  sync.Pool
-	numSeries  uint64
-
-	minTime, maxTime int64 // Current min and max of the samples included in the head.
-	minValidTime     int64 // Mint allowed to be added to the head. It shouldn't be lower than the maxt of the last persisted block.
-	lastSeriesID     uint64
 
 	// All series addressable by their ID or hash.
 	series *stripeSeries