100 Commits

Author SHA1 Message Date
Rainer Gerhards
42bfcef69a Merge branch 'master-lookup'
Conflicts:
	grammar/rainerscript.h
	runtime/rsyslog.h
2013-10-13 11:59:53 +02:00
hwoarang
1c71b9628b make rsyslog use the new json-c pkgconfig file if available 2013-09-03 11:38:01 +02:00
Rainer Gerhards
904c01bb8c add lookup table sekeleton to build system 2013-07-05 15:18:05 +02:00
Tomas Heinrich
b8133fb423 Remove redundat cflags and links to libraries
This prevents linking with libee, liblognorm and libgcrypt when not
necessary.
2013-05-20 21:32:50 +02:00
Michael Biebl
0cb6b47661 build: fix build if libgcrypt support is disabled
We don't want to hard-code `libgcrypt-config --libs` at various.
Also, make sure LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS are correctly
substituted.
2013-04-26 15:38:16 +02:00
John Lyman
0b42cf3fdc bugfix: build problems on Solaris
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=436
2013-04-25 10:28:08 +02:00
Rainer Gerhards
d2667671ad some minor additions to 7.3.11 2013-04-23 08:59:12 +02:00
Rainer Gerhards
7a62ef673f logenc: support keyfiles in rscryutil 2013-04-12 12:52:59 +02:00
Rainer Gerhards
078b010af6 log encryption: check length of "key" parameter 2013-04-11 09:57:18 +02:00
Rainer Gerhards
0cee769fcd log encryption: initial PoC implementation
rough baseline, needs to be extended for actual use.
2013-04-05 12:08:49 +02:00
Rainer Gerhards
cadf16e7e9 imudp: support user-selectable inputname 2013-03-26 11:12:10 +01:00
Rainer Gerhards
88be3a6795 Merge branch 'master-gt' 2013-03-25 18:54:21 +01:00
Rainer Gerhards
2155336436 fix: librsgt.h was not put in distribution tarball 2013-03-22 16:46:31 +01:00
Rainer Gerhards
28a34dab07 Merge branch 'master' of git+ssh://git.adiscon.com/git/rsyslog 2013-03-22 14:41:43 +01:00
Rainer Gerhards
010e08b0ac Merge branch 'v7-stable' 2013-03-22 10:09:26 +01:00
Rainer Gerhards
b631631caa Merge branch 'v6-stable' into v7-stable 2013-03-22 09:11:29 +01:00
Rainer Gerhards
908586ce95 Merge branch 'v5-stable' into v6-stable 2013-03-22 09:10:08 +01:00
Michael Biebl
6a6202e804 build-sys: Fix "update-systemd" target
The urls have changed.
2013-03-22 09:04:23 +01:00
Rainer Gerhards
4786aa9e9c logsig: add support to read signature files
... still incomplete ...
2013-03-07 15:45:13 +01:00
Rainer Gerhards
8f32f09d7e logsig: more interface plumbing 2013-03-05 12:52:28 +01:00
Rainer Gerhards
3a68c5cda8 logsig: build base plumbing for signature multi-provider interface 2013-03-05 11:55:02 +01:00
Rainer Gerhards
212af67757 logsigner: sign via merkle tree approach (still PoC, non production) 2013-02-21 11:29:22 +01:00
Rainer Gerhards
e711dc6e6b Merge branch 'master-ratelimit' 2012-10-30 14:59:01 +01:00
Rainer Gerhards
b11c85aac8 move cJSON to omelasticsearch
the rsyslog runtime itself now uses json-c, but omelasticsearch
currently depends on cJSON. We will change this, but not yet. Let's
merge as is and see that it works well ;)
2012-10-29 11:49:07 +01:00
Rainer Gerhards
e6424d4e52 Merge branch 'beta-jsonrt' into master-es
Conflicts:
	ChangeLog
	runtime/rsyslog.h
