From 08aa82f350b54e83753fa5a3452adc2568e79521 Mon Sep 17 00:00:00 2001 From: Bruce Becker Date: Sat, 18 May 2024 07:04:57 +0200 Subject: [PATCH] fix(monitoring): fix log configuration for pushing to correct endpoint Signed-off-by: Bruce Becker --- grafana-agent/grafana-agent.nomad | 6 +++--- grafana-agent/grafana-agent.yml.tmpl | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/grafana-agent/grafana-agent.nomad b/grafana-agent/grafana-agent.nomad index 9aa74c0..b6c9a20 100644 --- a/grafana-agent/grafana-agent.nomad +++ b/grafana-agent/grafana-agent.nomad @@ -6,7 +6,7 @@ variable "graf_agent_rel_url" { variable "graf_agent_version" { description = "Grafana Agent version to be used." type = string - default = "0.40.3" + default = "0.40.4" } variable "scrape_interval" { @@ -42,8 +42,8 @@ job "grafana-agent" { task "agent" { resources { - memory = 25 - cpu = 25 + memory = 125 + cpu = 50 } identity { name = "vault" diff --git a/grafana-agent/grafana-agent.yml.tmpl b/grafana-agent/grafana-agent.yml.tmpl index af47570..112c46a 100644 --- a/grafana-agent/grafana-agent.yml.tmpl +++ b/grafana-agent/grafana-agent.yml.tmpl @@ -6,7 +6,7 @@ metrics: global: scrape_interval: 60s remote_write: - - url: {{ .Data.data.metrics_url }}/api/prom/push + - url: {{ .Data.data.metrics_url }}/push basic_auth: password: '{{ .Data.data.api_key }}' username: '{{ .Data.data.metrics_id }}' @@ -50,7 +50,8 @@ integrations: - basic_auth: password: '{{ .Data.data.api_key }}' username: '{{ .Data.data.metrics_id }}' - url: '{{ .Data.data.metrics_url }}/api/prom/push' + url: {{ .Data.data.metrics_url }}/push + node_exporter: enabled: true # disable unused collectors @@ -64,7 +65,7 @@ integrations: netclass_ignored_devices: "^(veth.*|cali.*|[a-f0-9]{15})$" netdev_device_exclude: "^(veth.*|cali.*|[a-f0-9]{15})$" # disable tmpfs - filesystem_fs_types_exclude: "^(autofs|binfmt_misc|bpf|cgroup2?|configfs|debugfs|devpts|devtmpfs|tmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$" + filesystem_fs_types_exclude: "^(autofs|binfmt_misc|bpf|configfs|debugfs|devpts|devtmpfs|tmpfs|fusectl|hugetlbfs|iso9660|mqueue|nsfs|overlay|proc|procfs|pstore|rpc_pipefs|securityfs|selinuxfs|squashfs|sysfs|tracefs)$" # drop extensive scrape statistics relabel_configs: - replacement: '{{ env "HOSTNAME" }}'