github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-22 05:37:21 -04:00
Code Issues Projects Releases Packages Wiki Activity
3200 commits 254 branches 379 tags 173 MiB
Commit graph

3200 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Turnbull
5f42eb99f7 Added support for all Nagios statuses in output 
Previously the nagios output only supported issuing:

* WARNING, or
* CRITICAL

for check results.

This commit adds support a config option, nagios_level, which
defaults to CRITICAL and can be overriden by the "nagios_level"
field in an event.
 2012-12-31 17:35:08 -05:00
Jordan Sissel
50268de3b0 Merge pull request #297 from jamtur01/exttypo 
Fixed typo in jar -uf command line
 2012-12-31 14:31:35 -08:00
James Turnbull
967553ccd0 Fixed typo in jar -uf command line 2012-12-31 17:09:13 -05:00
Jordan Sissel
73ff8123dd Merge pull request #292 from jamtur01/emailmatchdocs 
Some more docs for the email plugin match option
 2012-12-31 13:30:36 -08:00
Jordan Sissel
feb91bd8ac Merge pull request #296 from jamtur01/nagwarn 
Update nagios output to mention the nagios_level field
 2012-12-31 13:30:09 -08:00
James Turnbull
832a24391b Update nagios output to mention the nagios_level field 2012-12-31 14:14:09 -05:00
Jordan Sissel
959eca3f41 Merge pull request #295 from jamtur01/sqssnsdoc 
Minor docs fixes to SNS and SQS outputs
 2012-12-30 01:04:24 -08:00
James Turnbull
9112c442c0 Minor docs fixes to SNS and SQS outputs 2012-12-30 03:23:11 -05:00
Jordan Sissel
0136a42a17 Merge pull request #293 from jamtur01/fixsp 
Fixed some spelling and grammar in the juggernaut output
 2012-12-30 00:19:14 -08:00
Jordan Sissel
de33909cb5 Merge pull request #294 from jamtur01/0mqdoc 
Misc zeroQM doc fixes
 2012-12-30 00:18:34 -08:00
James Turnbull
82495c6659 Misc zeroQM doc fixes 2012-12-30 03:09:19 -05:00
James Turnbull
1c793bbd10 Fixed some spelling and grammar in the juggernaut output 2012-12-30 02:57:00 -05:00
Louis Zuckerman
9a4a96c302 Merge branch 'master' into cloudwatch-docs 2012-12-29 09:34:23 -05:00
Louis Zuckerman
994318c480 Merge remote-tracking branch 'remotes/logstash/master' 2012-12-29 09:10:58 -05:00
Jordan Sissel
80216bcbe2 - bump jruby to 1.7.1 
- bump elasticsearch to 0.20.2
 2012-12-28 14:40:39 -08:00
Jordan Sissel
3726ab7420 - fixed the ftw json dependency issue on json 1.6.5 2012-12-28 14:13:49 -08:00
Jordan Sissel
a59d3825d8 bump ftw version for new json dep set 2012-12-28 14:10:21 -08:00
Jordan Sissel
6cd45ea027 - purge json 1.6.5 manually until gembag supports dependency graphs 2012-12-28 13:45:37 -08:00
Louis Zuckerman
e185463416 Merge remote-tracking branch 'remotes/logstash/master' 2012-12-28 14:24:49 -05:00
Louis Zuckerman
323d873f76 Merge remote-tracking branch 'remotes/logstash/master' 2012-12-28 14:22:12 -05:00
Jordan Sissel
e5b338b186 - logstash/time was renamed to logstash/time_addon 2012-12-28 11:20:42 -08:00
James Turnbull
0b9d47ec5b Some more docs for the email plugin match option 2012-12-28 12:26:45 -05:00
Jordan Sissel
685fcb3910 Merge branch 'gdb-master' 2012-12-27 22:46:12 -08:00
Jordan Sissel
e1739b301a changelog maintenance 2012-12-27 22:44:26 -08:00
Jordan Sissel
c39e5a4e97 Merge branch 'master' of https://github.com/gdb/logstash into gdb-master 
Conflicts:
	patterns/ruby
 2012-12-27 22:25:05 -08:00
