Skip to content

Commit

Permalink
explicitly add command to Agent manifests (#283)
Browse files Browse the repository at this point in the history
Closes #279
  • Loading branch information
rfratto authored Dec 10, 2020
1 parent 78942a9 commit 6dc5cf4
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 2 deletions.
8 changes: 6 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@ this platform. FreeBSD builds will return in a future release.

- [FEATURE] New integration:
[consul_exporter](https://github.com/prometheus/consul_exporter) (@rfratto)

- [FEATURE] Add optional environment variable substitution of configuration file. (@dcseifert)

- [FEATURE] Add optional environment variable substitution of configuration
file. (@dcseifert)

- [ENHANCEMENT] `min_wal_time` and `max_wal_time` have been added to the
instance config settings, guaranteeing that data in the WAL will exist for at
Expand All @@ -35,6 +36,9 @@ this platform. FreeBSD builds will return in a future release.
- [BUGFIX] Fix issue where the Tempo example manifest could not be applied
because the port names were too long. (@rfratto)

- [BUGFIX] Fix issue where the Agent Kubernetes manifests may not load properly
on AKS. (#279) (@rfratto)

- [CHANGE] The User-Agent header sent for logs will now be
`GrafanaCloudAgent/<version>` (@rfratto)

Expand Down
2 changes: 2 additions & 0 deletions production/kubernetes/agent-bare.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ spec:
- args:
- -config.file=/etc/agent/agent.yml
- -prometheus.wal-directory=/tmp/agent/data
command:
- /bin/agent
env:
- name: HOSTNAME
valueFrom:
Expand Down
2 changes: 2 additions & 0 deletions production/kubernetes/agent-loki.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,8 @@ spec:
containers:
- args:
- -config.file=/etc/agent/agent.yaml
command:
- /bin/agent
env:
- name: HOSTNAME
valueFrom:
Expand Down
2 changes: 2 additions & 0 deletions production/kubernetes/agent-tempo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ spec:
containers:
- args:
- -config.file=/etc/agent/agent.yaml
command:
- /bin/agent
env:
- name: HOSTNAME
valueFrom:
Expand Down
4 changes: 4 additions & 0 deletions production/kubernetes/agent.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,8 @@ spec:
- args:
- -config.file=/etc/agent/agent.yml
- -prometheus.wal-directory=/tmp/agent/data
command:
- /bin/agent
env:
- name: HOSTNAME
valueFrom:
Expand Down Expand Up @@ -352,6 +354,8 @@ spec:
- args:
- -config.file=/etc/agent/agent.yml
- -prometheus.wal-directory=/tmp/agent/data
command:
- /bin/agent
env:
- name: HOSTNAME
valueFrom:
Expand Down
1 change: 1 addition & 0 deletions production/tanka/grafana-agent/grafana-agent.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ k + config {
agent_container::
container.new('agent', $._images.agent) +
container.withPorts($.core.v1.containerPort.new('http-metrics', 80)) +
container.withCommand('/bin/agent') +
container.withArgsMixin($.util.mapToFlags($.agent_args)) +
container.withEnv([
$.core.v1.envVar.fromFieldPath('HOSTNAME', 'spec.nodeName'),
Expand Down
1 change: 1 addition & 0 deletions production/tanka/grafana-agent/v1/internal/agent.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ local policyRule = k.rbac.v1.policyRule;
container::
container.new('agent', image) +
container.withPorts(k.core.v1.containerPort.new('http-metrics', 8080)) +
container.withCommand('/bin/agent') +
container.withArgsMixin(k.util.mapToFlags({
'config.file': '/etc/agent/agent.yaml',
})),
Expand Down

0 comments on commit 6dc5cf4

Please sign in to comment.