Tweaks to Redis processing, added calico

sassoftware · Mar 21, 2024 · a0b749c · a0b749c
1 parent fc0787b
commit a0b749c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/logging/fb/fluent-bit_config.configmap_opensearch.yaml b/logging/fb/fluent-bit_config.configmap_opensearch.yaml
@@ -6,7 +6,7 @@ data:
     [FILTER]
        Name modify
        Match *
-       Set  fb_configMap_version 0.2.26f
+       Set  fb_configMap_version 0.2.26J
        #Set clusterID NOT_SET
        # initialized to N to force level standardization
        Set  __temp_level_fixed   N
@@ -719,7 +719,9 @@ data:
        Rename          source      PROPS__source
        Rename          component   PROPS__component
     [FILTER]
-       # redis
+       #
+       # Redis
+       #
        Alias           flag_redis_msgs
        Name            modify
        Match           kube.*
@@ -734,14 +736,6 @@ data:
        Key_name        redis_message
        Parser          redis
        Reserve_Data    On
-    [FILTER]
-       Alias           post_redis
-       Name            modify
-       Match           kube.*
-       Condition       Key_value_matches  flagged4parsing redis
-       Copy            levelcode  level
-       Add             DB_redis_levelcode  levelcode
-
     [FILTER]
        #
        # Zalando (Postgres)
@@ -799,6 +793,7 @@ data:
        Parser          misc6
        Parser          misc7
        Parser          misc8
+       Parser          calico
        Parser          collectapiT
        Parser          collectapi
        Parser          haproxy_default

diff --git a/logging/fb/viya-parsers.conf b/logging/fb/viya-parsers.conf
@@ -1,4 +1,4 @@
-# Version 1.9.11-snapshot2
+# Version 1.9.11-snapshot3
 [PARSER]
        Name          consul
        Format        regex
@@ -348,7 +348,16 @@
        Name          redis
        # Redis
        # Example: 71:S 18 Mar 2024 14:14:11.269 * Background append only file rewriting started by pid 143
+       # NOTE: Redis log messages use special characters to indicate message level
        Format        regex
-       Regex \S+\s(?<timestamp>\d\d?\s[A-Z][a-z]{2}\s\d{4}\s(\d\d:?){3}\.\d{3})\s(?<levelcode>\S)\s(?<message>.+)
+       Regex \S+\s(?<timestamp>\d\d?\s[A-Z][a-z]{2}\s\d{4}\s(\d\d:?){3}\.\d{3})\s(?<level>\S)\s(?<message>.+)
        Time_Key      timestamp
        Time_format   %d %b %Y %T.%L
+[PARSER]
+       Name          calico
+       # Calico
+       # Example: 2024-03-21 15:56:07.077 [INFO][78] felix/status_combiner.go 98: Reporting combined status. id=proto.WorkloadEndpointID{OrchestratorId:"k8s", WorkloadId:"d73310/sas-crunchy-platform-postgres-00-njfn-0", EndpointId:"eth0"} status="up"
+       Format        regex
+       Regex  (?<timestamp>\d{4}(-\d{2}){2} (\d{2}:?){3}\.\d{3})\s\[(?<level>[A-Z]+)\](?<message>.+)
+       Time_Key      timestamp
+       Time_format   %F% %T.%L