rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-21 12:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
7,554 Commits 67 Branches 505 Tags
Commit Graph

51 Commits

Author SHA1 Message Date
Radu Gheorghe
16f54c33de added HTTPS option to omelasticsearch 2014-02-28 15:22:58 +02:00
Rainer Gerhards
8e2cfac506 Merge branch 'v7-devel' 
Conflicts:
	plugins/omelasticsearch/omelasticsearch.c
 2013-12-10 18:21:32 +01:00
Rainer Gerhards
d89d453e5f bugfix: omelasticsearch fail.es stats counter was improperly maitained 2013-12-10 18:13:16 +01:00
Rainer Gerhards
dbd0fe950a fix v8 output interface transaction begin handling 2013-10-31 09:07:29 +01:00
Rainer Gerhards
be11bb993e dev doc: add some info on how to access ES for testing 2013-10-30 18:25:57 +01:00
Rainer Gerhards
63edb11d37 omelasticsearch: upgrade to v8 ouptut module interface 
Note that this code here has NOT yet been tested.
 2013-10-30 18:12:32 +01:00
Rainer Gerhards
16207e3d55 bugfix: omelasticsearch did not compile on platforms without atomic instructions 2013-10-18 07:11:44 +02:00
Rainer Gerhards
2fcd6ea84b Merge branch 'v7-stable' 2013-10-16 18:03:23 +02:00
Rainer Gerhards
a4cdd70e71 bugfix: omelasticsearch: failed.es counter was only maintained in bulk mode 2013-10-16 18:03:00 +02:00
Rainer Gerhards
8d039081cf Merge branch 'v7-stable' 
Conflicts:
	plugins/omelasticsearch/omelasticsearch.c
 2013-10-16 17:51:40 +02:00
Rainer Gerhards
10dcb23ae5 bugfix: omelasticsearch: did not correctly initialize stats counters 
This usually did not lead to any problems, because they are in static
memory, which is initialized to zero by the OS when the plugin is
loaded. But it may cause problems especially on systems that do not
support atomic instructions - in this case the associated mutexes also
did not get properly initialized.
 2013-10-16 17:44:01 +02:00
Rainer Gerhards
75187bc183 omelasticsearch: add failed.httprequests stats counter 2013-10-16 17:41:01 +02:00
Rainer Gerhards
b9e19dc79b bugfix omelasticsearch: failed.http stats counter had incorrect count 2013-10-16 17:32:27 +02:00
Rainer Gerhards
c2dd607f9b omelasticsearch: straighten out statistics counters 
Conflicts:

	plugins/omelasticsearch/omelasticsearch.c
 2013-09-11 17:42:53 +02:00
Rainer Gerhards
80ac687eea omelasticsearch: straighten out statistics counters 2013-09-11 16:26:09 +02:00
Rainer Gerhards
de8d8b89a4 omelasticsearch: adapt to new stats subsystem extensions 2013-09-10 14:58:17 +02:00
Andre Lorbach
372c7264a5 Fixed another issue related to http://bugzilla.adiscon.com/show_bug.cgi?id=464 
Added check for empty batch data in endTransaction function.
Avoids sending an unneeded curlPost, can happen when elasticsearch is shutdown
while sending data to.
 2013-07-24 11:10:01 +02:00
Andre Lorbach
030e836070 Fixed a bug in curlPost related to http://bugzilla.adiscon.com/show_bug.cgi?id=464 
A Check was added for replylen before writting the 0 Byte to the end of reply data.
 2013-07-24 09:50:14 +02:00
Andre Lorbach
c1fbb18012 Fixed bugid #464 in elasticsearch output module 
Added some libcurl options in checkConn to disable the bodyport of the
request within this functions. Otherwise libcurl could have created a
sigsegv when curl_easy_perform() was called.
 2013-07-23 14:43:00 +02:00
Rainer Gerhards
ebdcba5a6a minor code reduction 2013-07-04 18:54:55 +02:00
Rainer Gerhards
80f8824298 bugfix: double-free in omelasticsearch 
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=461
Thanks to Marius Ionescu for providing a detailled bug report
 2013-07-02 11:48:52 +02:00
Jérôme Renard
2f68d5f0d8 omelasticsearch: _id field support for bulk operations 
also max number of templates for plugin use has been increased to five

closes: http://bugzilla.adiscon.com/show_bug.cgi?id=392
 2013-04-24 10:56:52 +02:00
Rainer Gerhards
29e8c99a7a Merge branch 'v7-stable-libnet-frag' 
Conflicts:
	ChangeLog
 2013-01-14 08:42:51 +01:00
