Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3ea485bfc7
|
+4
-1
@@ -20,6 +20,9 @@ SECRET_BASIC_AUTH_VERSION=v1
|
|||||||
# server is remote
|
# server is remote
|
||||||
# PROMETHEUS_REMOTE_WRITE_URL=https://prometheus.$DOMAIN/api/v1/write
|
# PROMETHEUS_REMOTE_WRITE_URL=https://prometheus.$DOMAIN/api/v1/write
|
||||||
|
|
||||||
|
# Enable container filesystem usage metrics (expensive du-scan, ~30% CPU on large hosts)
|
||||||
|
# CADVISOR_DISK_USAGE=1
|
||||||
|
|
||||||
# Enable authenticated scraping of containers that opt in via
|
# Enable authenticated scraping of containers that opt in via
|
||||||
# prometheus.io/auth=basic or prometheus.io/auth=bearer labels (used as
|
# prometheus.io/auth=basic or prometheus.io/auth=bearer labels (used as
|
||||||
# password/bearer token respectively). Insert it with:
|
# password/bearer token respectively). Insert it with:
|
||||||
@@ -84,7 +87,7 @@ SECRET_BASIC_AUTH_VERSION=v1
|
|||||||
# SECRET_GF_ADMINPASSWD_VERSION=v1
|
# SECRET_GF_ADMINPASSWD_VERSION=v1
|
||||||
## Grafana's own domain. Defaults to $DOMAIN
|
## Grafana's own domain. Defaults to $DOMAIN
|
||||||
## Change the value if you want Grafana on another domain.
|
## Change the value if you want Grafana on another domain.
|
||||||
GRAFANA_DOMAIN=$DOMAIN
|
# GRAFANA_DOMAIN=$DOMAIN
|
||||||
#
|
#
|
||||||
## Single-Sign-On with OIDC
|
## Single-Sign-On with OIDC
|
||||||
# COMPOSE_FILE="$COMPOSE_FILE:compose.grafana-oidc.yml"
|
# COMPOSE_FILE="$COMPOSE_FILE:compose.grafana-oidc.yml"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ export PROMETHEUS_YML_VERSION=v2
|
|||||||
export MATRIX_ALERTMANAGER_CONFIG_VERSION=v1
|
export MATRIX_ALERTMANAGER_CONFIG_VERSION=v1
|
||||||
export MATRIX_ALERTMANAGER_ENTRYPOINT_VERSION=v1
|
export MATRIX_ALERTMANAGER_ENTRYPOINT_VERSION=v1
|
||||||
export GF_ALERTS_NODE_VERSION=v3
|
export GF_ALERTS_NODE_VERSION=v3
|
||||||
export CONFIG_ALLOY_VERSION=v1
|
export CONFIG_ALLOY_VERSION=v2
|
||||||
|
|
||||||
# migrates secrets from old names to new names by reading values from the
|
# migrates secrets from old names to new names by reading values from the
|
||||||
# running containers on the server and re-inserting them under the new names.
|
# running containers on the server and re-inserting them under the new names.
|
||||||
|
|||||||
@@ -14,7 +14,11 @@ discovery.docker "linux" {
|
|||||||
{{ if ne (env "PROMETHEUS_REMOTE_WRITE_URL") "" }}
|
{{ if ne (env "PROMETHEUS_REMOTE_WRITE_URL") "" }}
|
||||||
prometheus.exporter.cadvisor "docker" {
|
prometheus.exporter.cadvisor "docker" {
|
||||||
docker_only = true
|
docker_only = true
|
||||||
|
{{ if eq (env "CADVISOR_DISK_USAGE") "1" }}
|
||||||
enabled_metrics = ["cpu", "cpuLoad", "disk", "diskIO", "memory", "network"]
|
enabled_metrics = ["cpu", "cpuLoad", "disk", "diskIO", "memory", "network"]
|
||||||
|
{{ else }}
|
||||||
|
enabled_metrics = ["cpu", "cpuLoad", "diskIO", "memory", "network"]
|
||||||
|
{{ end }}
|
||||||
// host-wide totals already come from prometheus.exporter.unix
|
// host-wide totals already come from prometheus.exporter.unix
|
||||||
disable_root_cgroup_stats = true
|
disable_root_cgroup_stats = true
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,3 +59,6 @@ See the README's "Auto-discovering metrics from other apps" section.
|
|||||||
The Swarm, Stacks and Traefik dashboards were reworked to show old (pull-model)
|
The Swarm, Stacks and Traefik dashboards were reworked to show old (pull-model)
|
||||||
and new (Alloy push-model) data as one continuous line, so you don't lose history
|
and new (Alloy push-model) data as one continuous line, so you don't lose history
|
||||||
across the migration.
|
across the migration.
|
||||||
|
|
||||||
|
The disk usage per container was disabled per default because of the CPU-expensive
|
||||||
|
filesystem scan (30% cpu increase). Enable by uncommenting env CADVISOR_DISK_USAGE=1
|
||||||
|
|||||||
Reference in New Issue
Block a user