From 0cc401cbe2b293fbdc458201b7b342b0b130d56f Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Tue, 14 Sep 2021 09:58:17 -0400 Subject: [PATCH 1/2] prepare for 0.18.4 release --- CHANGELOG.md | 14 ++++++++------ .../integrations/node-exporter-config.md | 4 ++-- .../integrations/process-exporter-config.md | 4 ++-- docs/getting-started/_index.md | 2 +- docs/operator/getting-started.md | 4 ++-- pkg/operator/defaults.go | 1 + production/README.md | 2 +- production/grafanacloud-install.sh | 2 +- production/kubernetes/agent-bare.yaml | 2 +- production/kubernetes/agent-loki.yaml | 2 +- production/kubernetes/agent-tempo.yaml | 2 +- production/kubernetes/build/lib/version.libsonnet | 2 +- production/kubernetes/install-bare.sh | 2 +- production/tanka/grafana-agent/v1/main.libsonnet | 4 ++-- .../tanka/grafana-agent/v2/internal/base.libsonnet | 4 ++-- .../grafana-agent/v2/internal/syncer.libsonnet | 2 +- 16 files changed, 28 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1da0f7eee432..e0b71df42310 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,9 +56,6 @@ for specific instructions. - [BUGFIX] Fix yaml marshalling tag for cert_file in kafka exporter agent config. (@rgeyer) -- [BUGFIX] Scraping service: Ensure that a reshard is scheduled every reshard - interval. (@rfratto) - - [CHANGE] Breaking change: reduced verbosity of tracing autologging by not logging `STATUS_CODE_UNSET` status codes. (@mapno) @@ -72,9 +69,6 @@ for specific instructions. - [CHANGE] Breaking change: `prom_instance` in the spanmetrics config is now named `metrics_instance`. (@rfratto) -- [CHANGE] Add `agent_prometheus_configs_changed_total` metric to track instance - config events. (@rfratto) - - [DEPRECATION] The `loki` key at the root of the config file has been deprecated in favor of `logs`. `loki`-named fields in `automatic_logging` have been renamed accordinly: `loki_name` is now `logs_instance_name`, @@ -86,6 +80,14 @@ for specific instructions. also been deprecated in favor of the same flags with the `metrics.` prefix. (@rfratto) +# v0.18.4 (2021-09-14) + +- [BUGFIX] Scraping service: Ensure that a reshard is scheduled every reshard + interval. (@rfratto) + +- [CHANGE] Add `agent_prometheus_configs_changed_total` metric to track instance + config events. (@rfratto) + # v0.18.3 (2021-09-08) - [BUGFIX] Register missing metric for configstore consul request duration. diff --git a/docs/configuration/integrations/node-exporter-config.md b/docs/configuration/integrations/node-exporter-config.md index 8fc42d2d9805..4915c17e6985 100644 --- a/docs/configuration/integrations/node-exporter-config.md +++ b/docs/configuration/integrations/node-exporter-config.md @@ -26,7 +26,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.18.3 \ + grafana/agent:v0.18.4 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -66,7 +66,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.18.3 + - image: grafana/agent:v0.18.4 name: agent args: - --config.file=/etc/agent-config/agent.yaml diff --git a/docs/configuration/integrations/process-exporter-config.md b/docs/configuration/integrations/process-exporter-config.md index 3d6295ed7560..dafab5686449 100644 --- a/docs/configuration/integrations/process-exporter-config.md +++ b/docs/configuration/integrations/process-exporter-config.md @@ -18,7 +18,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.18.3 \ + grafana/agent:v0.18.4 \ --config.file=/etc/agent-config/agent.yaml ``` @@ -35,7 +35,7 @@ metadata: name: agent spec: containers: - - image: grafana/agent:v0.18.3 + - image: grafana/agent:v0.18.4 name: agent args: - --config.file=/etc/agent-config/agent.yaml diff --git a/docs/getting-started/_index.md b/docs/getting-started/_index.md index 487fa22c0ac5..553827018782 100644 --- a/docs/getting-started/_index.md +++ b/docs/getting-started/_index.md @@ -24,7 +24,7 @@ Currently, there are six ways to install the agent: docker run \ -v /tmp/agent:/etc/agent/data \ -v /path/to/config.yaml:/etc/agent/agent.yaml \ - grafana/agent:v0.18.3 + grafana/agent:v0.18.4 ``` Replace `/tmp/agent` with the folder you wish to store WAL data in. WAL data is diff --git a/docs/operator/getting-started.md b/docs/operator/getting-started.md index 58b9b357adba..fc5dc1129a36 100644 --- a/docs/operator/getting-started.md +++ b/docs/operator/getting-started.md @@ -62,7 +62,7 @@ spec: serviceAccountName: grafana-agent-operator containers: - name: operator - image: grafana/agent-operator:v0.18.3 + image: grafana/agent-operator:v0.18.4 --- apiVersion: v1 @@ -156,7 +156,7 @@ metadata: labels: app: grafana-agent spec: - image: grafana/agent:v0.18.3 + image: grafana/agent:v0.18.4 logLevel: info serviceAccountName: grafana-agent metrics: diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go index 8b8383dcfa2f..2f0590695252 100644 --- a/pkg/operator/defaults.go +++ b/pkg/operator/defaults.go @@ -12,6 +12,7 @@ var ( "v0.18.1", "v0.18.2", "v0.18.3", + "v0.18.4", // NOTE(rfratto): when performing an upgrade, add the newest version above instead of changing the existing reference. } diff --git a/production/README.md b/production/README.md index 4d9e83310b2b..50eb824fef50 100644 --- a/production/README.md +++ b/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.3 + grafana/agent:v0.18.4 ``` ## Running the Agent locally diff --git a/production/grafanacloud-install.sh b/production/grafanacloud-install.sh index 484ad9d25e5f..88e4751e44d8 100755 --- a/production/grafanacloud-install.sh +++ b/production/grafanacloud-install.sh @@ -48,7 +48,7 @@ PACKAGE_SYSTEM=${PACKAGE_SYSTEM:=} # # Global constants. # -RELEASE_VERSION="0.18.3" +RELEASE_VERSION="0.18.4" RELEASE_URL="https://github.com/grafana/agent/releases/download/v${RELEASE_VERSION}" DEB_URL="${RELEASE_URL}/grafana-agent-${RELEASE_VERSION}-1.${ARCH}.deb" diff --git a/production/kubernetes/agent-bare.yaml b/production/kubernetes/agent-bare.yaml index e4eaaeaf3d8a..5df016d7b7fe 100644 --- a/production/kubernetes/agent-bare.yaml +++ b/production/kubernetes/agent-bare.yaml @@ -66,7 +66,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.18.3 + image: grafana/agent:v0.18.4 imagePullPolicy: IfNotPresent name: agent ports: diff --git a/production/kubernetes/agent-loki.yaml b/production/kubernetes/agent-loki.yaml index 79a28c3f473d..c443d4edf6b2 100644 --- a/production/kubernetes/agent-loki.yaml +++ b/production/kubernetes/agent-loki.yaml @@ -64,7 +64,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.18.3 + image: grafana/agent:v0.18.4 imagePullPolicy: IfNotPresent name: agent ports: diff --git a/production/kubernetes/agent-tempo.yaml b/production/kubernetes/agent-tempo.yaml index 491e1147b79e..3a6bcf5ab87f 100644 --- a/production/kubernetes/agent-tempo.yaml +++ b/production/kubernetes/agent-tempo.yaml @@ -109,7 +109,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: grafana/agent:v0.18.3 + image: grafana/agent:v0.18.4 imagePullPolicy: IfNotPresent name: agent ports: diff --git a/production/kubernetes/build/lib/version.libsonnet b/production/kubernetes/build/lib/version.libsonnet index 426899694e1a..f705aa43c850 100644 --- a/production/kubernetes/build/lib/version.libsonnet +++ b/production/kubernetes/build/lib/version.libsonnet @@ -1 +1 @@ -'grafana/agent:v0.18.3' +'grafana/agent:v0.18.4' diff --git a/production/kubernetes/install-bare.sh b/production/kubernetes/install-bare.sh index bc1499aa0186..cd69ba80729c 100644 --- a/production/kubernetes/install-bare.sh +++ b/production/kubernetes/install-bare.sh @@ -25,7 +25,7 @@ check_installed() { check_installed curl check_installed envsubst -MANIFEST_BRANCH=v0.18.3 +MANIFEST_BRANCH=v0.18.4 MANIFEST_URL=${MANIFEST_URL:-https://raw.githubusercontent.com/grafana/agent/${MANIFEST_BRANCH}/production/kubernetes/agent-bare.yaml} NAMESPACE=${NAMESPACE:-default} diff --git a/production/tanka/grafana-agent/v1/main.libsonnet b/production/tanka/grafana-agent/v1/main.libsonnet index b53ab48c5fbd..3c8a898ff063 100644 --- a/production/tanka/grafana-agent/v1/main.libsonnet +++ b/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.3', - agentctl: 'grafana/agentctl:v0.18.3', + agent: 'grafana/agent:v0.18.4', + agentctl: 'grafana/agentctl:v0.18.4', }, // new creates a new DaemonSet deployment of the grafana-agent. By default, diff --git a/production/tanka/grafana-agent/v2/internal/base.libsonnet b/production/tanka/grafana-agent/v2/internal/base.libsonnet index 4514f7d7006b..7723e83a8d9c 100644 --- a/production/tanka/grafana-agent/v2/internal/base.libsonnet +++ b/production/tanka/grafana-agent/v2/internal/base.libsonnet @@ -10,8 +10,8 @@ function(name='grafana-agent', namespace='') { local this = self, _images:: { - agent: 'grafana/agent:v0.18.3', - agentctl: 'grafana/agentctl:v0.18.3', + agent: 'grafana/agent:v0.18.4', + agentctl: 'grafana/agentctl:v0.18.4', }, _config:: { name: name, diff --git a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet index 8ed920efcfc4..e481a1743cba 100644 --- a/production/tanka/grafana-agent/v2/internal/syncer.libsonnet +++ b/production/tanka/grafana-agent/v2/internal/syncer.libsonnet @@ -14,7 +14,7 @@ function( ) { local _config = { api: error 'api must be set', - image: 'grafana/agentctl:v0.18.3', + image: 'grafana/agentctl:v0.18.4', schedule: '*/5 * * * *', configs: [], } + config, From 1aeb62cdbe854f0d68b19df4b5e0a611f16c0d9b Mon Sep 17 00:00:00 2001 From: Robert Fratto Date: Tue, 14 Sep 2021 10:06:49 -0400 Subject: [PATCH 2/2] include #831 --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0b71df42310..1e3c702d22b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,8 +42,6 @@ for specific instructions. - [BUGFIX] Fix collecting filesystem metrics on Mac OS (darwin) in the `node_exporter` integration default config. (@eamonryan) -- [BUGFIX] Fix info logging on windows. (@mattdurham) - - [BUGFIX] Remove v0.0.0 flags during build with no explicit release tag (@mattdurham) - [BUGFIX] Fix issue with global scrape_interval changes not reloading integrations (@kgeckhart) @@ -82,6 +80,8 @@ for specific instructions. # v0.18.4 (2021-09-14) +- [BUGFIX] Fix info logging on windows. (@mattdurham) + - [BUGFIX] Scraping service: Ensure that a reshard is scheduled every reshard interval. (@rfratto)