Skip to content

Commit

Permalink
Cherry Pick bugfix into 0.34 (#4046)
Browse files Browse the repository at this point in the history
* Fix issue where the in-memory dialer was not being passed to modules. (#4044)

* Fix issue where the in-memory dialer was not being passed to modules.

* Fix type

* Fix location of changelog

* update references for v0.34.0-rc.1 (#4047)

* fix changelog for 0.34.0-rc.1

---------

Co-authored-by: mattdurham <[email protected]>
  • Loading branch information
captncraig and mattdurham authored Jun 2, 2023
1 parent ba1cd98 commit ea4465d
Show file tree
Hide file tree
Showing 18 changed files with 32 additions and 24 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ 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.34.0-rc.1 (2023-06-02)
--------------------

### Bugs

- Fix issue where using exporters inside modules failed due to not passing the in-memory address dialer. (@mattdurham)

v0.34.0-rc.0 (2023-06-01)
-------------------------

Expand Down
1 change: 1 addition & 0 deletions component/module/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ func NewModuleComponent(o component.Options) *ModuleComponent {
OnExportsChange: func(exports map[string]any) {
o.OnStateChange(Exports{Exports: exports})
},
DialFunc: o.DialFunc,
}),
}
}
Expand Down
4 changes: 2 additions & 2 deletions docs/sources/operator/deploy-agent-operator-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,12 @@ To deploy the `GrafanaAgent` resource:
labels:
app: grafana-agent
spec:
image: grafana/agent:v0.34.0-rc.0
image: grafana/agent:v0.34.0-rc.1
integrations:
selector:
matchLabels:
agent: grafana-agent-integrations
image: grafana/agent:v0.34.0-rc.0
image: grafana/agent:v0.34.0-rc.1
logLevel: info
serviceAccountName: grafana-agent
metrics:
Expand Down
2 changes: 1 addition & 1 deletion docs/sources/operator/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ To install Agent Operator:
serviceAccountName: grafana-agent-operator
containers:
- name: operator
image: grafana/agent-operator:v0.34.0-rc.0
image: grafana/agent-operator:v0.34.0-rc.1
args:
- --kubelet-service=default/kubelet
---
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.34.0-rc.0 \
grafana/agent:v0.34.0-rc.1 \
--config.file=/etc/agent-config/agent.yaml
```

Expand Down Expand Up @@ -67,7 +67,7 @@ metadata:
name: agent
spec:
containers:
- image: grafana/agent:v0.34.0-rc.0
- image: grafana/agent:v0.34.0-rc.1
name: agent
args:
- --config.file=/etc/agent-config/agent.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.34.0-rc.0 \
grafana/agent:v0.34.0-rc.1 \
--config.file=/etc/agent-config/agent.yaml
```

Expand All @@ -37,7 +37,7 @@ metadata:
name: agent
spec:
containers:
- image: grafana/agent:v0.34.0-rc.0
- image: grafana/agent:v0.34.0-rc.1
name: agent
args:
- --config.file=/etc/agent-config/agent.yaml
Expand Down
4 changes: 2 additions & 2 deletions docs/sources/static/set-up/install-agent-docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Grafana Agent is available as a Docker container image on the following platform
docker run \
-v WAL_DATA_DIRECTORY:/etc/agent/data \
-v CONFIG_FILE_PATH:/etc/agent/agent.yaml \
grafana/agent:v0.34.0-rc.0
grafana/agent:v0.34.0-rc.1
```

- Replace `CONFIG_FILE_PATH` with the configuration file path on your Linux host system.
Expand All @@ -47,7 +47,7 @@ Grafana Agent is available as a Docker container image on the following platform
docker run ^
-v WAL_DATA_DIRECTORY:c:\etc\grafana-agent\data ^
-v CONFIG_FILE_PATH:c:\etc\grafana-agent ^
grafana/agent:v0.34.0-rc.0-windows
grafana/agent:v0.34.0-rc.1-windows
```

- Replace `CONFIG_FILE_PATH` with the configuration file path on your Windows host system.
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package operator

