promtail stuff

compose.promtail.yml

@@ -5,7 +5,7 @@ services:
     image: grafana/promtail:2.7.3
     volumes:
       - /var/log:/var/log:ro
-      - /var/lib/docker/containers:/var/lib/docker/containers:ro
+      - /var/run/docker.sock:/var/run/docker.sock
     command: -config.file=/etc/promtail/config.yml
     configs:
       - source: promtail_yml
@@ -22,3 +22,8 @@ configs:
     name: ${STACK_NAME}_promtail_yml_${PROMTAIL_YML_VERSION}
     file: promtail.yml.tmpl
     template_driver: golang
+
+secrets:
+  basic_auth_admin_password:
+    external: true
+    name: ${STACK_NAME}_basic_auth_admin_password_${SECRET_BASIC_AUTH_ADMIN_PASSWORD_VERSION}

compose.yml

@@ -85,8 +85,3 @@ networks:
   proxy:
     external: true
   internal:
-
-secrets:
-  basic_auth_admin_password:
-    external: true
-    name: ${STACK_NAME}_basic_auth_admin_password_${SECRET_BASIC_AUTH_ADMIN_PASSWORD_VERSION}

promtail.yml.tmpl

@@ -20,36 +20,16 @@ scrape_configs:
       job: varlogs
       __path__: /var/log/*log
 
-- job_name: containers
+- job_name: "docker"
-  static_configs:
+  docker_sd_configs:
-  - targets:
+    - host: "unix:///var/run/docker.sock"
-      - localhost
+      refresh_interval: "1s"
-    labels:
+  relabel_configs:
-      job: containerlogs
+    - source_labels: ['__meta_docker_container_name']
-      __path__: /var/lib/docker/containers/*/*log
+      target_label: "container_name"
-
+    - source_labels: ['__meta_docker_container_id']
-  pipeline_stages:
+      target_label: "container_id"
-  - json:
+    - source_labels: ['__meta_docker_container_label_com_docker_stack_namespace']
-      expressions:
+      target_label: "stack_namespace"
-        output: log
+    - source_labels: ['__meta_docker_container_label_com_docker_swarm_service_name']
-        stream: stream
+      target_label: "service_name"
-        attrs:
-  - json:
-      expressions:
-        tag:
-      source: attrs
-  - regex:
-      expression: (?P<image_name>(?:[^|]*[^|])).(?P<container_name>(?:[^|]*[^|])).(?P<image_id>(?:[^|]*[^|])).(?P<container_id>(?:[^|]*[^|]))
-      source: tag
-  - timestamp:
-      format: RFC3339Nano
-      source: time
-  - labels:
-      tag:
-      stream:
-      image_name:
-      container_name:
-      image_id:
-      container_id:
-  - output:
-      source: output