diff --git a/CHANGELOG.md b/CHANGELOG.md index bc61db4e7f93..c4d51d5c678a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 @@ -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/` (@rfratto) diff --git a/production/kubernetes/agent-bare.yaml b/production/kubernetes/agent-bare.yaml index b233371e093b..0506596897c1 100644 --- a/production/kubernetes/agent-bare.yaml +++ b/production/kubernetes/agent-bare.yaml @@ -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: diff --git a/production/kubernetes/agent-loki.yaml b/production/kubernetes/agent-loki.yaml index ea0efd3735d9..61ac6793965e 100644 --- a/production/kubernetes/agent-loki.yaml +++ b/production/kubernetes/agent-loki.yaml @@ -317,6 +317,8 @@ spec: containers: - args: - -config.file=/etc/agent/agent.yaml + command: + - /bin/agent env: - name: HOSTNAME valueFrom: diff --git a/production/kubernetes/agent-tempo.yaml b/production/kubernetes/agent-tempo.yaml index 979497cd9099..a4da65dd1d22 100644 --- a/production/kubernetes/agent-tempo.yaml +++ b/production/kubernetes/agent-tempo.yaml @@ -158,6 +158,8 @@ spec: containers: - args: - -config.file=/etc/agent/agent.yaml + command: + - /bin/agent env: - name: HOSTNAME valueFrom: diff --git a/production/kubernetes/agent.yaml b/production/kubernetes/agent.yaml index 073dce412e98..9bf9f7c9376f 100644 --- a/production/kubernetes/agent.yaml +++ b/production/kubernetes/agent.yaml @@ -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: @@ -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: diff --git a/production/tanka/grafana-agent/grafana-agent.libsonnet b/production/tanka/grafana-agent/grafana-agent.libsonnet index b786061287bb..0059ff885c6a 100644 --- a/production/tanka/grafana-agent/grafana-agent.libsonnet +++ b/production/tanka/grafana-agent/grafana-agent.libsonnet @@ -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'), diff --git a/production/tanka/grafana-agent/v1/internal/agent.libsonnet b/production/tanka/grafana-agent/v1/internal/agent.libsonnet index 7f5429968118..3e37c179dad0 100644 --- a/production/tanka/grafana-agent/v1/internal/agent.libsonnet +++ b/production/tanka/grafana-agent/v1/internal/agent.libsonnet @@ -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', })),