L2SS-970: fix bugs

docker-compose/logstash.yml

 #
-# Docker compose file that launches LOgstash-output-loki
+# Docker compose file that launches Logstash-output-loki
 #
-# Defines:
-#   - prometheus: Prometheus
 #
 
 version: '2.1'

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

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"
   }
 }

docker-compose/loki.yml

@@ -35,4 +35,6 @@ services:
     command: -config.file=/etc/promtail/config.yml
     networks:
       - control
+    ports:
+      - "9080:9080"
     restart: unless-stopped