2012-10-29 10:25:06 +01:00
Rainer Gerhards
4269e45781 new ratelimit: interface plumbing added
no actual implementation yet done
2012-10-09 18:54:25 +02:00
Rainer Gerhards
200e08ac42 new ruleengine: some cleanup 2012-09-06 11:09:16 +02:00
Rainer Gerhards
7e725f41f8 add cJSON to rsyslog runtime 2012-07-25 12:14:24 +02:00
Rainer Gerhards
46605923a2 refactor: removing dead apc code
another concept that did not prove valuable enough to be kept active. For
the last couple of releases, the dead code was kept inside the project as
we thought we could probably reuse it. Doesn't look so...
2012-01-19 15:37:56 +01:00
Rainer Gerhards
3fe6365166 refactor: remove very old sync.[ch] system for "abstracting" mutex access
This was a bad idea that never was used much.
2012-01-19 15:24:16 +01:00
Rainer Gerhards
31900e004b more cleanup... 2011-07-11 15:36:05 +02:00
Rainer Gerhards
c809f8d1d9 more cleanup 2011-07-11 15:28:16 +02:00
Rainer Gerhards
84f217e87d cleanup, removing now unused code 2011-07-11 15:07:56 +02:00
Rainer Gerhards
d9ea755214 milestone/[PARTWORK]: implemented comparison operations 2011-07-08 09:13:39 +02:00
Rainer Gerhards
4fcfea31e3 milestone/[NONWORKING]: first integration of new parser, rules are not yet handled 2011-07-06 11:32:54 +02:00
Rainer Gerhards
2b9e5ac193 added a first implementation of a DNS name cache
this still has a couple of weaknesses, like no size limit, no expiration
of entries, suboptimal algorithms -- but it should perform better than
what we had previously. Implementation will be improved based on
feedback during the next couple of releases
2011-06-06 16:41:55 +02:00
Rainer Gerhards
c0d1334f6e step: imtcp moved to new config interface
as far as we know that new interface right now ;)
2011-05-05 11:36:05 +02:00
Rainer Gerhards
115b15a568 shuffled even more config code from syslgod to config handler 2011-04-26 17:10:36 +02:00
Rainer Gerhards
f72bde2f70 milestone: templates are now in config object 2011-04-19 09:43:36 +02:00
Rainer Gerhards
bbe1f2688c renaming conf.* wasn't a good idea -- undoing
too many dependencies, things get cluttered (and merging probably
gets problematic). Now new config will be "conf2".
2011-04-19 08:24:25 +02:00
Rainer Gerhards
e1c34e1741 renamed conf.c to legacyconf.c to make room for new config system 2011-04-19 07:53:23 +02:00
Rainer Gerhards
cbfa21f823 mmnormalize loads & runs (basic testing done) 2010-12-01 09:37:13 +01:00
Rainer Gerhards
44300ddcb2 Merge branch 'v5-beta' into v5-devel
Conflicts:
	ChangeLog
	configure.ac
	doc/imfile.html
	plugins/imfile/imfile.c
	runtime/rsyslog.h
2010-11-25 17:43:51 +01:00
Rainer Gerhards
a3c81f500a bugfix: replacements for atomic operations for non-int sized types had problems.
At least one instance of that problem could potentially lead
to abort (inside omfile).
2010-11-25 17:20:55 +01:00
Rainer Gerhards
e40cb595a2 omhdfs: support for HUP added 2010-10-04 13:58:41 +02:00
Rainer Gerhards
c7e36e6b7e build system: fixed some minor issues 2010-09-28 18:12:40 +02:00
Rainer Gerhards
d748c68c09 added some generic hashtable code by Christopher Clark
found at http://www.cl.cam.ac.uk/~cwc22/hashtable/
2010-09-28 11:32:48 +02:00
Rainer Gerhards
e86cb62f12 improved statistics-gathering subsystem
... well, actually this is a first real implementation of this subsystem.
I have added a counter registry, a way to access the countres (as readable
string) and a way to define and maintem them. Also, module impstats has
been updated to utilize the new system. Finally, I added some counters. I
hope that this sets the baseline for useful future enhancements.
2010-09-13 15:43:56 +02:00
Rainer Gerhards
21a2672222 moved systemd interface to rsyslog convenience lib
Mostly a refresh of sd-daemon.[ch] from its source plus some make file changes.
We now have systemd interfaces inside rsyslog, so that all plugins interested can
call the interfaces. Seems not to be totally necessary right now, but will help
in the long term.
2010-09-08 12:46:03 +02:00
Lennart Poettering
4132799268 acquire /dev/log socket optionally from systemd 2010-09-07 13:06:04 +02:00