Temp

imageroot/actions/get-configuration/10get

@@ -32,6 +32,7 @@ match clm_status.stdout.strip():
 
 cloud_log_manager["address"] = os.getenv('CLOUD_LOG_MANAGER_ADDRESS', '')
 cloud_log_manager["tenant"] = os.getenv('CLOUD_LOG_MANAGER_TENANT', '')
+cloud_log_manager["filter"] = os.getenv('CLOUD_LOG_MANAGER_FILTER', '')
 
 try: 
     with open("./cloud_log_manager_last_timestamp", "r") as clm_file:
@@ -55,6 +56,7 @@ match syslog_status.stdout.strip():
 syslog["address"] = os.getenv('SYSLOG_ADDRESS', '')
 syslog["port"] = os.getenv('SYSLOG_PORT', '')
 syslog["protocol"] = os.getenv('SYSLOG_PROTOCOL', '')
+syslog["filter"] = os.getenv('SYSLOG_FILTER', '')
 syslog["format"] = os.getenv('SYSLOG_FORMAT', '')
 
 try:

imageroot/actions/set-clm-forwarder/10set

@@ -6,10 +6,8 @@
 #
 
 import subprocess
-import hashlib
 import agent
 import json
-import uuid
 import sys
 
 request = json.load(sys.stdin)
@@ -24,6 +22,7 @@ if not bool(subscription):
 if (request['active']):
     agent.set_env('CLOUD_LOG_MANAGER_ADDRESS', f"{request['address']}")
     agent.set_env('CLOUD_LOG_MANAGER_TENANT', f"{request['tenant']}")
+    agent.set_env('CLOUD_LOG_MANAGER_FILTER', f"{request['filter']}")
 
     if 'start_time' in request and request['start_time'] != '':
         agent.set_env('CLOUD_LOG_MANAGER_START_TIME', f"{request['start_time']}")
@@ -38,6 +37,7 @@ else:
     agent.unset_env('CLOUD_LOG_MANAGER_START_TIME')
     agent.unset_env('CLOUD_LOG_MANAGER_ADDRESS')
     agent.unset_env('CLOUD_LOG_MANAGER_TENANT')
+    agent.unset_env('CLOUD_LOG_MANAGER_FILTER')
 
     action = 'disable'
 

imageroot/actions/set-clm-forwarder/validate-input.json

@@ -20,6 +20,10 @@
         "start_time": {
             "type": "string",
             "description": "Log forwarding start time."
+        },
+        "filter": {
+            "type": "string",
+            "description": "Log filter type"
         }
     },
     "oneOf": [

imageroot/bin/cloud-log-manager-forwarder

@@ -25,6 +25,7 @@ try:
     START_TIME = os.environ.get('CLOUD_LOG_MANAGER_START_TIME', '')
     ADDRESS = os.environ.get('CLOUD_LOG_MANAGER_ADDRESS', 'https://nar.nethesis.it')
     TENANT = os.environ.get('CLOUD_LOG_MANAGER_TENANT')
+    FILTER = os.environ.get('CLOUD_LOG_MANAGER_FILTER')
 
     os.environ['LOKI_ADDR'] = f"http://127.0.0.1:{os.environ['LOKI_HTTP_PORT']}"
     os.environ['LOKI_USERNAME'] = os.environ['LOKI_API_AUTH_USERNAME']
@@ -76,7 +77,7 @@ logs_list = []
 while True:
     try:
         # LogCLI command
-        logcli_command = ["logcli", "query", "--limit", "2000", "--forward", "--timezone", "UTC", "--from", last_timestamp, "--no-labels", "-q", "-o", "jsonl",
+        logcli_command = ["logcli", "query", "--limit", "2000", "--forward", "--timezone", "UTC", "--from", last_timestamp, "-q", "-o", "jsonl",
                           '{node_id=~".+"} | json identifier="SYSLOG_IDENTIFIER", priority="PRIORITY", message="MESSAGE" | line_format "<{{.priority}}> [{{.node_id}}:{{.module_id}}:{{.identifier}}]: {{.message}}"']
         response = subprocess.run(logcli_command, capture_output=True, text=True, timeout=300)
 
@@ -87,6 +88,11 @@ 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 = str(json_object["line"])
 
                     if line[line.find(":")+1:line.find(":", line.find(":")+1)] != '':