Rainer Gerhards
e082cb0742
bugfix: mmjsonparse segfault if new-style config was used
2013-01-30 15:48:18 +01:00
Rainer Gerhards
84f959d4f0
Merge branch 'v7-stable'
2013-01-08 13:07:47 +01:00
Rainer Gerhards
bbb2066d17
bugfix: mmjsonparse errornously returned action error when no CEE cookie was present.
2013-01-08 12:49:02 +01:00
Rainer Gerhards
e581c3d26e
Merge branch 'v7-stable'
...
Conflicts:
doc/imptcp.html
plugins/mmjsonparse/mmjsonparse.c
plugins/mmnormalize/mmnormalize.c
2012-11-28 10:19:29 +01:00
Rainer Gerhards
d9df6e9775
bugfix: modules not (yet) supporting new conf format were not properly registered
...
This lead to a "module not found" error message instead of
the to-be-expected "module does not support new style" error message.
That invalid error message could be quite misleading and actually stop
people from addressing the real problem (aka "go nuts" ;))
2012-11-28 10:02:08 +01:00
Rainer Gerhards
db6db9ce0d
mmjsonparse: support for v6+ config interface added
2012-11-01 17:22:23 +01:00
Miloslav Trmač
829b0639a0
Don't require the trailing space in @cee: cookie
...
The only mention of @cee: in the Lumberjack pages,
https://fedorahosted.org/lumberjack/wiki/FieldList doesn't have a space,
and libumberlog does not in fact generate one.
2012-10-11 18:19:06 +02:00
Rainer Gerhards
7a5cfb14ad
get rid of compiler warning
2012-10-02 15:53:17 +02:00
Rainer Gerhards
66e07f7b3e
cleanup
2012-10-02 15:41:58 +02:00
Rainer Gerhards
2ef5dd4739
mmjsonparse: also add MSG part of message if CEE-parsing fails
...
In that case, the CEE/lumberjack spec says MSG is NON-CEE and must
be treated accordingly. This means no JSON parsing happens. The case
is equal to missing CEE cookie.
Also adapted module to new interfaces provided by msg object.
2012-10-02 15:36:20 +02:00
Milan Bartos
0faec96283
Change mmjsonparse so non-json messages doesn't get lost from ceelog
...
modified: mmjsonparse.c
2012-10-02 15:26:09 +02:00
Rainer Gerhards
145c78b4fe
minor cleanup
2012-08-27 16:02:23 +02:00
Rainer Gerhards
6bb9c7c18e
milestone: first PoC for hierarchical data inside msg
2012-08-27 15:29:39 +02:00
Rainer Gerhards
66ab2a70e5
added message property parsesuccess to indicate status of higher level parser run
...
added message property parsesuccess to indicate if the last run
higher-level parser could successfully parse the message or not
(see property replacer html doc for details)
2012-03-15 17:25:26 +01:00
Rainer Gerhards
9053b30c6d
mmjsonparse: changed cookie back to @cee: after discussion with Balabit
2012-02-22 09:44:18 +01:00
Rainer Gerhards
6689756624
added mmjsonparse to support recognizing and parsing JSON enhanced syslog messages
2012-02-21 12:12:51 +01:00