// Supported versions of the Grafana Agent.
var (
DefaultAgentVersion = "v0.34.0-rc.0"
DefaultAgentVersion = "v0.34.0-rc.1"
DefaultAgentBaseImage = "grafana/agent"
DefaultAgentImage = DefaultAgentBaseImage + ":" + DefaultAgentVersion
)
2 changes: 1 addition & 1 deletion production/kubernetes/agent-bare.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: grafana/agent:v0.34.0-rc.0
image: grafana/agent:v0.34.0-rc.1
imagePullPolicy: IfNotPresent
name: grafana-agent
ports:
Expand Down
2 changes: 1 addition & 1 deletion production/kubernetes/agent-loki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: grafana/agent:v0.34.0-rc.0
image: grafana/agent:v0.34.0-rc.1
imagePullPolicy: IfNotPresent
name: grafana-agent-logs
ports:
Expand Down
2 changes: 1 addition & 1 deletion production/kubernetes/agent-traces.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: grafana/agent:v0.34.0-rc.0
image: grafana/agent:v0.34.0-rc.1
imagePullPolicy: IfNotPresent
name: grafana-agent-traces
ports:
Expand Down
2 changes: 1 addition & 1 deletion production/kubernetes/build/lib/version.libsonnet
Original file line number Diff line number Diff line change
@@ -1 +1 @@
'grafana/agent:v0.34.0-rc.0'
'grafana/agent:v0.34.0-rc.1'
4 changes: 2 additions & 2 deletions production/kubernetes/build/templates/operator/main.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ local ksm = import 'kube-state-metrics/kube-state-metrics.libsonnet';
local this = self,

_images:: {
agent: 'grafana/agent:v0.34.0-rc.0',
agent_operator: 'grafana/agent-operator:v0.34.0-rc.0',
agent: 'grafana/agent:v0.34.0-rc.1',
agent_operator: 'grafana/agent-operator:v0.34.0-rc.1',
ksm: 'registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.5.0',
},

Expand Down
2 changes: 1 addition & 1 deletion production/kubernetes/install-bare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ check_installed() {
check_installed curl
check_installed envsubst

MANIFEST_BRANCH=v0.34.0-rc.0
MANIFEST_BRANCH=v0.34.0-rc.1
MANIFEST_URL=${MANIFEST_URL:-https://raw.githubusercontent.com/grafana/agent/${MANIFEST_BRANCH}/production/kubernetes/agent-bare.yaml}
NAMESPACE=${NAMESPACE:-default}

Expand Down
4 changes: 2 additions & 2 deletions production/operator/templates/agent-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ spec:
containers:
- args:
- --kubelet-service=default/kubelet
image: grafana/agent-operator:v0.34.0-rc.0
image: grafana/agent-operator:v0.34.0-rc.1
imagePullPolicy: IfNotPresent
name: grafana-agent-operator
serviceAccount: grafana-agent-operator
Expand Down Expand Up @@ -436,7 +436,7 @@ metadata:
name: grafana-agent
namespace: ${NAMESPACE}
spec:
image: grafana/agent:v0.34.0-rc.0
image: grafana/agent:v0.34.0-rc.1
integrations:
selector:
matchLabels:
Expand Down
4 changes: 2 additions & 2 deletions production/tanka/grafana-agent/v1/main.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ local service = k.core.v1.service;
(import './lib/traces.libsonnet') +
{
_images:: {
agent: 'grafana/agent:v0.34.0-rc.0',
agentctl: 'grafana/agentctl:v0.34.0-rc.0',
agent: 'grafana/agent:v0.34.0-rc.1',
agentctl: 'grafana/agentctl:v0.34.0-rc.1',
},

// new creates a new DaemonSet deployment of the grafana-agent. By default,
Expand Down
4 changes: 2 additions & 2 deletions production/tanka/grafana-agent/v2/internal/base.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ function(name='grafana-agent', namespace='') {
local this = self,

_images:: {
agent: 'grafana/agent:v0.34.0-rc.0',
agentctl: 'grafana/agentctl:v0.34.0-rc.0',
agent: 'grafana/agent:v0.34.0-rc.1',
agentctl: 'grafana/agentctl:v0.34.0-rc.1',
},
_config:: {
name: name,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function(
) {
local _config = {
api: error 'api must be set',
image: 'grafana/agentctl:v0.34.0-rc.0',
image: 'grafana/agentctl:v0.34.0-rc.1',
schedule: '*/5 * * * *',
configs: [],
} + config,
Expand Down

0 comments on commit ea4465d

Please sign in to comment.