From d1375d31cde3427ca243cfeb31b8b1cbc0249e02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Farkas?= <gabor.farkas@gmail.com>
Date: Tue, 27 Sep 2022 11:58:08 +0200
Subject: [PATCH] devenv: loki: remove unused devenv-config (#55752)

* devenv: jaeger: add it's own copy of promtail-config

* devenv: removed unused loki config
---
 .../docker/blocks/jaeger/docker-compose.yaml   |  2 +-
 .../promtail-config.yaml                       |  0
 devenv/docker/blocks/loki-promtail/README.md   | 18 ------------------
 .../blocks/loki-promtail/docker-compose.yaml   | 14 --------------
 4 files changed, 1 insertion(+), 33 deletions(-)
 rename devenv/docker/blocks/{loki-promtail => jaeger}/promtail-config.yaml (100%)
 delete mode 100644 devenv/docker/blocks/loki-promtail/README.md
 delete mode 100644 devenv/docker/blocks/loki-promtail/docker-compose.yaml

diff --git a/devenv/docker/blocks/jaeger/docker-compose.yaml b/devenv/docker/blocks/jaeger/docker-compose.yaml
index 964b8fe4d0b..89a6c669d15 100644
--- a/devenv/docker/blocks/jaeger/docker-compose.yaml
+++ b/devenv/docker/blocks/jaeger/docker-compose.yaml
@@ -25,7 +25,7 @@
   promtail:
     image: grafana/promtail:master
     volumes:
-      - ./docker/blocks/loki-promtail/promtail-config.yaml:/etc/promtail/docker-config.yaml
+      - ./docker/blocks/jaeger/promtail-config.yaml:/etc/promtail/docker-config.yaml
       - /var/log:/var/log
       - ../data/log:/var/log/grafana
     command:
diff --git a/devenv/docker/blocks/loki-promtail/promtail-config.yaml b/devenv/docker/blocks/jaeger/promtail-config.yaml
similarity index 100%
rename from devenv/docker/blocks/loki-promtail/promtail-config.yaml
rename to devenv/docker/blocks/jaeger/promtail-config.yaml
diff --git a/devenv/docker/blocks/loki-promtail/README.md b/devenv/docker/blocks/loki-promtail/README.md
deleted file mode 100644
index 6a41456d78a..00000000000
--- a/devenv/docker/blocks/loki-promtail/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-By default this block is setup to scrape logs from /var/logs. If you need to log some service from the docker-compse you can add:
-```
-    # For this to work you need to install the logging driver see https://github.com/grafana/loki/tree/master/cmd/docker-driver#plugin-installation
-    logging:
-      driver: loki
-      options:
-        loki-url: "http://loki:3100/loki/api/v1/push"
-```
-
-This also works for self logging Loki logs if you use `http://localhost:3100/loki/api/v1/push`. This is useful together with  
-```
-    environment:
-      - JAEGER_AGENT_HOST=tempo
-      - JAEGER_AGENT_PORT=6831
-      - JAEGER_SAMPLER_TYPE=const
-      - JAEGER_SAMPLER_PARAM=1
-```
-which sets up a tracing and so you will have logs with traceIDs to test linking between logs and traces.
diff --git a/devenv/docker/blocks/loki-promtail/docker-compose.yaml b/devenv/docker/blocks/loki-promtail/docker-compose.yaml
deleted file mode 100644
index fbc947523d2..00000000000
--- a/devenv/docker/blocks/loki-promtail/docker-compose.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-  # datasource URL: http://localhost:3100/
-  loki:
-    image: grafana/loki:latest
-    ports:
-      - "3100:3100"
-    command: -config.file=/etc/loki/local-config.yaml
-  promtail:
-    image: grafana/promtail:latest
-    volumes:
-      - ./docker/blocks/loki-promtail/promtail-config.yaml:/etc/promtail/docker-config.yaml
-      - /var/log:/var/log
-      - ../data/log:/var/log/grafana
-    command:
-      -config.file=/etc/promtail/docker-config.yaml