Merge pull request #6601 from OpenNMS/NMS-16114

NMS-16114: Update Instrumentation log regex for IPv6
OpenNMS · Sep 8, 2023 · 5dc2145 · 5dc2145
2 parents e128318 + afdceb2
commit 5dc2145
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/features/instrumentationLogReader/src/main/java/org/opennms/util/ilr/ServiceCollector.java b/features/instrumentationLogReader/src/main/java/org/opennms/util/ilr/ServiceCollector.java
@@ -56,7 +56,7 @@ public String getServiceID() {
         return m_serviceID;
     }
 
-    private static final String SERVICE_ID_REGEX = "([^/]+)/(\\d+)/(\\d+.\\d+.\\d+.\\d+)/([\\w-_]+)"; // Should be consistent with BaseLogMessage.s_regexp
+    private static final String SERVICE_ID_REGEX = "([^/]+)/(\\d+)/(\\d+.\\d+.\\d+.\\d+|[0-9a-fA-F:]+)/([\\w-_]+)"; // Should be consistent with BaseLogMessage.s_regexp
     private static final Pattern SERVICE_ID_PATTERN = Pattern.compile(SERVICE_ID_REGEX);	
 
     public void addMessage(LogMessage msg) {