Rainer Gerhards
614b1fba0a bugfix: omelasticsearch failed when authentication data was provided 
... at least in most cases it emitted an error message:
"snprintf failed when trying to build auth string"
Thanks to Joerg Heinemann for alerting us.
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=404
 2013-01-13 11:30:48 +01:00
Rainer Gerhards
3352d2c605 minor cleanup 2012-12-14 09:20:51 +01:00
Rainer Gerhards
0770630eca Merge branch 'v7-stable' 2012-12-13 18:52:31 +01:00
Michael Biebl
2ab69c6019 build: link omelasticsearch against -lm 
Use LT_LIB_M to find the math library which is needed for pow().
 2012-12-13 16:02:22 +01:00
Rainer Gerhards
206908e288 bugfix: invalid rsyslog-internal macro API use 
This had no bad effect, because the macro did the same as the one
that should have been used.
 2012-11-01 19:05:49 +01:00
Rainer Gerhards
e5ef73eb25 bugfix: invalid rsyslog-internal macro API use 
This had no bad effect, because the macro did the same as the one
that should have been used.
 2012-11-01 17:05:07 +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
cb12ed5dd2 omelasticsearch: improved debug logging 2012-07-30 13:06:44 +02:00
Rainer Gerhards
36f7fbd5f4 omelasticsearch: support for writing data errors to local file added 2012-07-30 12:40:49 +02:00
Rainer Gerhards
575686bd68 omelasticsearch: mileston: bulk reply is parsed 2012-07-30 11:01:11 +02:00
Rainer Gerhards
71121003e2 omelasticsearch: parse JSON response (in regard to data errors) 
note: bulkmode response processing is still mostly missing
 2012-07-25 18:30:18 +02:00
Rainer Gerhards
fdbc4cb666 omelasticsearch: regression from "parent" feature could case aborts 
this was not present in any released version
 2012-07-11 17:12:34 +02:00
Rainer Gerhards
68056a6128 omelasticsearch: support for parameters parent & dynparent added 2012-07-10 17:15:03 +02:00
Rainer Gerhards
4d453967cb omelasticsearch: implement retry via request to es server homepage 2012-07-10 12:10:34 +02:00
Rainer Gerhards
ebaf375ed1 omelasticsearch: better debug instrumentation 2012-07-09 17:28:40 +02:00
Rainer Gerhards
b0a3e85e10 omelasticsearch: bugfix: bulkmode setting was not properly initialized 2012-06-13 12:49:25 +02:00
Rainer Gerhards
0314f370a4 omelasticsearch: dyn index&type now also supported in bulk mode 2012-05-28 15:14:16 +02:00
Rainer Gerhards
5f85909b17 omelasticsearc: milestone, bulk insert basically works 
dynamic index&type is not yet used, but easy to add (did not manage
to get it in today...)
 2012-05-25 18:55:29 +02:00
Rainer Gerhards
c7ca67a375 omelasticsearch: test commit, first shot at bulk interface 
This obviously does not work correctly. So expect problems if you
set bulkmode="on".
 2012-05-25 08:03:19 +02:00
Rainer Gerhards
a4c0d08c78 omelasticsearch: added transactional interface & better debug output 2012-05-24 16:39:39 +02:00
Rainer Gerhards
54966fd878 omelasticsearch: provide authentication support (UNTESTED) 2012-04-25 15:05:01 +02:00
Rainer Gerhards
2eea95f626 Merge branch 'master' into master-elasticsearch 
Conflicts:
	plugins/omelasticsearch/omelasticsearch.c
 2012-04-23 14:51:34 +02:00
Rainer Gerhards
1acde66c32 make "old" omelasticsearch compile 
this module is to be replaced by branch currently in development. But I
want to be able to compile the previous one, at least ;)
 2012-04-16 17:46:46 +02:00
Rainer Gerhards
7d8ac48a4a omelasticsearch: added asnycRepl and timeout config params 2012-04-16 16:49:07 +02:00
Rainer Gerhards
f9bb245a4a omelasticsearch: permit dynamic index/type parameters (just like dynafile) 2012-04-13 12:12:39 +02:00
Rainer Gerhards
24179166f7 omelasticsearch: moved to v6 config system 2012-04-05 17:26:16 +02:00
Rainer Gerhards
9911dacf59 elasticsearch: move to asl 2.0 
email conversation Nathan/Rainer 2012-01-16&17
 2012-01-17 10:42:04 +01:00