storage/remote: add tests for config changes

Signed-off-by: Simon Pasquier <spasquie@redhat.com>

storage/remote/storage_test.go

@@ -51,7 +51,7 @@ func TestStorageLifecycle(t *testing.T) {
 		},
 	}
 
-	s.ApplyConfig(conf)
+	testutil.Ok(t, s.ApplyConfig(conf))
 
 	// make sure remote write has a queue.
 	testutil.Equals(t, 1, len(s.rws.queues))
@@ -73,13 +73,13 @@ func TestUpdateRemoteReadConfigs(t *testing.T) {
 	conf := &config.Config{
 		GlobalConfig: config.GlobalConfig{},
 	}
-	s.ApplyConfig(conf)
+	testutil.Ok(t, s.ApplyConfig(conf))
 	testutil.Equals(t, 0, len(s.queryables))
 
 	conf.RemoteReadConfigs = []*config.RemoteReadConfig{
 		&config.DefaultRemoteReadConfig,
 	}
-	s.ApplyConfig(conf)
+	testutil.Ok(t, s.ApplyConfig(conf))
 	testutil.Equals(t, 1, len(s.queryables))
 
 	err = s.Close()

storage/remote/write_test.go

@@ -24,6 +24,7 @@ import (
 	"github.com/prometheus/common/model"
 	"github.com/prometheus/prometheus/config"
 	"github.com/prometheus/prometheus/pkg/labels"
+	"github.com/prometheus/prometheus/pkg/relabel"
 	"github.com/prometheus/prometheus/util/testutil"
 )
 
@@ -247,10 +248,18 @@ func TestWriteStorageApplyConfigsPartialUpdate(t *testing.T) {
 	c0 := &config.RemoteWriteConfig{
 		RemoteTimeout: model.Duration(10 * time.Second),
 		QueueConfig:   config.DefaultQueueConfig,
+		WriteRelabelConfigs: []*relabel.Config{
+			&relabel.Config{
+				Regex: relabel.MustNewRegexp(".+"),
+			},
+		},
 	}
 	c1 := &config.RemoteWriteConfig{
 		RemoteTimeout: model.Duration(20 * time.Second),
 		QueueConfig:   config.DefaultQueueConfig,
+		HTTPClientConfig: config_util.HTTPClientConfig{
+			BearerToken: "foo",
+		},
 	}
 	c2 := &config.RemoteWriteConfig{
 		RemoteTimeout: model.Duration(30 * time.Second),
@@ -262,43 +271,58 @@ func TestWriteStorageApplyConfigsPartialUpdate(t *testing.T) {
 		RemoteWriteConfigs: []*config.RemoteWriteConfig{c0, c1, c2},
 	}
 	// We need to set URL's so that metric creation doesn't panic.
-	conf.RemoteWriteConfigs[0].URL = &common_config.URL{
+	for i := range conf.RemoteWriteConfigs {
-		URL: &url.URL{
+		conf.RemoteWriteConfigs[i].URL = &common_config.URL{
-			Host: "http://test-storage.com",
+			URL: &url.URL{
-		},
+				Host: "http://test-storage.com",
+			},
+		}
 	}
-	conf.RemoteWriteConfigs[1].URL = &common_config.URL{
+	testutil.Ok(t, s.ApplyConfig(conf))
-		URL: &url.URL{
-			Host: "http://test-storage.com",
-		},
-	}
-	conf.RemoteWriteConfigs[2].URL = &common_config.URL{
-		URL: &url.URL{
-			Host: "http://test-storage.com",
-		},
-	}
-	s.ApplyConfig(conf)
 	testutil.Equals(t, 3, len(s.queues))
 
-	c0Hash, err := toHash(c0)
+	hashes := make([]string, len(conf.RemoteWriteConfigs))
-	testutil.Ok(t, err)
+	storeHashes := func() {
-	c1Hash, err := toHash(c1)
+		for i := range conf.RemoteWriteConfigs {
-	testutil.Ok(t, err)
+			hash, err := toHash(conf.RemoteWriteConfigs[i])
-	// q := s.queues[1]
+			testutil.Ok(t, err)
+			hashes[i] = hash
+		}
+	}
 
+	storeHashes()
 	// Update c0 and c2.
-	c0.RemoteTimeout = model.Duration(40 * time.Second)
+	c0.WriteRelabelConfigs[0] = &relabel.Config{Regex: relabel.MustNewRegexp("foo")}
 	c2.RemoteTimeout = model.Duration(50 * time.Second)
 	conf = &config.Config{
 		GlobalConfig:       config.GlobalConfig{},
 		RemoteWriteConfigs: []*config.RemoteWriteConfig{c0, c1, c2},
 	}
-	s.ApplyConfig(conf)
+	testutil.Ok(t, s.ApplyConfig(conf))
 	testutil.Equals(t, 3, len(s.queues))
 
-	_, hashExists := s.queues[c1Hash]
+	_, hashExists := s.queues[hashes[0]]
+	testutil.Assert(t, !hashExists, "The queue for the first remote write configuration should have been restarted because the relabel configuration has changed.")
+	_, hashExists = s.queues[hashes[1]]
+	testutil.Assert(t, hashExists, "Pointer of unchanged queue should have remained the same")
+	_, hashExists = s.queues[hashes[2]]
+	testutil.Assert(t, !hashExists, "The queue for the third remote write configuration should have been restarted because the timeout has changed.")
+
+	storeHashes()
+	// Update c1.
+	c1.HTTPClientConfig.BearerToken = "bar"
+	err = s.ApplyConfig(conf)
+	testutil.Ok(t, err)
+	testutil.Equals(t, 3, len(s.queues))
+
+	_, hashExists = s.queues[hashes[0]]
+	testutil.Assert(t, hashExists, "Pointer of unchanged queue should have remained the same")
+	_, hashExists = s.queues[hashes[1]]
+	testutil.Assert(t, !hashExists, "The queue for the second remote write configuration should have been restarted because the HTTP configuration has changed.")
+	_, hashExists = s.queues[hashes[2]]
 	testutil.Assert(t, hashExists, "Pointer of unchanged queue should have remained the same")
 
+	storeHashes()
 	// Delete c0.
 	conf = &config.Config{
 		GlobalConfig:       config.GlobalConfig{},
@@ -307,8 +331,12 @@ func TestWriteStorageApplyConfigsPartialUpdate(t *testing.T) {
 	s.ApplyConfig(conf)
 	testutil.Equals(t, 2, len(s.queues))
 
-	_, hashExists = s.queues[c0Hash]
+	_, hashExists = s.queues[hashes[0]]
 	testutil.Assert(t, !hashExists, "If the index changed, the queue should be stopped and recreated.")
+	_, hashExists = s.queues[hashes[1]]
+	testutil.Assert(t, hashExists, "Pointer of unchanged queue should have remained the same")
+	_, hashExists = s.queues[hashes[2]]
+	testutil.Assert(t, hashExists, "Pointer of unchanged queue should have remained the same")
 
 	err = s.Close()
 	testutil.Ok(t, err)