Merge pull request #419 from Bennyz/update-vdsm

Update the Vdsm log configuration to support the Vdsm 4.1 log format
7 years ago · 8b7c9ca598
parent 8a045243aa ffbe0e477c
commit 8b7c9ca598
1 changed files with 25 additions and 7 deletions
--- a/src/default-log-formats.json
+++ b/src/default-log-formats.json
@ -1162,11 +1162,14 @@
        ]
    },
    "vdsm_log" : {
-        "title": "Vdsm Logs",
-        "description": "The Open Virtual Datacenter VDSM log format",
-        "url": "http://www.ovirt.org/Vdsm_Log_Files",
+    	"title": "Vdsm Logs",
+    	"description": "Vdsm log format",
+    	"url": "http://www.ovirt.org/develop/developer-guide/vdsm/log-files/",
        "regex": {
-            "std": {
+	     "v4.1": {
+		"pattern": "(?s)^(?<timestamp>\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{3}(?:\\+\\d{4})?) (?<level>\\w+)\\s+\\((?<thread>.+?)\\) \\[(?<logger>.+?)\\]\\s+?(?<body>(?:.|[\\r\\n])*?)\\s+?\\((?<src_file>\\w+?):(?<src_line>\\d+)\\)(\\n(?<traceback>Traceback.*?)(?=\\n(?P=timestamp)|$))?"
+	    },
+            "v4": {
                "pattern": "^(?<tid>.+)::(?<level>.+)::(?<timestamp>.+)::(?<module>.+)::(?<src_line>.+)::(?<logger>.+)::\\((?<func>[^\\)]+)\\)(?<body>(?:.|\\n)*)"
            }
        },
@ -1175,7 +1178,9 @@
            "error": "ERROR",
            "debug": "DEBUG",
            "info": "INFO",
-            "warning": "WARNING"
+            "warning": "WARNING|WARN",
+      	    "critical": "CRIT",
+            "trace": "TRACE"
        },
        "value": {
            "tid": {
@ -1197,11 +1202,24 @@
            "func": {
                "kind": "string",
                "identifier": true
-            }
+            },
+	    "thread": {
+		"kind": "string",
+		"identifier": true
+	    },
+	    "src_file": {
+		"kind": "string",
+		"identifier": true
+	    },
+	      "traceback": {
+		"kind": "string",
+		"identifier": true
+	   }
        },
        "sample": [
            {
-                "line": "Thread-1950::INFO::2011-12-07 12:14:15,018::dispatcher::94::Storage.Dispatcher.Protect::(run) Run and protect: getDeviceList, args: ( storageType=2)"
+                "line": "Thread-1950::INFO::2011-12-07 12:14:15,018::dispatcher::94::Storage.Dispatcher.Protect::(run) Run and protect: getDeviceList, args: ( storageType=2)",
+		"line": "2017-03-06 14:49:05,167+0200 INFO  (vm/9e5dd42e) [virt.vm] (vmId='9e5dd42e-5177-4da3-a6ce-87fa2052d315') (vm:2104)"
            }
        ]
    },