diff --git a/.env.sample b/.env.sample index 54c8e8b..bfe6839 100644 --- a/.env.sample +++ b/.env.sample @@ -6,9 +6,6 @@ DOMAIN=monitoring-ng.example.com ENABLE_BACKUPS=true SECRET_BASIC_AUTH_VERSION=v1 -# -# Promtail (Gathering Logs) -# COMPOSE_FILE="$COMPOSE_FILE:compose.promtail.yml" # LOKI_PUSH_URL=https://loki.monitoring.example.org/loki/api/v1/push diff --git a/abra.sh b/abra.sh index 0621dad..e378367 100644 --- a/abra.sh +++ b/abra.sh @@ -6,7 +6,6 @@ export GF_STACKS_DASH_VERSION=v2 export GF_TRAEFIK_DASH_VERSION=v2 export GF_BACKUP_DASH_VERSION=v1 export GF_CUSTOM_INI_VERSION=v4 -export PROMTAIL_YML_VERSION=v3 export LOKI_YML_VERSION=v3 export PROMETHEUS_YML_VERSION=v2 export MATRIX_ALERTMANAGER_CONFIG_VERSION=e diff --git a/compose.promtail.yml b/compose.promtail.yml deleted file mode 100644 index fe686e2..0000000 --- a/compose.promtail.yml +++ /dev/null @@ -1,30 +0,0 @@ -version: "3.8" - -services: - promtail: - image: grafana/promtail:3.6.7 - volumes: - - /var/log:/var/log:ro - - /var/run/docker.sock:/var/run/docker.sock - command: -config.file=/etc/promtail/config.yml - configs: - - source: promtail_yml - target: /etc/promtail/config.yml - networks: - - internal - secrets: - - basic_auth - environment: - - DOMAIN - - LOKI_PUSH_URL - -configs: - promtail_yml: - name: ${STACK_NAME}_promtail_yml_${PROMTAIL_YML_VERSION} - file: promtail.yml.tmpl - template_driver: golang - -secrets: - basic_auth: - external: true - name: ${STACK_NAME}_basic_auth_${SECRET_BASIC_AUTH_VERSION} diff --git a/promtail.yml.tmpl b/promtail.yml.tmpl deleted file mode 100644 index 9a788f0..0000000 --- a/promtail.yml.tmpl +++ /dev/null @@ -1,37 +0,0 @@ -server: - http_listen_port: 9080 - grpc_listen_port: 0 - -positions: - filename: /tmp/positions.yaml - -clients: - - url: {{ env "LOKI_PUSH_URL" }} - basic_auth: - username: admin - password: {{ secret "basic_auth" }} - external_labels: - hostname: {{ env "DOMAIN" }} - -scrape_configs: -- job_name: system - static_configs: - - targets: - - localhost - labels: - job: varlogs - __path__: /var/log/*log - -- job_name: "docker" - docker_sd_configs: - - host: "unix:///var/run/docker.sock" - refresh_interval: "10s" - relabel_configs: - - source_labels: ['__meta_docker_container_name'] - target_label: "container_name" - - source_labels: ['__meta_docker_container_id'] - target_label: "container_id" - - source_labels: ['__meta_docker_container_label_com_docker_stack_namespace'] - target_label: "stack_namespace" - - source_labels: ['__meta_docker_container_label_com_docker_swarm_service_name'] - target_label: "service_name"