From 7ef6989d67fa3783f46d9948a68102ea3377b857 Mon Sep 17 00:00:00 2001
From: stedif <stefano.difrischia@inaf.it>
Date: Wed, 5 Oct 2022 11:53:24 +0200
Subject: [PATCH] L2SS-970: rename logstash-loki into logstash

---
 docker-compose/{logstash-loki.yml => logstash.yml}        | 8 ++++----
 docker-compose/{logstash-loki => logstash}/Dockerfile     | 0
 .../logstash/conf.d/02-beats-input.conf                   | 0
 .../logstash/conf.d/03-syslog-input.conf                  | 0
 .../logstash/conf.d/04-tcp-input.conf                     | 0
 .../logstash/conf.d/10-syslog.conf                        | 0
 .../logstash/conf.d/11-nginx.conf                         | 0
 .../logstash/conf.d/20-parse-grafana.conf                 | 0
 .../logstash/conf.d/21-parse-prometheus.conf              | 0
 .../logstash/conf.d/22-parse-tango-rest.conf              | 0
 .../logstash/conf.d/23-parse-maria-db.conf                | 0
 .../logstash/conf.d/30-output.conf                        | 0
 .../tangostationcontrol/common/lofar_logging.py           | 2 +-
 13 files changed, 5 insertions(+), 5 deletions(-)
 rename docker-compose/{logstash-loki.yml => logstash.yml} (82%)
 rename docker-compose/{logstash-loki => logstash}/Dockerfile (100%)
 rename docker-compose/{logstash-loki => logstash}/logstash/conf.d/02-beats-input.conf (100%)
 rename docker-compose/{logstash-loki => logstash}/logstash/conf.d/03-syslog-input.conf (100%)
 rename docker-compose/{logstash-loki => logstash}/logstash/conf.d/04-tcp-input.conf (100%)
 rename docker-compose/{logstash-loki => logstash}/logstash/conf.d/10-syslog.conf (100%)
 rename docker-compose/{logstash-loki => logstash}/logstash/conf.d/11-nginx.conf (100%)
 rename docker-compose/{logstash-loki => logstash}/logstash/conf.d/20-parse-grafana.conf (100%)
 rename docker-compose/{logstash-loki => logstash}/logstash/conf.d/21-parse-prometheus.conf (100%)
 rename docker-compose/{logstash-loki => logstash}/logstash/conf.d/22-parse-tango-rest.conf (100%)
 rename docker-compose/{logstash-loki => logstash}/logstash/conf.d/23-parse-maria-db.conf (100%)
 rename docker-compose/{logstash-loki => logstash}/logstash/conf.d/30-output.conf (100%)

diff --git a/docker-compose/logstash-loki.yml b/docker-compose/logstash.yml
similarity index 82%
rename from docker-compose/logstash-loki.yml
rename to docker-compose/logstash.yml
index 88bca081b..1a6430ff1 100644
--- a/docker-compose/logstash-loki.yml
+++ b/docker-compose/logstash.yml
@@ -8,13 +8,13 @@
 version: '2.1'
 
 services:
-  logstash-loki:
-    image: logstash-loki
+  logstash:
+    image: logstash
     build:
-        context: logstash-loki
+        context: logstash
         args: 
             SOURCE_IMAGE: grafana/logstash-output-loki:main
-    container_name: ${CONTAINER_NAME_PREFIX}logstash-loki
+    container_name: ${CONTAINER_NAME_PREFIX}logstash
     logging:
       driver: "json-file"
       options:
diff --git a/docker-compose/logstash-loki/Dockerfile b/docker-compose/logstash/Dockerfile
similarity index 100%
rename from docker-compose/logstash-loki/Dockerfile
rename to docker-compose/logstash/Dockerfile
diff --git a/docker-compose/logstash-loki/logstash/conf.d/02-beats-input.conf b/docker-compose/logstash/logstash/conf.d/02-beats-input.conf
similarity index 100%
rename from docker-compose/logstash-loki/logstash/conf.d/02-beats-input.conf
rename to docker-compose/logstash/logstash/conf.d/02-beats-input.conf
diff --git a/docker-compose/logstash-loki/logstash/conf.d/03-syslog-input.conf b/docker-compose/logstash/logstash/conf.d/03-syslog-input.conf
similarity index 100%
rename from docker-compose/logstash-loki/logstash/conf.d/03-syslog-input.conf
rename to docker-compose/logstash/logstash/conf.d/03-syslog-input.conf
diff --git a/docker-compose/logstash-loki/logstash/conf.d/04-tcp-input.conf b/docker-compose/logstash/logstash/conf.d/04-tcp-input.conf
similarity index 100%
rename from docker-compose/logstash-loki/logstash/conf.d/04-tcp-input.conf
rename to docker-compose/logstash/logstash/conf.d/04-tcp-input.conf
diff --git a/docker-compose/logstash-loki/logstash/conf.d/10-syslog.conf b/docker-compose/logstash/logstash/conf.d/10-syslog.conf
similarity index 100%
rename from docker-compose/logstash-loki/logstash/conf.d/10-syslog.conf
rename to docker-compose/logstash/logstash/conf.d/10-syslog.conf
diff --git a/docker-compose/logstash-loki/logstash/conf.d/11-nginx.conf b/docker-compose/logstash/logstash/conf.d/11-nginx.conf
similarity index 100%
rename from docker-compose/logstash-loki/logstash/conf.d/11-nginx.conf
rename to docker-compose/logstash/logstash/conf.d/11-nginx.conf
diff --git a/docker-compose/logstash-loki/logstash/conf.d/20-parse-grafana.conf b/docker-compose/logstash/logstash/conf.d/20-parse-grafana.conf
similarity index 100%
rename from docker-compose/logstash-loki/logstash/conf.d/20-parse-grafana.conf
rename to docker-compose/logstash/logstash/conf.d/20-parse-grafana.conf
diff --git a/docker-compose/logstash-loki/logstash/conf.d/21-parse-prometheus.conf b/docker-compose/logstash/logstash/conf.d/21-parse-prometheus.conf
similarity index 100%
rename from docker-compose/logstash-loki/logstash/conf.d/21-parse-prometheus.conf
rename to docker-compose/logstash/logstash/conf.d/21-parse-prometheus.conf
diff --git a/docker-compose/logstash-loki/logstash/conf.d/22-parse-tango-rest.conf b/docker-compose/logstash/logstash/conf.d/22-parse-tango-rest.conf
similarity index 100%
rename from docker-compose/logstash-loki/logstash/conf.d/22-parse-tango-rest.conf
rename to docker-compose/logstash/logstash/conf.d/22-parse-tango-rest.conf
diff --git a/docker-compose/logstash-loki/logstash/conf.d/23-parse-maria-db.conf b/docker-compose/logstash/logstash/conf.d/23-parse-maria-db.conf
similarity index 100%
rename from docker-compose/logstash-loki/logstash/conf.d/23-parse-maria-db.conf
rename to docker-compose/logstash/logstash/conf.d/23-parse-maria-db.conf
diff --git a/docker-compose/logstash-loki/logstash/conf.d/30-output.conf b/docker-compose/logstash/logstash/conf.d/30-output.conf
similarity index 100%
rename from docker-compose/logstash-loki/logstash/conf.d/30-output.conf
rename to docker-compose/logstash/logstash/conf.d/30-output.conf
diff --git a/tangostationcontrol/tangostationcontrol/common/lofar_logging.py b/tangostationcontrol/tangostationcontrol/common/lofar_logging.py
index f55122e9f..13d20551b 100644
--- a/tangostationcontrol/tangostationcontrol/common/lofar_logging.py
+++ b/tangostationcontrol/tangostationcontrol/common/lofar_logging.py
@@ -156,7 +156,7 @@ def configure_logger(logger: logging.Logger=None, log_extra=None, debug=False):
         from logstash_async.handler import AsynchronousLogstashHandler, LogstashFormatter
 
         # log to the tcp_input of logstash in our logstash-loki container
-        handler = AsynchronousLogstashHandler("logstash-loki", 5959, database_path='/tmp/lofar_pending_log_messages.db')
+        handler = AsynchronousLogstashHandler("logstash", 5959, database_path='/tmp/lofar_pending_log_messages.db')
 
         # configure log messages
         formatter = LogstashFormatter(extra=log_extra, tags=["python", "lofar"])
-- 
GitLab