L2SS-970: rename logstash-loki into logstash

docker-compose/logstash-loki.yml → 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:

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"])