Jordan Sissel
13aa2b574f Merge branch 'pyrho-master' 2012-12-27 22:23:10 -08:00
Jordan Sissel
30e4c04d72 attribution 2012-12-27 22:13:34 -08:00
Jordan Sissel
5388d90e94 - fis term 2012-12-27 22:12:39 -08:00
Jordan Sissel
78372a6c74 Merge pull request #290 from jakecr/master 
Update Grok docs - add link to included in patterns.
 2012-12-27 22:08:43 -08:00
Jake Crosby
b7c10d999d Change patterns link to use current version 2012-12-28 18:54:57 +13:00
Jordan Sissel
ac1322e7b8 Merge pull request #291 from jamtur01/matchrequired 
The match option is required for the email output plugin
 2012-12-27 21:44:41 -08:00
James Turnbull
1e02e986ef The match option is required for the email output plugin 
Whilst modifying the plugin to support sendmail delivery
the requirement for the match option was removed.

The change was made in this commit:

ef28018494

This causes the email plugin to fail with the following error:

undefined method `each' for nil:NilClass

Tracing back to:

/opt/logstash/logstash.jar!/logstash/outputs/email.rb:173:in `receive'"

This commit reverts that change and marks the match option as
required.
 2012-12-28 00:38:52 -05:00
Louis Zuckerman
5d5c235dcd Updated cloudwatch output documentation comments 2012-12-27 23:32:29 -05:00
Louis Zuckerman
adc25a29ee Merge branch 'master' of git://github.com/logstash/logstash 2012-12-27 23:18:31 -05:00
Jake Crosby
9808aefca2 Update Grok docs - add link to included in patterns. 2012-12-28 16:37:00 +13:00
Jordan Sissel
c5801a7aa9 - rename 'id' -> 'document_id' 
- add document_id support to all elasticsearch outputs
 2012-12-27 17:21:45 -08:00
Jordan Sissel
17e1d38a12 - translate #240 by hand to a patch. Credit to Py Rho for the 
original implemenation.
 2012-12-27 16:50:19 -08:00
Jordan Sissel
3132c2a5fc Merge branch 'master' of https://github.com/invadersmustdie/logstash into invadersmustdie-master 2012-12-27 16:35:45 -08:00
Jordan Sissel
27afc97d22 more changelog maintenance 2012-12-27 16:35:26 -08:00
Jordan Sissel
ab6d971966 Merge pull request #286 from michaelgibson/master 
adding ability to define the event.id in a custom filter for the elasticsearch output. LOGSTASH-256
 2012-12-27 16:13:58 -08:00
Jordan Sissel
6055c77d85 Merge branch 'feature/cloudwatch' of https://github.com/semiosis/logstash into semiosis-feature/cloudwatch 
Conflicts:
	logstash.gemspec
 2012-12-27 16:02:33 -08:00
Jordan Sissel
44e9bb54b7 - style 2012-12-27 15:59:30 -08:00
Jordan Sissel
9bf5efdfcc Merge pull request #231 from bobtfish/fix_source_host 
Fix @source_host when it comes from json_event
 2012-12-27 15:51:24 -08:00
Jordan Sissel
1b160689a9 Merge pull request #289 from Fewbytes/anonymize 
Removed warn statements, replaced ipaddress with ipaddr
 2012-12-27 15:43:24 -08:00
Jordan Sissel
c00126f6b5 update changelog 2012-12-27 15:40:52 -08:00
Jordan Sissel
ff40032de2 - copy docs for match 2012-12-27 15:40:52 -08:00
Jordan Sissel
c217522eb8 Merge pull request #226 from nuvan/stompfix 
Fixed Stomp input plugin subscription method.
 2012-12-27 15:40:30 -08:00
Avishai Ish-Shalom
16cd88f060 Removed warn statements, replaced ipaddress with ipaddr 2012-12-28 01:15:27 +02:00
Jordan Sissel
46172d4efe Merge pull request #252 from arsenerei/master 
add experimental YAML configuration support
 2012-12-27 15:12:51 -08:00
Jordan Sissel
3a8e5bdb60 - clarify spec description 2012-12-27 14:51:01 -08:00