Merge v0.18.2 to main

CHANGELOG.md

@@ -39,6 +39,10 @@
   `backend: logs_instance`. (@rfratto)
 
 
+# v0.18.2 (2021-08-12)
+
+- [BUGFIX] Honor the prefix and remove prefix from consul list results (@mattdurham)
+
 # v0.18.1 (2021-08-09)
 
 - [BUGFIX] Reduce number of consul calls when ran in scrape service mode (@mattdurham)

docs/operator/getting-started.md

@@ -62,7 +62,7 @@ spec:
       serviceAccountName: grafana-agent-operator
       containers:
       - name: operator
-        image: grafana/agent-operator:v0.18.1
+        image: grafana/agent-operator:v0.18.2
 ---
 
 apiVersion: v1

pkg/operator/defaults.go

@@ -10,6 +10,7 @@ var (
 		"v0.17.0",
 		"v0.18.0",
 		"v0.18.1",
+		"v0.18.2",
 
 		// NOTE(rfratto): when performing an upgrade, add the newest version above instead of changing the existing reference.
 	}

pkg/prom/instance/configstore/remote.go

@@ -10,8 +10,6 @@ import (
 
 	"github.com/weaveworks/common/instrument"
 
-	"github.com/cortexproject/cortex/pkg/ring/kv/consul"
-
 	"github.com/hashicorp/go-cleanhttp"
 
 	"github.com/hashicorp/consul/api"
@@ -59,8 +57,8 @@ type Remote struct {
 // consul kv stores
 type agentRemoteClient struct {
 	kv.Client
-	consul       *api.Client
-	consulConfig consul.Config
+	consul *api.Client
+	config kv.Config
 }
 
 // NewRemote creates a new Remote store that uses a Key-Value client to store
@@ -102,7 +100,7 @@ func (r *Remote) ApplyConfig(cfg kv.Config, enable bool) error {
 	r.reg.UnregisterAll()
 
 	if !enable {
-		r.setClient(nil, nil)
+		r.setClient(nil, nil, kv.Config{})
 		return nil
 	}
 
@@ -129,19 +127,20 @@ func (r *Remote) ApplyConfig(cfg kv.Config, enable bool) error {
 		return fmt.Errorf("failed to create kv client: %w", err)
 	}
 
-	r.setClient(cli, consulClient)
+	r.setClient(cli, consulClient, cfg)
 	return nil
 }
 
 // setClient sets the active client and notifies run to restart the
 // kv watcher.
-func (r *Remote) setClient(client kv.Client, consulClient *api.Client) {
+func (r *Remote) setClient(client kv.Client, consulClient *api.Client, config kv.Config) {
 	if client == nil && consulClient == nil {
 		r.kv = nil
 	} else {
 		r.kv = &agentRemoteClient{
 			Client: client,
 			consul: consulClient,
+			config: config,
 		}
 	}
 	r.reloadKV <- struct{}{}
@@ -227,14 +226,13 @@ func (r *Remote) listConsul(ctx context.Context) (api.KVPairs, error) {
 
 	var pairs api.KVPairs
 	options := &api.QueryOptions{
-		AllowStale:        !r.kv.consulConfig.ConsistentReads,
-		RequireConsistent: r.kv.consulConfig.ConsistentReads,
+		AllowStale:        !r.kv.config.Consul.ConsistentReads,
+		RequireConsistent: r.kv.config.Consul.ConsistentReads,
 	}
 	// This is copied from cortex list so that stats stay the same
 	err := instrument.CollectedRequest(ctx, "List", consulRequestDuration, instrument.ErrorCode, func(ctx context.Context) error {
 		var err error
-		// This mirrors the default prefix in cortex
-		pairs, _, err = r.kv.consul.KV().List("configurations/", options.WithContext(ctx))
+		pairs, _, err = r.kv.consul.KV().List(r.kv.config.Prefix, options.WithContext(ctx))
 		return err
 	})
 
@@ -246,6 +244,9 @@ func (r *Remote) listConsul(ctx context.Context) (api.KVPairs, error) {
 		blankPairs := make(api.KVPairs, 0)
 		return blankPairs, nil
 	}
+	for _, kvp := range pairs {
+		kvp.Key = strings.TrimPrefix(kvp.Key, r.kv.config.Prefix)
+	}
 	return pairs, nil
 }
 

production/README.md

@@ -26,7 +26,7 @@ directory on your host that you want the agent to store its WAL.
 docker run \
   -v /tmp/agent:/etc/agent/data \
   -v /path/to/config.yaml:/etc/agent/agent.yaml \
-  grafana/agent:v0.18.1
+  grafana/agent:v0.18.2
 ```
 
 ## Running the Agent locally

production/grafanacloud-install.sh

@@ -47,7 +47,7 @@ PACKAGE_SYSTEM=${PACKAGE_SYSTEM:=}
 #
 # Global constants.
 #
-RELEASE_VERSION="0.18.1"
+RELEASE_VERSION="0.18.2"
 
 RELEASE_URL="https://github.com/grafana/agent/releases/download/v${RELEASE_VERSION}"
 DEB_URL="${RELEASE_URL}/grafana-agent-${RELEASE_VERSION}-1.${ARCH}.deb"

production/kubernetes/agent-bare.yaml

@@ -66,7 +66,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: grafana/agent:v0.18.1
+        image: grafana/agent:v0.18.2
         imagePullPolicy: IfNotPresent
         name: agent
         ports:

production/kubernetes/agent-loki.yaml

@@ -64,7 +64,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: grafana/agent:v0.18.1
+        image: grafana/agent:v0.18.2
         imagePullPolicy: IfNotPresent
         name: agent
         ports:

production/kubernetes/agent-tempo.yaml

@@ -109,7 +109,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        image: grafana/agent:v0.18.1
+        image: grafana/agent:v0.18.2
         imagePullPolicy: IfNotPresent
         name: agent
         ports:

production/kubernetes/build/lib/version.libsonnet

@@ -1 +1 @@
-'grafana/agent:v0.18.1'
+'grafana/agent:v0.18.2'

production/kubernetes/install-bare.sh

@@ -25,7 +25,7 @@ check_installed() {
 check_installed curl
 check_installed envsubst
 
-MANIFEST_BRANCH=v0.18.1
+MANIFEST_BRANCH=v0.18.2
 MANIFEST_URL=${MANIFEST_URL:-https://raw.githubusercontent.com/grafana/agent/${MANIFEST_BRANCH}/production/kubernetes/agent-bare.yaml}
 NAMESPACE=${NAMESPACE:-default}
 

production/tanka/grafana-agent/v1/main.libsonnet

@@ -15,8 +15,8 @@ local service = k.core.v1.service;
 (import './lib/tempo.libsonnet') +
 {
   _images:: {
-    agent: 'grafana/agent:v0.18.1',
-    agentctl: 'grafana/agentctl:v0.18.1',
+    agent: 'grafana/agent:v0.18.2',
+    agentctl: 'grafana/agentctl:v0.18.2',
   },
 
   // new creates a new DaemonSet deployment of the grafana-agent. By default,