From dd0330c85a73e2d598b72407de3cefa8a2a6d699 Mon Sep 17 00:00:00 2001
From: Yuri Tatishchev <itatishch@gmail.com>
Date: Wed, 23 Oct 2024 15:33:27 -0700
Subject: [PATCH] monitoring: loki, cadvisor config optimizations

---
 .idea/jsonSchemas.xml                            | 16 ++++++++++++++++
 .../services/monitoring/docker-compose.yml.j2    |  5 +++++
 .../monitoring/loki_config/loki-config.yaml.j2   |  7 -------
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.idea/jsonSchemas.xml b/.idea/jsonSchemas.xml
index f779688..aa0590b 100644
--- a/.idea/jsonSchemas.xml
+++ b/.idea/jsonSchemas.xml
@@ -39,6 +39,22 @@
             </SchemaInfo>
           </value>
         </entry>
+        <entry key="Loki">
+          <value>
+            <SchemaInfo>
+              <option name="name" value="Loki" />
+              <option name="relativePathToSchema" value="https://json.schemastore.org/loki.json" />
+              <option name="applicationDefined" value="true" />
+              <option name="patterns">
+                <list>
+                  <Item>
+                    <option name="path" value="roles/alpina/templates/services/monitoring/loki_config/loki-config.yaml.j2" />
+                  </Item>
+                </list>
+              </option>
+            </SchemaInfo>
+          </value>
+        </entry>
         <entry key="Traefik v2">
           <value>
             <SchemaInfo>
diff --git a/roles/alpina/templates/services/monitoring/docker-compose.yml.j2 b/roles/alpina/templates/services/monitoring/docker-compose.yml.j2
index b44fa9a..7be8303 100644
--- a/roles/alpina/templates/services/monitoring/docker-compose.yml.j2
+++ b/roles/alpina/templates/services/monitoring/docker-compose.yml.j2
@@ -79,6 +79,11 @@ services:
     image: gcr.io/cadvisor/cadvisor:latest
     container_name: cadvisor
     restart: unless-stopped
+    command:
+      - --docker_only=true
+      - --store_container_labels=false
+      - --whitelisted_container_labels=com.docker.compose.project,com.docker.compose.service
+      - --enable_metrics=cpu,cpuLoad,diskIO,memory,network,oom_event,process
     volumes:
       - /:/rootfs:ro
       - /var/run:/var/run:rw
diff --git a/roles/alpina/templates/services/monitoring/loki_config/loki-config.yaml.j2 b/roles/alpina/templates/services/monitoring/loki_config/loki-config.yaml.j2
index 8db6158..8b50e93 100644
--- a/roles/alpina/templates/services/monitoring/loki_config/loki-config.yaml.j2
+++ b/roles/alpina/templates/services/monitoring/loki_config/loki-config.yaml.j2
@@ -17,13 +17,6 @@ common:
 
 schema_config:
   configs:
-    - from: 2020-10-24
-      store: boltdb-shipper
-      object_store: filesystem
-      schema: v12
-      index:
-        prefix: index_
-        period: 24h
     - from: 2024-10-18
       index:
         period: 24h