Fixes

NethServer · Oct 28, 2024 · 8c8293a · 8c8293a
1 parent 4662fe4
commit 8c8293a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/imageroot/bin/cloud-log-manager-forwarder b/imageroot/bin/cloud-log-manager-forwarder
@@ -75,7 +75,7 @@ else:
 logs_list = []
 
 logql_stream_selector = ' {node_id=~".+"} '
-if FILTER != None:
+if FILTER:
     logql_stream_selector = ' {node_id=~".+",category="' + FILTER + '"} '
 
 while True:

diff --git a/imageroot/bin/syslog-forwarder b/imageroot/bin/syslog-forwarder
@@ -70,7 +70,7 @@ else:
         os.remove("./syslog_last_timestamp")
 
 logql_stream_selector = ' {node_id=~".+"}'
-if FILTER != None:
+if FILTER:
     logql_stream_selector = ' {node_id=~".+",category="' + FILTER + '"}'
 
 # Every x seconds execute logcli command and send logs to syslog server
@@ -85,10 +85,6 @@ while True:
                 # Log if stdout contains something new
                 if log:
                     json_object = json.loads(log)
-                    labels = json_object["labels"]
-
-                    if FILTER != None and FILTER not in labels:
-                        continue
 
                     line = json.loads(json_object["line"])