Add loki and update grafana

Author: eduadiez

dappnode_package.json

@@ -4,7 +4,7 @@
   "description": "This package privately and locally collects and displays metrics related to your dappnode and its packages. Based on Grafana and Prometheus. It is recommended to also install the package Node-Exporter if you want system metrics. You can find a guide on how to set up your monitoring system in the next link https://forum.dappnode.io/t/begginer-friendly-install-monitoring-system-on-dappnode-using-dms-package/623",
   "shortDescription": "DAppNode Monitoring Service",
   "type": "service",
-  "architectures": ["linux/amd64", "linux/arm64"],
+  "architectures": ["linux/amd64"],
   "mainService": "grafana",
   "author": "DAppNode Association <[email protected]> (https://github.com/dappnode)",
   "contributors": [

docker-compose-promtail.yml

@@ -0,0 +1,54 @@
+version: "3.4"
+services:
+  grafana:
+    build:
+      context: grafana
+      args:
+        UPSTREAM_VERSION: 9.3.6
+    image: "grafana.dms.dnp.dappnode.eth:1.0.1"
+    restart: always
+    volumes:
+      - "grafana_data:/var/lib/grafana"
+  prometheus:
+    build:
+      context: prometheus
+      args:
+        UPSTREAM_VERSION: v2.30.0
+    image: "prometheus.dms.dnp.dappnode.eth:1.0.1"
+    restart: always
+    volumes:
+      - "prometheus_data:/prometheus"
+      - "prometheus_file_sd:/prometheus_file_sd"
+    environment:
+      DATA_RETENTION_DAYS: 15
+  manager:
+    build: ./manager
+    image: "manager.dms.dnp.dappnode.eth:1.0.1"
+    restart: always
+    volumes:
+      - "manager_data:/data"
+      - "prometheus_file_sd:/prometheus_file_sd"
+  loki:
+    build:
+      context: loki
+      args:
+        UPSTREAM_VERSION: 2.7.3
+    command: "-config.file=/etc/loki/local-config.yaml"
+    restart: always
+    image: "loki.dms.dnp.dappnode.eth:1.0.1"
+  promtail:
+    build:
+      context: promtail
+      args:
+        UPSTREAM_VERSION: 2.7.3
+    volumes:
+      - "/var/log:/var/log:ro"
+      - "/var/lib/docker/containers:/var/lib/docker/containers:ro"
+    command: "-config.file=/etc/promtail/config.yml"
+    restart: always
+    image: "promtail.dms.dnp.dappnode.eth:1.0.1"
+volumes:
+  grafana_data: {}
+  prometheus_data: {}
+  manager_data: {}
+  prometheus_file_sd: {}

docker-compose.yml

@@ -4,7 +4,7 @@ services:
     build:
       context: grafana
       args:
-        UPSTREAM_VERSION: 8.1.8
+        UPSTREAM_VERSION: 9.3.6
     image: "grafana.dms.dnp.dappnode.eth:1.0.1"
     restart: always
     volumes:
@@ -28,6 +28,14 @@ services:
     volumes:
       - "manager_data:/data"
       - "prometheus_file_sd:/prometheus_file_sd"
+  loki:
+    build:
+      context: loki
+      args:
+        UPSTREAM_VERSION: 2.7.3
+    command: "-config.file=/etc/loki/local-config.yaml"
+    restart: always
+    image: "loki.dms.dnp.dappnode.eth:1.0.1"
 volumes:
   grafana_data: {}
   prometheus_data: {}

grafana/datasource.yml

@@ -9,3 +9,11 @@ datasources:
     basicAuth: false
     isDefault: true
     editable: true
+  - name: loki
+    type: loki
+    access: proxy
+    orgId: 1
+    url: http://loki:3100
+    basicAuth: false
+    isDefault: false
+    editable: true

loki/Dockerfile

@@ -0,0 +1,5 @@
+ARG UPSTREAM_VERSION
+
+FROM grafana/loki:${UPSTREAM_VERSION}
+
+COPY local-config.yaml /etc/loki/local-config.yaml

loki/local-config.yaml

@@ -0,0 +1,54 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+  grpc_listen_port: 9096
+
+common:
+  instance_addr: 127.0.0.1
+  path_prefix: /tmp/loki
+  storage:
+    filesystem:
+      chunks_directory: /tmp/loki/chunks
+      rules_directory: /tmp/loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+query_range:
+  results_cache:
+    cache:
+      embedded_cache:
+        enabled: true
+        max_size_mb: 100
+
+schema_config:
+  configs:
+    - from: 2020-10-24
+      store: boltdb-shipper
+      object_store: filesystem
+      schema: v11
+      index:
+        prefix: index_
+        period: 24h
+
+limits_config:
+  ingestion_rate_mb: 1024
+  ingestion_burst_size_mb: 1024
+
+ruler:
+  alertmanager_url: http://localhost:9093
+
+# By default, Loki will send anonymous, but uniquely-identifiable usage and configuration
+# analytics to Grafana Labs. These statistics are sent to https://stats.grafana.org/
+#
+# Statistics help us better understand how Loki is used, and they show us performance
+# levels for most users. This helps us prioritize features and documentation.
+# For more information on what's sent, look at
+# https://github.com/grafana/loki/blob/main/pkg/usagestats/stats.go
+# Refer to the buildReport method to see what goes into a report.
+#
+# If you would like to disable reporting, uncomment the following lines:
+#analytics:
+#  reporting_enabled: false

promtail/Dockerfile

@@ -0,0 +1,5 @@
+ARG UPSTREAM_VERSION
+
+FROM grafana/promtail:${UPSTREAM_VERSION}
+
+COPY config.yaml /etc/promtail/config.yml

promtail/config.yaml

@@ -0,0 +1,50 @@
+server:
+  http_listen_port: 9080
+  grpc_listen_port: 0
+
+positions:
+  filename: /tmp/positions.yaml
+
+clients:
+  - url: http://loki:3100/loki/api/v1/push
+
+scrape_configs:
+  - job_name: system
+    static_configs:
+      - targets:
+        - localhost
+        labels:
+          job: varlogs
+          __path__: /var/log/*log
+  - job_name: docker
+    static_configs:
+      - targets:
+          - localhost
+        labels:
+          job: dockerlogs
+          __path__: /var/lib/docker/containers/*/*log
+    pipeline_stages:
+      - json:
+          expressions:
+            output: log
+            stream: stream
+            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

releases.json

@@ -44,5 +44,11 @@
     "uploadedTo": {
       "dappnode": "Wed, 25 Nov 2020 15:55:33 GMT"
     }
+  },
+  "1.0.1": {
+    "hash": "/ipfs/QmT4XUd3zAwwGsVNY49BjMCshCk2NKTpP7MYToaMaLDUs3",
+    "uploadedTo": {
+      "http://ipfs.dappnode:5001": "Wed, 22 Feb 2023 07:12:48 GMT"
+    }
   }
 }