diff --git a/LogShark/Plugins/Backgrounder/BackgrounderEventParser.cs b/LogShark/Plugins/Backgrounder/BackgrounderEventParser.cs index e0fc021..d18fdbe 100644 --- a/LogShark/Plugins/Backgrounder/BackgrounderEventParser.cs +++ b/LogShark/Plugins/Backgrounder/BackgrounderEventParser.cs @@ -37,9 +37,11 @@ public class BackgrounderEventParser private static readonly Regex NewBackgrounderRegex = // 10.4+ // 10.4 added "job type" and 10.5 added "local request id", either of which may be empty and thus are marked optional here + // 2024.2 added optional "pid" to match 2024.2, and made ts_offset more exclusionary new Regex(@"^ (?\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}.\d{3}) - \s(?[^\s]+) + \s(?[-|+]\d+?) + \s?(?\d+)? \s\((?[^,]*), (?[^,]*), (?[^,]*), (?[^,]*), (?[^,]*), :?(?[^,]*) ,(?[^\s]*)\) \s?(?[^\s]*)? \s(?[^\s]*) diff --git a/LogShark/Plugins/ClusterController/ClusterControllerPlugin.cs b/LogShark/Plugins/ClusterController/ClusterControllerPlugin.cs index e1d2b42..45c4846 100644 --- a/LogShark/Plugins/ClusterController/ClusterControllerPlugin.cs +++ b/LogShark/Plugins/ClusterController/ClusterControllerPlugin.cs @@ -213,9 +213,11 @@ private void ProcessZookeeperLine(LogLine logLine) private IWriter _zkErrorWriter; private IWriter _zkFsyncLatencyWriter; + // 2024.2 added optional "pid" to match 2024.2 private static readonly Regex _clusterControllerLogsRegex = new Regex(@"^ (?\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}.\d{3})\s (?.+?)\s + ?(?\d+)?\s (?.*?)\s (?[A-Z]+)(\s+) :\s @@ -245,6 +247,7 @@ private void ProcessZookeeperLine(LogLine logLine) private static readonly Regex _zookeeperRegex = new Regex(@"^ (?\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}.\d{3})\s (?.+?)\s + ?(?\d+)?\s (?.*?)\s :\s (?[A-Z]+)(\s+) diff --git a/LogShark/Plugins/Filestore/FilestorePlugin.cs b/LogShark/Plugins/Filestore/FilestorePlugin.cs index 74e5f1a..bb67276 100644 --- a/LogShark/Plugins/Filestore/FilestorePlugin.cs +++ b/LogShark/Plugins/Filestore/FilestorePlugin.cs @@ -20,11 +20,12 @@ public class FilestorePlugin : IPlugin private IWriter _writer; private IProcessingNotificationsCollector _processingNotificationsCollector; - + // 2024.2 added optional "pid" to match 2024.2 private readonly Regex _regex = new Regex(@"^ (?\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}.\d{3})\s (?.+?)\s + ?(?\d+)?\s (?.*?)\s+ (?[A-Z]+)(\s+) :\s diff --git a/LogShark/Plugins/SearchServer/SearchServerPlugin.cs b/LogShark/Plugins/SearchServer/SearchServerPlugin.cs index 3983d6c..997930d 100644 --- a/LogShark/Plugins/SearchServer/SearchServerPlugin.cs +++ b/LogShark/Plugins/SearchServer/SearchServerPlugin.cs @@ -15,9 +15,11 @@ public class SearchServerPlugin : IPlugin private IWriter _writer; private IProcessingNotificationsCollector _processingNotificationsCollector; + // 2024.2 added optional "pid" to match 2024.2 private readonly Regex _regex = new Regex(@"^ (?\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}.\d{3})\s (?.+?)\s + ?(?\d+)?\s \((?.*?), (?.*?), (?.*?), (?.*?)\)\s (?.*?)\s :\s diff --git a/LogShark/Plugins/SharedRegex.cs b/LogShark/Plugins/SharedRegex.cs index 1d49092..0e6614e 100644 --- a/LogShark/Plugins/SharedRegex.cs +++ b/LogShark/Plugins/SharedRegex.cs @@ -4,9 +4,11 @@ namespace LogShark.Plugins { public static class SharedRegex { + // 2024.2 added optional "pid" to match 2024.2, and made ts_offset more exclusionary public static readonly Regex JavaLogLineRegex = new Regex(@"^ (?\d{4}-\d{2}-\d{2}\s\d{2}:\d{2}:\d{2}.\d{3})\s - (?[^\s]+?)\s + (?[-|+]\d+)\s + ?(?\d+)?\s \((?[^,]*?), (?[^,]*?), (?[^,]*?), (?[^,\)]*?) (,(?[^\)]*?))?\)\s (?[^\s]*?)\s (?[^:]*?)?:\s