From f4ddbc051c3221033a4b7920841428c869c4f8a7 Mon Sep 17 00:00:00 2001
From: Aaron Blew <ablew@abmbp.iovation.com>
Date: Fri, 4 May 2012 16:02:25 -0700
Subject: [PATCH] Added UUID type Added {} to URIPATH and URIPARAM patterns

---
 patterns/grok-patterns | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/patterns/grok-patterns b/patterns/grok-patterns
index 18610f3a4..7b3576cdd 100644
--- a/patterns/grok-patterns
+++ b/patterns/grok-patterns
@@ -14,6 +14,7 @@ DATA .*?
 GREEDYDATA .*
 #QUOTEDSTRING (?:(?<!\\)(?:"(?:\\.|[^\\"])*"|(?:'(?:\\.|[^\\'])*')|(?:`(?:\\.|[^\\`])*`)))
 QUOTEDSTRING (?:(?<!\\)(?:"(?:\\.|[^\\"]+)*"|(?:'(?:\\.|[^\\']+)*')|(?:`(?:\\.|[^\\`]+)*`)))
+UUID [A-Fa-f0-9]{8}-(?:[A-Fa-f0-9]{4}-){3}[A-Fa-f0-9]{12}
 
 # Networking
 MAC (?:%{CISCOMAC}|%{WINDOWSMAC}|%{COMMONMAC})
@@ -38,9 +39,9 @@ URIPROTO [A-Za-z]+(\+[A-Za-z+]+)?
 URIHOST %{IPORHOST}(?::%{POSINT:port})?
 # uripath comes loosely from RFC1738, but mostly from what Firefox
 # doesn't turn into %XX
-URIPATH (?:/[A-Za-z0-9$.+!*'(),~:;#%_-]*)+
+URIPATH (?:/[A-Za-z0-9$.+!*'(){},~:;#%_-]*)+
 #URIPARAM \?(?:[A-Za-z0-9]+(?:=(?:[^&]*))?(?:&(?:[A-Za-z0-9]+(?:=(?:[^&]*))?)?)*)?
-URIPARAM \?[A-Za-z0-9$.+!*'(),~#%&/=:;_-]*
+URIPARAM \?[A-Za-z0-9$.+!*'(){},~#%&/=:;_-]*
 URIPATHPARAM %{URIPATH}(?:%{URIPARAM})?
 URI %{URIPROTO}://(?:%{USER}(?::[^@]*)?@)?(?:%{URIHOST})?(?:%{URIPATHPARAM})?