Merge pull request #1491 from sureshsundriyal/master

tstack · web-flow · commit fd9467fa1eda · 2025-06-18T21:47:08.000-07:00
[vmw_log] Fixup the accidentally removed portion.
diff --git a/src/formats/vmw_log.json b/src/formats/vmw_log.json
@@ -6,7 +6,7 @@
         "url": "https://kb.vmware.com/kb/2004201",
         "regex": {
             "6.0+": {
-                "pattern": "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z|[-+]\\d{2}:\\d{2})) (?<level>\\w+)(?:\\(\\d+\\)+)? (?<prc>[\\w\\-]+)\\s?\\[?(?<tid>\\w+)\\]?:? (?:\\w+ -\\[\\d+\\] )?\\[(?<src>[a-zA-Z][\\w:]*(?:@\\d+)?)(?:\\s+sub=\\\"?(?<sub>.*?(?!\\w+=))\\\"?)?(?:\\s+item=\\\"?(?<item>[\\w\\.\\-@/:]+)\\\"?)?(?: req=\\\"?(?<req>[^ \\]]+)\\\"?)?(?: opI(?:D|d)=\\\"?(?<opid>(?:req=)?[\\w@ \\-\\.:]+?(?!\\w+=))\\\"?)?(?: sid=\\\"?(?<sid>[^ \\]]+)\\\"?)?(?: user=\\\"(?<user>[^ \\]<]+(?:<[^>]+>)?\\\"?))?(?: update=\\\"?(?<vpxa_update>\\d+)\\\"?)?(?:\\s+reason=\\\"?(?<reason>[^\\]]+)\\\"?)?\\]\\s+(?:\\[(?<file>[^ ]+)\\s+(?<line>\\d+)\\]\\s+)?(?<body>.*)$"
+                "pattern": "^(?:\\[#\\d+\\] )?(?<timestamp>\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z|[-+]\\d{2}:\\d{2})) (?<level>\\w+)(?:\\(\\d+\\)+)? (?<prc>[\\w\\-]+)\\s?\\[?(?<tid>\\w+)\\]?:? (?:\\w+ -\\[\\d+\\] )?\\[(?<src>[a-zA-Z][\\w:]*(?:@\\d+)?)(?:\\s+sub=\\\"?(?<sub>.*?(?!\\w+=))\\\"?)?(?:\\s+item=\\\"?(?<item>[\\w\\.\\-@/:]+)\\\"?)?(?: req=\\\"?(?<req>[^ \\]]+)\\\"?)?(?: opI(?:D|d)=\\\"?(?<opid>(?:req=)?[\\w@ \\-\\.:]+?(?!\\w+=))\\\"?)?(?: sid=\\\"?(?<sid>[^ \\]]+)\\\"?)?(?: user=\\\"(?<user>[^ \\]<]+(?:<[^>]+>)?\\\"?))?(?: update=\\\"?(?<vpxa_update>\\d+)\\\"?)?(?:\\s+reason=\\\"?(?<reason>[^\\]]+)\\\"?)?\\]\\s+(?:\\[(?<file>[^ ]+)\\s+(?<line>\\d+)\\]\\s+)?(?<body>.*)$"
             },
             "6.0+-nosrc": {
                 "pattern": "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z|[-+]\\d{2}:\\d{2})) (?<level>\\w+)(?:\\(\\d+\\)+)? (?<prc>[\\w\\-]+)\\[(?<tid>\\w+)\\]:? \\[(?:opI(?:D|d)=(?<opid>[^\\]]+))\\]\\s*(?<body>.*)$"
@@ -361,4 +361,4 @@
             }
         ]
     }
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`"url": "https://kb.vmware.com/kb/2004201",`
`7`	`7`	`"regex": {`
`8`	`8`	`"6.0+": {`
`9`		- "pattern": "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z\|[-+]\\d{2}:\\d{2})) (?<level>\\w+)(?:\\(\\d+\\)+)? (?<prc>[\\w\\-]+)\\s?\\[?(?<tid>\\w+)\\]?:? (?:\\w+ -\\[\\d+\\] )?\\[(?<src>[a-zA-Z][\\w:](?:@\\d+)?)(?:\\s+sub=\\\"?(?<sub>.?(?!\\w+=))\\\"?)?(?:\\s+item=\\\"?(?<item>[\\w\\.\\-@/:]+)\\\"?)?(?: req=\\\"?(?<req>[^ \\]]+)\\\"?)?(?: opI(?:D\|d)=\\\"?(?<opid>(?:req=)?[\\w@ \\-\\.:]+?(?!\\w+=))\\\"?)?(?: sid=\\\"?(?<sid>[^ \\]]+)\\\"?)?(?: user=\\\"(?<user>[^ \\]<]+(?:<[^>]+>)?\\\"?))?(?: update=\\\"?(?<vpxa_update>\\d+)\\\"?)?(?:\\s+reason=\\\"?(?<reason>[^\\]]+)\\\"?)?\\]\\s+(?:\\[(?<file>[^ ]+)\\s+(?<line>\\d+)\\]\\s+)?(?<body>.*)$"
	`9`	+ "pattern": "^(?:\\[#\\d+\\] )?(?<timestamp>\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z\|[-+]\\d{2}:\\d{2})) (?<level>\\w+)(?:\\(\\d+\\)+)? (?<prc>[\\w\\-]+)\\s?\\[?(?<tid>\\w+)\\]?:? (?:\\w+ -\\[\\d+\\] )?\\[(?<src>[a-zA-Z][\\w:](?:@\\d+)?)(?:\\s+sub=\\\"?(?<sub>.?(?!\\w+=))\\\"?)?(?:\\s+item=\\\"?(?<item>[\\w\\.\\-@/:]+)\\\"?)?(?: req=\\\"?(?<req>[^ \\]]+)\\\"?)?(?: opI(?:D\|d)=\\\"?(?<opid>(?:req=)?[\\w@ \\-\\.:]+?(?!\\w+=))\\\"?)?(?: sid=\\\"?(?<sid>[^ \\]]+)\\\"?)?(?: user=\\\"(?<user>[^ \\]<]+(?:<[^>]+>)?\\\"?))?(?: update=\\\"?(?<vpxa_update>\\d+)\\\"?)?(?:\\s+reason=\\\"?(?<reason>[^\\]]+)\\\"?)?\\]\\s+(?:\\[(?<file>[^ ]+)\\s+(?<line>\\d+)\\]\\s+)?(?<body>.*)$"
`10`	`10`	`},`
`11`	`11`	`"6.0+-nosrc": {`
`12`	`12`	`"pattern": "^(?<timestamp>\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z\|[-+]\\d{2}:\\d{2})) (?<level>\\w+)(?:\\(\\d+\\)+)? (?<prc>[\\w\\-]+)\\[(?<tid>\\w+)\\]:? \\[(?:opI(?:D\|d)=(?<opid>[^\\]]+))\\]\\s(?<body>.)$"`
`@@ -361,4 +361,4 @@`
`361`	`361`	`}`
`362`	`362`	`]`
`363`	`363`	`}`
`364`		`-}`
	`364`	`+}`