From c29896215e3407e5aebcc9241eab0c714b526a28 Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Fri, 23 Oct 2020 12:02:31 -0400 Subject: [PATCH] prepare for v0.7.1 release and fix arm binaries (#225) * prepare for v0.7.1 release and fix arm binaries * typo in dist-agentctl --- CHANGELOG.md | 9 +++++++++ Makefile | 4 ++-- docs/configuration-reference.md | 8 ++++---- docs/getting-started.md | 4 ++-- production/README.md | 2 +- production/kubernetes/agent-bare.yaml | 2 +- production/kubernetes/agent-loki.yaml | 2 +- production/kubernetes/agent-tempo.yaml | 2 +- production/kubernetes/agent.yaml | 4 ++-- production/kubernetes/build/lib/version.libsonnet | 2 +- production/kubernetes/install-bare.sh | 2 +- production/kubernetes/install-loki.sh | 2 +- production/kubernetes/install-tempo.sh | 2 +- production/kubernetes/install.sh | 2 +- production/tanka/grafana-agent/v1/main.libsonnet | 4 ++-- 15 files changed, 30 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80e269ca0861..c2c1e6b691af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,15 @@ NOTE: FreeBSD builds will not be included for this release. There is a bug in an upstream library preventing cross-compilation of the Grafana Cloud Agent for this platform. FreeBSD builds will return in a future release. +# v0.7.1 (2020-10-23) + +NOTE: FreeBSD builds will not be included for this release. There is a bug in an +upstream library preventing cross-compilation of the Grafana Cloud Agent for +this platform. FreeBSD builds will return in a future release. + +- [BUGFIX] Fix issue where ARM binaries were not published with the GitHub + release. + # v0.7.0 (2020-10-23) NOTE: FreeBSD builds will not be included for this release. There is a bug in an diff --git a/Makefile b/Makefile index b7edcbe8530d..e38c042dde1b 100644 --- a/Makefile +++ b/Makefile @@ -200,7 +200,7 @@ dist: dist-agent dist-agentctl pushd dist && sha256sum * > SHA256SUMS && popd .PHONY: dist -dist-agent: dist/agent-linux-amd64 dist/agent-darwin-amd64 dist/agent-windows-amd64.exe +dist-agent: dist/agent-linux-amd64 dist/agent-linux-arm64 dist/agent-linux-armv7 dist/agent-darwin-amd64 dist/agent-windows-amd64.exe dist/agent-linux-amd64: @CGO_ENABLED=1 GOOS=linux GOARCH=amd64; $(seego) build $(CGO_FLAGS) -o $@ ./cmd/agent dist/agent-linux-arm64: @@ -212,7 +212,7 @@ dist/agent-darwin-amd64: dist/agent-windows-amd64.exe: @CGO_ENABLED=1 GOOS=windows GOARCH=amd64; $(seego) build $(CGO_FLAGS) -o $@ ./cmd/agent -dist-agentctl: dist/agentctl-linux-amd64 dist/agentctl-darwin-amd64 dist/agentctl-windows-amd64.exe +dist-agentctl: dist/agentctl-linux-amd64 dist/agentctl-linux-arm64 dist/agentctl-linux-armv7 dist/agentctl-darwin-amd64 dist/agentctl-windows-amd64.exe dist/agentctl-linux-amd64: @CGO_ENABLED=1 GOOS=linux GOARCH=amd64; $(seego) build $(CGO_FLAGS) -o $@ ./cmd/agentctl dist/agentctl-linux-arm64: diff --git a/docs/configuration-reference.md b/docs/configuration-reference.md index 9dfdaf71cad9..41249f63da04 100644 --- a/docs/configuration-reference.md +++ b/docs/configuration-reference.md @@ -1601,7 +1601,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.7.0 \ + grafana/agent:v0.7.1 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -1641,7 +1641,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.7.0 + - image: grafana/agent:v0.7.1 name: agent args: - --config.file=/etc/agent-config/agent.yaml @@ -1907,7 +1907,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.7.0 \ + grafana/agent:v0.7.1 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -1924,7 +1924,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.7.0 + - image: grafana/agent:v0.7.1 name: agent args: - --config.file=/etc/agent-config/agent.yaml diff --git a/docs/getting-started.md b/docs/getting-started.md index d33faa9642b8..98ce499589b2 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -46,7 +46,7 @@ Currently, there are five ways to install the agent: ### Docker Container ``` -docker pull grafana/agent:v0.7.0 +docker pull grafana/agent:v0.7.1 ``` ### Kubernetes Install Script @@ -269,7 +269,7 @@ path of your Agent's YAML configuration file. docker run \ -v /tmp/agent:/etc/agent \ -v /path/to/config.yaml:/etc/agent-config/agent.yaml \ - grafana/agent:v0.7.0 + grafana/agent:v0.7.1 ``` ### Locally diff --git a/production/README.md b/production/README.md index c242a1d50061..c2b55e47cf99 100644 --- a/production/README.md +++ b/production/README.md @@ -35,7 +35,7 @@ docker run \ -v /tmp/agent:/etc/agent \ -v /path/to/config.yaml:/etc/agent-config/agent.yaml \ --entrypoint "/bin/agent -config.file=/etc/agent-config/agent.yaml -prometheus.wal-directory=/etc/agent/data" - grafana/agent:v0.7.0 + grafana/agent:v0.7.1 ``` ## Running the Agent locally diff --git a/production/kubernetes/agent-bare.yaml b/production/kubernetes/agent-bare.yaml index e88ae8676fa7..edf22fe9fabb 100644 --- a/production/kubernetes/agent-bare.yaml +++ b/production/kubernetes/agent-bare.yaml @@ -61,7 +61,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.7.0 + image: grafana/agent:v0.7.1 imagePullPolicy: IfNotPresent name: agent ports: diff --git a/production/kubernetes/agent-loki.yaml b/production/kubernetes/agent-loki.yaml index dca482aa7564..08cdc31cdd09 100644 --- a/production/kubernetes/agent-loki.yaml +++ b/production/kubernetes/agent-loki.yaml @@ -322,7 +322,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.7.0 + image: grafana/agent:v0.7.1 imagePullPolicy: IfNotPresent name: agent ports: diff --git a/production/kubernetes/agent-tempo.yaml b/production/kubernetes/agent-tempo.yaml index 13305e43a8c6..4095832dfa03 100644 --- a/production/kubernetes/agent-tempo.yaml +++ b/production/kubernetes/agent-tempo.yaml @@ -163,7 +163,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.7.0 + image: grafana/agent:v0.7.1 imagePullPolicy: IfNotPresent name: agent ports: diff --git a/production/kubernetes/agent.yaml b/production/kubernetes/agent.yaml index 22ef6cb7d518..f1b3736f5003 100644 --- a/production/kubernetes/agent.yaml +++ b/production/kubernetes/agent.yaml @@ -309,7 +309,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.7.0 + image: grafana/agent:v0.7.1 imagePullPolicy: IfNotPresent name: agent ports: @@ -357,7 +357,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.7.0 + image: grafana/agent:v0.7.1 imagePullPolicy: IfNotPresent name: agent ports: diff --git a/production/kubernetes/build/lib/version.libsonnet b/production/kubernetes/build/lib/version.libsonnet index cdedf10d1676..82189ac2290e 100644 --- a/production/kubernetes/build/lib/version.libsonnet +++ b/production/kubernetes/build/lib/version.libsonnet @@ -1 +1 @@ -'grafana/agent:v0.7.0' +'grafana/agent:v0.7.1' diff --git a/production/kubernetes/install-bare.sh b/production/kubernetes/install-bare.sh index dc1f9f5ee7ac..a9b9792c5eb0 100644 --- a/production/kubernetes/install-bare.sh +++ b/production/kubernetes/install-bare.sh @@ -16,7 +16,7 @@ check_installed() { check_installed curl check_installed envsubst -MANIFEST_BRANCH=v0.7.0 +MANIFEST_BRANCH=v0.7.1 MANIFEST_URL=${MANIFEST_URL:-https://raw.githubusercontent.com/grafana/agent/${MANIFEST_BRANCH}/production/kubernetes/agent-bare.yaml} curl -fsSL $MANIFEST_URL | envsubst diff --git a/production/kubernetes/install-loki.sh b/production/kubernetes/install-loki.sh index 372deed01f73..0b0d26c2c3df 100644 --- a/production/kubernetes/install-loki.sh +++ b/production/kubernetes/install-loki.sh @@ -29,7 +29,7 @@ check_installed() { check_installed curl check_installed envsubst -MANIFEST_BRANCH=v0.7.0 +MANIFEST_BRANCH=v0.7.1 MANIFEST_URL=${MANIFEST_URL:-https://raw.githubusercontent.com/grafana/agent/${MANIFEST_BRANCH}/production/kubernetes/agent-loki.yaml} LOKI_USERNAME_SET=0 diff --git a/production/kubernetes/install-tempo.sh b/production/kubernetes/install-tempo.sh index d29c4323fa8b..459b4a7cc9a7 100644 --- a/production/kubernetes/install-tempo.sh +++ b/production/kubernetes/install-tempo.sh @@ -29,7 +29,7 @@ check_installed() { check_installed curl check_installed envsubst -MANIFEST_BRANCH=v0.7.0 +MANIFEST_BRANCH=v0.7.1 MANIFEST_URL=${MANIFEST_URL:-https://raw.githubusercontent.com/grafana/agent/${MANIFEST_BRANCH}/production/kubernetes/agent-tempo.yaml} TEMPO_USERNAME_SET=0 diff --git a/production/kubernetes/install.sh b/production/kubernetes/install.sh index dbae22e205a6..32b30ae2580b 100644 --- a/production/kubernetes/install.sh +++ b/production/kubernetes/install.sh @@ -31,7 +31,7 @@ check_installed() { check_installed curl check_installed envsubst -MANIFEST_BRANCH=v0.7.0 +MANIFEST_BRANCH=v0.7.1 MANIFEST_URL=${MANIFEST_URL:-https://raw.githubusercontent.com/grafana/agent/${MANIFEST_BRANCH}/production/kubernetes/agent.yaml} REMOTE_WRITE_USERNAME_SET=0 diff --git a/production/tanka/grafana-agent/v1/main.libsonnet b/production/tanka/grafana-agent/v1/main.libsonnet index 0064e108ab83..b2a12ba00760 100644 --- a/production/tanka/grafana-agent/v1/main.libsonnet +++ b/production/tanka/grafana-agent/v1/main.libsonnet @@ -14,8 +14,8 @@ local configMap = k.core.v1.configMap; (import './lib/tempo.libsonnet') + { _images:: { - agent: 'grafana/agent:v0.7.0', - agentctl: 'grafana/agentctl:v0.7.0', + agent: 'grafana/agent:v0.7.1', + agentctl: 'grafana/agentctl:v0.7.1', }, // new creates a new DaemonSet deployment of the grafana-agent. By default,