Merge pull request #98 from r-duran/develop

Prevent Tokenizer filter to add _id to additional fields
Graylog2 · Oct 18, 2012 · f3a4e6e · f3a4e6e
2 parents 7b481d7 + c4540ba
commit f3a4e6e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/org/graylog2/filters/TokenizerFilter.java b/src/main/java/org/graylog2/filters/TokenizerFilter.java
@@ -70,7 +70,7 @@ public void filter(LogMessage msg, GraylogServer server) {
                     for (String part : parts) {
                         if (part.contains("=") && StringUtils.countMatches(part, "=") == 1) {
                             String[] kv = part.split("=");
-                            if (kv.length == 2 && p.matcher(kv[0]).matches() && !msg.getAdditionalData().containsKey("_" + kv[0])) {
+                            if (kv.length == 2 && p.matcher(kv[0]).matches() && !msg.getAdditionalData().containsKey("_" + kv[0]) && !kv[0].equals("id")) {
                                 msg.addAdditionalData(kv[0].trim(), kv[1].trim());
                                 extracted++;
                             }

diff --git a/src/test/java/org/graylog2/filters/TokenizerFilterTest.java b/src/test/java/org/graylog2/filters/TokenizerFilterTest.java
@@ -163,4 +163,14 @@ public void testFilterWithWhitespaceAroundKV() {
         assertEquals("v4", msg.getAdditionalData().get("_k4"));
     }
 
-}
+   @Test
+    public void testFilterWithIDAdditionalField() {
+        LogMessageImpl msg = new LogMessageImpl();
+        msg.setShortMessage("otters id=123 more otters");
+        TokenizerFilter f = new TokenizerFilter();
+        f.filter(msg, new GraylogServerStub());
+
+        assertEquals(false, msg.getAdditionalData().containsKey("_id"));
+    }
+
+}