Rainer Gerhards
2fbac28d3c
ommongodb: now writes a real timestamp into mongo
2012-03-30 09:55:45 +02:00
Rainer Gerhards
b88ba949f8
added "date-unixtimestamp" property replacer option to format as a unix timestamp
2012-03-29 18:04:12 +02:00
Brian Knox
3dccce084a
omhiredis: improved error reporting
2012-03-23 16:57:47 +01:00
Rainer Gerhards
da2039614f
cosmetic: pushing temp version up
2012-03-22 18:13:11 +01:00
Rainer Gerhards
1d6d534df2
unified use of $LocalHostIPIF among all locally-emitting inputs
...
with the exception of imdiag, which I humbly do not think needs this
capabilit (even counter-productive for testbench use).
2012-03-22 16:06:57 +01:00
Brian Knox
9ac054305a
omhiredis: error checking changes and code cleanup
2012-03-21 18:02:03 +01:00
Rainer Gerhards
49ec54d369
milestone: added capability to use a local interface IP address as fromhost-ip
...
... for locally originating messages. New directive $LocalHostIPIF.
Note that not all modules yet support this new directive - next step...
2012-03-21 11:43:45 +01:00
Rainer Gerhards
dbc2efa6be
do not provide weblink with meaningless (generic) error code
2012-03-21 11:35:23 +01:00
Rainer Gerhards
2a0fb1f755
omhiredis: some more cleanup
...
- C++ comments to C comment style (some compilers need that)
- removed some left-over from the copy template (was even not needed there ;))
2012-03-21 08:22:09 +01:00
Rainer Gerhards
b5fbc4e1aa
Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog
2012-03-21 08:18:07 +01:00
Rainer Gerhards
fcd2e036bc
omhiredis: some cleanup
2012-03-21 08:13:36 +01:00
Rainer Gerhards
151687347c
omhiredis: some cleanup
2012-03-21 08:08:34 +01:00
Brian Knox
1262b90373
initial shot at omhiredis
2012-03-21 07:40:43 +01:00
Rainer Gerhards
cacb817fa3
Merge branch 'v5-stable-newstats' into v5-devel
...
Conflicts:
ChangeLog
plugins/imptcp/imptcp.c
2012-03-20 16:52:58 +01:00
Rainer Gerhards
c6714bc496
added configuration directive to disable octet-counted framing
...
for imptcp, directive is $InputPTCPServerSupportOctetCountedFraming
2012-03-20 14:11:18 +01:00
Rainer Gerhards
8aa7784e3d
ommongodb: working on error reporting
2012-03-20 12:56:27 +01:00
Rainer Gerhards
e0d69d3e10
ommongodb: basic error reporting
2012-03-20 12:11:38 +01:00
Rainer Gerhards
2ee2cff538
Merge branch 'v5-stable-newstats' into v5-devel
...
Conflicts:
ChangeLog
plugins/imtcp/imtcp.c
tcpsrv.h
2012-03-19 18:10:20 +01:00
Rainer Gerhards
4fb7ba113c
added configuration directive to disable octet-counted framing
...
... for imtcp, directive is $InputTCPServerSupportOctetCountedFraming
2012-03-19 15:28:25 +01:00
Rainer Gerhards
bc29adfa8d
ommongodb: support for lumberjack base schema
...
... as far as I currently see the mapping ;)
2012-03-19 09:55:19 +01:00
Rainer Gerhards
dd77089b5c
ommongodb: moved over to MSG based interface
...
Access to the message permits us to do "the right thing" when it comes
to populating the lumberjack schema. Support for custom templates will
be added as soon as the template system is ready to properly support
name/value passing.
2012-03-19 08:24:34 +01:00
Rainer Gerhards
140fbd5758
action cfg: do no longer require template for TPL_AS_MSG passing mode
2012-03-19 07:29:39 +01:00
Rainer Gerhards
53a5f00046
ommongodb: cleanup
2012-03-18 13:17:07 +01:00
Brian Knox
3e008a14ba
ommongodb: moved field set a bit towards CEE
2012-03-18 13:09:52 +01:00
Rainer Gerhards
488a4a69e3
ommongodb: honor db and collection config parameters
2012-03-17 19:02:21 +01:00
Rainer Gerhards
db02f8e148
Merge branch 'v6-stable'
2012-03-17 18:35:24 +01:00
Rainer Gerhards
5cf53628ac
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-03-17 18:35:07 +01:00
Rainer Gerhards
59c99b2d8b
bugfix: memory leak in array passing output module mode
2012-03-17 18:31:14 +01:00
Rainer Gerhards
68614b3481
bugfix: memory leak in array passing output module mode
2012-03-17 18:24:25 +01:00
Rainer Gerhards
cb4bc708b1
Merge branch 'v6-stable'
...
Conflicts:
plugins/imuxsock/imuxsock.c
runtime/queue.c
runtime/queue.h
2012-03-17 17:50:45 +01:00
Rainer Gerhards
f6434d87c4
ommongodb: support for v6 config system added
2012-03-16 18:12:59 +01:00
Rainer Gerhards
62b7a1b8a8
added "json" property replacer option
2012-03-16 08:21:12 +01: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
43607c303c
preparing for 5.8.9
2012-03-15 11:30:33 +01:00
Kaiwang Chen
f62031df11
added tool to recover disk queue if .qi file is missing (recover_qi.pl)
2012-03-15 10:58:40 +01:00
Rainer Gerhards
d94ba2a546
Merge branch 'v5-stable' into v6-stable
2012-03-14 13:56:56 +01:00
Rainer Gerhards
1d0dec9b0c
Merge branch 'v5-stable-newstats' into v5-devel
...
Conflicts:
configure.ac
2012-03-14 13:53:25 +01:00
Rainer Gerhards
7d516b0a6c
added missing initialization of stats counters
...
this was necessary due to refactoring of the stats subsystem ... but
should have been done in the first place when this code was written.
Thanks to Kaiwang Chen for his analysis of the stats subsystem, which
ultimately lead to this patch!
2012-03-14 13:51:18 +01:00
Rainer Gerhards
e482c13b50
Merge branch 'v5-stable' into v5-stable-newstats
...
Conflicts:
plugins/imuxsock/imuxsock.c
runtime/queue.c
runtime/queue.h
2012-03-14 13:44:35 +01:00
Rainer Gerhards
e6aaf19689
changed statsobj interface and added better doc
2012-03-14 12:50:21 +01:00
Rainer Gerhards
32df7bf254
Merge branch 'v6-stable'
...
Conflicts:
runtime/queue.c
2012-03-12 17:11:59 +01:00
Rainer Gerhards
0b5fe246b5
Merge branch 'v5-stable' into v6-stable
...
Conflicts:
ChangeLog
configure.ac
doc/manual.html
2012-03-12 17:03:51 +01:00
Rainer Gerhards
2c7604f45b
cosmetic: removed stray definition
2012-03-12 17:01:44 +01:00
Rainer Gerhards
f90675f33f
Merge branch 'v5-stable-newstats' into v5-devel
...
Conflicts:
ChangeLog
action.c
configure.ac
doc/imuxsock.html
doc/manual.html
runtime/queue.c
2012-03-12 17:00:21 +01:00
Rainer Gerhards
5ecfdad17e
bumped version number (of temp branch)
2012-03-12 16:56:51 +01:00
Rainer Gerhards
7d509d53df
ommongodb: milestone:refactored to use libmongo-client
...
which is waaaaaaay better than the 10gen client driver
2012-03-12 16:49:09 +01:00
Rainer Gerhards
74e09afd6d
Merge branch 'v5-stable' into v5-stable-newstats
2012-03-12 16:12:40 +01:00
Rainer Gerhards
16cc84fc69
bugfix: stopped DA queue was never processed after a restart
...
...due to a regression from statistics module.
2012-03-12 15:04:08 +01:00
Rainer Gerhards
50a94aa1c7
added capability to use a local interface IP address as fromhost-ip for imklog
2012-03-10 18:29:40 +01:00
Rainer Gerhards
68301c98db
imuxsock did ignore configured IP if - always used eth0 if one was set ;)
2012-03-10 18:22:14 +01:00
