diff --git a/src/default-log-formats.json b/src/default-log-formats.json index 6ac55834..debd10ae 100644 --- 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)^(?\\d{4}-\\d{2}-\\d{2} \\d{2}:\\d{2}:\\d{2},\\d{3}(?:\\+\\d{4})?) (?\\w+)\\s+\\((?.+?)\\) \\[(?.+?)\\]\\s+?(?(?:.|[\\r\\n])*?)\\s+?\\((?\\w+?):(?\\d+)\\)(\\n(?Traceback.*?)(?=\\n(?P=timestamp)|$))?" + }, + "v4": { "pattern": "^(?.+)::(?.+)::(?.+)::(?.+)::(?.+)::(?.+)::\\((?[^\\)]+)\\)(?(?:.|\\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)" } ] },