From 63c87a38d80559378501cef1a01a46e56c0687db Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Wed, 5 Oct 2022 16:11:45 +0200
Subject: [PATCH] L2SS-970: fix bugs
---
docker-compose/logstash.yml | 4 +--
docker-compose/logstash/Dockerfile | 4 ++-
.../logstash/logstash/conf.d/30-output.conf | 30 +------------------
docker-compose/loki.yml | 2 ++
4 files changed, 7 insertions(+), 33 deletions(-)
diff --git a/docker-compose/logstash.yml b/docker-compose/logstash.yml
index 1a6430ff1..73a13e346 100644
--- a/docker-compose/logstash.yml
+++ b/docker-compose/logstash.yml
@@ -1,8 +1,6 @@
#
-# Docker compose file that launches LOgstash-output-loki
+# Docker compose file that launches Logstash-output-loki
#
-# Defines:
-# - prometheus: Prometheus
#
version: '2.1'
diff --git a/docker-compose/logstash/Dockerfile b/docker-compose/logstash/Dockerfile
index 1b547baec..7e0fff7a9 100644
--- a/docker-compose/logstash/Dockerfile
+++ b/docker-compose/logstash/Dockerfile
@@ -2,4 +2,6 @@ ARG SOURCE_IMAGE
FROM ${SOURCE_IMAGE}
# Provide our logstash config
-ADD logstash /home/logstash/
+ADD logstash /etc/logstash/
+COPY loki.conf /home/logstash/
+COPY loki.conf /home/logstash/loki-test.conf
diff --git a/docker-compose/logstash/logstash/conf.d/30-output.conf b/docker-compose/logstash/logstash/conf.d/30-output.conf
index 1886b1021..9bad161d2 100644
--- a/docker-compose/logstash/logstash/conf.d/30-output.conf
+++ b/docker-compose/logstash/logstash/conf.d/30-output.conf
@@ -5,34 +5,6 @@ output {
# index => "logstash-%{+YYYY.MM.dd}"
# }
loki {
- [url => "localhost:3100" | default = none | required=true]
-
- [tenant_id => string | default = nil | required=false]
-
- [message_field => string | default = "message" | required=false]
-
- [include_fields => array | default = [] | required=false]
-
- [batch_wait => number | default = 1(s) | required=false]
-
- [batch_size => number | default = 102400(bytes) | required=false]
-
- [min_delay => number | default = 1(s) | required=false]
-
- [max_delay => number | default = 300(s) | required=false]
-
- [retries => number | default = 10 | required=false]
-
- [username => string | default = nil | required=false]
-
- [password => secret | default = nil | required=false]
-
- [cert => path | default = nil | required=false]
-
- [key => path | default = nil| required=false]
-
- [ca_cert => path | default = nil | required=false]
-
- [insecure_skip_verify => boolean | default = false | required=false]
+ url => "http://localhost:3100/loki/api/v1/push"
}
}
diff --git a/docker-compose/loki.yml b/docker-compose/loki.yml
index 0e5d38bb2..2007e16aa 100644
--- a/docker-compose/loki.yml
+++ b/docker-compose/loki.yml
@@ -35,4 +35,6 @@ services:
command: -config.file=/etc/promtail/config.yml
networks:
- control
+ ports:
+ - "9080:9080"
restart: unless-stopped
--
GitLab