Get patch v0.26.1 ready (#1931)

* Update windows certificate store so that the client certificate is no longer needer in certificate store (#1905) * Update windows certificate store so that the client certificate is not needed in the store. * Update capitalization * Add note that tls certificate is breaking change * move note around * operator/config: fix label used when targetPort is set in ServiceMonitor (#1925) * Use opt-out flag for ebpf_exporter when building release artifacts (#1929) Signed-off-by: Paschalis Tsilias <[email protected]> * Update changelog * Update changelog * Update version numbers * remove duplicated change in changelog Co-authored-by: Robert Fratto <[email protected]> Co-authored-by: Paschalis Tsilias <[email protected]>
grafana · Jul 25, 2022 · 2b88be3 · 2b88be3
1 parent bb7473b
commit 2b88be3
Show file tree

Hide file tree

Showing 22 changed files with 128 additions and 168 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,24 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
+
+v0.26.1 (2022-07-25)
+-------------------------
+
+> **BREAKING CHANGES**: This release has breaking changes. Please read entries
+> carefully and consult the [upgrade guide][] for specific instructions.
+
+### Breaking changes
+
+- Change windows certificate store so client certificate is no longer required in store. (@mattdurham)
+
+### Bugfixes
+
+- Operator: Fix issue where configured `targetPort` ServiceMonitors resulted in
+  generating an incorrect scrape_config. (@rfratto)
+
+- Build the Linux/AMD64 artifacts using the opt-out flag for the ebpf_exporter. (@tpaschalis)
+
 v0.26.0 (2022-07-18)
 -------------------------
 
@@ -35,7 +53,7 @@ v0.26.0 (2022-07-18)
 ### Bugfixes
 
 - Relative symlinks for promtail now work as expected. (@RangerCD, @mukerjee)
- 
+
 - Fix rate limiting implementation for the app agent receiver integration. (@domasx2)
 
 - Fix mongodb exporter so that it now collects all metrics. (@mattdurham)
@@ -90,13 +108,11 @@ v0.25.0 (2022-06-06)
 
 - `extra-scrape-metrics` can now be enabled with the `--enable-features=extra-scrape-metrics` feature flag. See https://prometheus.io/docs/prometheus/2.31/feature_flags/#extra-scrape-metrics for details. (@rlankfo)
 
-
 - Resolved issue in v2 integrations where if an instance name was a prefix of another the route handler would fail to
   match requests on the longer name (@mattdurham)
 
 - Set `include_metadata` to true by default for OTLP traces receivers (@mapno)
 
-
 ### Bugfixes
 
 - Scraping service was not honoring the new server grpc flags `server.grpc.address`.  (@mattdurham)

diff --git a/Makefile b/Makefile
@@ -294,6 +294,9 @@ dist: dist-agent dist-agentctl dist-packages
 ####################
 
 dist-agent: seego dist/agent-linux-amd64 dist/agent-linux-arm64 dist/agent-linux-armv6 dist/agent-linux-armv7 dist/agent-linux-ppc64le dist/agent-darwin-amd64 dist/agent-darwin-arm64 dist/agent-windows-amd64.exe dist/agent-freebsd-amd64 dist/agent-windows-installer.exe
+
+# Override CGO_FLAGS to add the noebpf build tag in linux/amd64 builds
+dist/agent-linux-amd64: CGO_FLAGS := -ldflags "-s -w $(GO_LDFLAGS)" -tags "netgo noebpf" $(GOFLAGS)
 dist/agent-linux-amd64: seego
 	$(call SetBuildVarsConditional,linux/amd64) ;      $(seego) build $(CGO_FLAGS) -o $@ ./cmd/agent
 
@@ -341,6 +344,8 @@ dist/agent-freebsd-amd64: seego
 
 dist-agentctl: seego dist/agentctl-linux-amd64 dist/agentctl-linux-arm64 dist/agentctl-linux-armv6 dist/agentctl-linux-armv7 dist/agentctl-darwin-amd64 dist/agentctl-darwin-arm64 dist/agentctl-windows-amd64.exe dist/agentctl-freebsd-amd64
 
+# Override CGO_FLAGS to add the noebpf build tag in linux/amd64 builds
+dist/agentctl-linux-amd64: CGO_FLAGS := -ldflags "-s -w $(GO_LDFLAGS)" -tags "netgo noebpf" $(GOFLAGS)
 dist/agentctl-linux-amd64: seego
 	$(call SetBuildVarsConditional,linux/amd64);    $(seego) build $(CGO_FLAGS) -o $@ ./cmd/agentctl
 

diff --git a/docs/sources/configuration/integrations/node-exporter-config.md b/docs/sources/configuration/integrations/node-exporter-config.md
@@ -28,7 +28,7 @@ docker run \
   -v "/proc:/host/proc:ro,rslave" \
   -v /tmp/agent:/etc/agent \
   -v /path/to/config.yaml:/etc/agent-config/agent.yaml \
-  grafana/agent:v0.26.0 \
+  grafana/agent:v0.26.1 \
   --config.file=/etc/agent-config/agent.yaml
 ```
 
@@ -67,7 +67,7 @@ metadata:
   name: agent
 spec:
   containers:
-  - image: grafana/agent:v0.26.0
+  - image: grafana/agent:v0.26.1
     name: agent
     args:
     - --config.file=/etc/agent-config/agent.yaml

diff --git a/docs/sources/configuration/integrations/process-exporter-config.md b/docs/sources/configuration/integrations/process-exporter-config.md
@@ -20,7 +20,7 @@ docker run \
   -v "/proc:/proc:ro" \
   -v /tmp/agent:/etc/agent \
   -v /path/to/config.yaml:/etc/agent-config/agent.yaml \
-  grafana/agent:v0.26.0 \
+  grafana/agent:v0.26.1 \
   --config.file=/etc/agent-config/agent.yaml
 ```
 
@@ -37,7 +37,7 @@ metadata:
   name: agent
 spec:
   containers:
-  - image: grafana/agent:v0.26.0
+  - image: grafana/agent:v0.26.1
     name: agent
     args:
     - --config.file=/etc/agent-config/agent.yaml

diff --git a/docs/sources/configuration/server-config.md b/docs/sources/configuration/server-config.md
@@ -76,12 +76,6 @@ server: <windows_server_config>
 ### windows_client_config
 
 ```yaml
-# Name of the system store to look for the Client Certificate ex LocalMachine, CurrentUser 
-system_store: <string>
-
-# Name of the store to look for the Client Certificate ex My, CA
-store: <string>
-
 # Array of issuer common names to check against
 issuer_common_names:
   [- <string> ... ]

diff --git a/docs/sources/operator/custom-resource-quickstart.md b/docs/sources/operator/custom-resource-quickstart.md
@@ -45,7 +45,7 @@ metadata:
   labels:
     app: grafana-agent
 spec:
-  image: grafana/agent:v0.26.0
+  image: grafana/agent:v0.26.1
   logLevel: info
   serviceAccountName: grafana-agent
   metrics:

diff --git a/docs/sources/operator/getting-started.md b/docs/sources/operator/getting-started.md
@@ -74,7 +74,7 @@ spec:
       serviceAccountName: grafana-agent-operator
       containers:
       - name: operator
-        image: grafana/agent-operator:v0.26.0
+        image: grafana/agent-operator:v0.26.1
         args:
         - --kubelet-service=default/kubelet
 ---

diff --git a/docs/sources/set-up/install-agent-docker.md b/docs/sources/set-up/install-agent-docker.md
@@ -21,7 +21,7 @@ Install Grafana Agent and get it up and running on Docker.
 docker run \
   -v /tmp/agent:/etc/agent/data \
   -v /path/to/config.yaml:/etc/agent/agent.yaml \
-  grafana/agent:v0.26.0
+  grafana/agent:v0.26.1
 ```
 
 2.  Replace `/tmp/agent` with the folder you want to store WAL data in.

diff --git a/pkg/operator/config/templates/component/metrics/service_monitor.libsonnet b/pkg/operator/config/templates/component/metrics/service_monitor.libsonnet
@@ -131,7 +131,7 @@ function(
         action: 'keep',
       } else if endpoint.TargetPort != null then (
         if endpoint.TargetPort.StrVal != '' then {
-          source_labels: ['__meta_kubernetes_pod_container_name'],
+          source_labels: ['__meta_kubernetes_pod_container_port_name'],
           regex: endpoint.TargetPort.StrVal,
           action: 'keep',
         } else if endpoint.TargetPort.IntVal != 0 then {

diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go
@@ -27,6 +27,7 @@ var (
 		"v0.25.0",
 		"v0.25.1",
 		"v0.26.0",
+		"v0.26.1",
 
 		// NOTE(rfratto): when performing an upgrade, add the newest version above instead of changing the existing reference.
 	}

diff --git a/pkg/server/tls.go b/pkg/server/tls.go
@@ -36,8 +36,6 @@ type WindowsCertificateFilter struct {
 
 // WindowsClientFilter is used to select a client root CA certificate
 type WindowsClientFilter struct {
-	Store             string   `yaml:"store,omitempty"`
-	SystemStore       string   `yaml:"system_store,omitempty"`
 	IssuerCommonNames []string `yaml:"issuer_common_names,omitempty"`
 	SubjectRegEx      string   `yaml:"subject_regex,omitempty"`
 	TemplateID        string   `yaml:"template_id,omitempty"`