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

6066 commits

This branch
This branch
All branches
Author SHA1 Message Date
Kurt Hurtado
6cb9cf1fbc v1.0.4 beta2 CHANGELOG 2014-02-25 17:01:57 -08:00
Faye Salwin
981f0b9073 Fix for the awk version in debian 7.3 (by not using awk) 2014-02-25 16:52:04 -08:00
Jordan Sissel
4c2ae48432 Merge remote-tracking branch 'upstream/pull/1123' into 1.4.x 2014-02-25 13:16:34 -08:00
Jordan Sissel
6fd1d9163d Merge remote-tracking branch 'upstream/pull/1122' into 1.4.x 2014-02-25 13:15:25 -08:00
Jordan Sissel
9caf61f82c Merge remote-tracking branch 'upstream/pull/1121' into 1.4.x 2014-02-25 13:15:14 -08:00
Jordan Sissel
3d48027f76 Merge pull request #1123 from electrical/punct_to_fingerprint 
rename PUNCT to PUNCTUATION
 2014-02-25 12:52:34 -08:00
Richard Pijnenburg
5f698a21c9 rename PUNCT to PUNCTUATION 2014-02-25 21:46:40 +01:00
Jordan Sissel
38e408462c Merge pull request #1122 from electrical/punct_to_fingerprint 
Merging funct filter in fingerprint filter
 2014-02-25 12:45:48 -08:00
Richard Pijnenburg
6d1ffc3583 Merging funct filter in fingerprint filter 2014-02-25 21:41:47 +01:00
Richard Pijnenburg
0a4516b37e Merge pull request #1120 from jordansissel/relative-path-template-fix 
Use __FILE__-relative path for the default template.
 2014-02-25 20:08:27 +00:00
Richard Pijnenburg
e91dac1444 Merge pull request #1121 from electrical/update_es_jruby 
Update ES and jruby
 2014-02-25 20:06:38 +00:00
Richard Pijnenburg
736a89f972 Update ES and jruby 
Updating ES to 1.0.1
Updating Jruby to 1.7.11
 2014-02-25 21:05:31 +01:00
Jordan Sissel
806fea34b3 Use __FILE__-relative path for the default template. 
Users reported this (or similar) error:
Errno::ENOENT: No such file or directory -
lib/logstash/outputs/elasticsearch/elasticsearch-template.json

This is because the file being searched-for was relative to $PWD, not
relative to the elasticsearch output plugin file itself.

Tested works like this:

    % logstash/bin/logstash -e 'output { elasticsearch {  embedded => true } }'

Prior to this patch, the above command line would fail with this error:

    Errno::ENOENT: No such file or directory - lib/logstash/outputs/elasticsearch/elasticsearch-template.json
    ...
        get_template at /home/jls/projects/logstash/lib/logstash/outputs/elasticsearch.rb:285
 2014-02-25 12:04:35 -08:00
Jordan Sissel
18184d8b9c Merge pull request #1119 from jordansissel/readme-fixes 
- Remove link to Travis since we haven't used that in ages
 2014-02-25 11:14:28 -08:00
Jordan Sissel
f720f38bb5 - Remove link to Travis since we haven't used that in ages 
- Use 'Logstash' capitalization
 2014-02-25 11:13:47 -08:00
Jordan Sissel
e004fc845c Merge pull request #1107 from ciarand/patch-1 
Update README with new travis URL
 2014-02-25 11:12:39 -08:00
Richard Pijnenburg
375ca210ac Merge pull request #1103 from fayep/pkgbuilding 
Add tarball based packages. Fix environment passing in bin/logstash.
 2014-02-25 18:41:00 +00:00
Richard Pijnenburg
cc94abdc59 Merge pull request #1117 from logongas/master 
Not range in LOGLEVEL pattern em grok for Alert
 2014-02-25 10:44:32 +00:00
Richard Pijnenburg
b729144255 Merge pull request #974 from pputerla/master 
on broken pipes - ie program exit, EBADF can will be used instead of EPI...
 2014-02-25 09:59:32 +00:00
Richard Pijnenburg
6e9bd0b6eb Merge pull request #933 from awesometown/master 
Moved 'success' message into the begin block so it doesn't get printed if there's an error
 2014-02-25 09:57:59 +00:00
Richard Pijnenburg
f43bda7f4a Merge pull request #950 from AKoetsier/master 
Fixes exception when not specifying yamlmibdir
 2014-02-25 09:24:06 +00:00
Richard Pijnenburg
4e6d222677 Merge pull request #886 from tjrobinson/patch-1 
Fix problem in MONTHNUM and add DATESTAMP_EVENTLOG pattern
 2014-02-25 09:23:43 +00:00
Richard Pijnenburg
ab39172485 Merge pull request #957 from vincentbernat/feature/grok-rfc2822 
Add a RFC2822 compliant date pattern
 2014-02-25 09:23:22 +00:00
Richard Pijnenburg
2ac81f333f Merge pull request #1068 from jarsever/patch-1 
Update java
 2014-02-25 09:22:17 +00:00
Richard Pijnenburg
dd73e907bc Merge pull request #1069 from gswallow/master 
Add some patterns I found useful in parsing mongo logs.
 2014-02-25 09:22:00 +00:00
Richard Pijnenburg
cd2c61271a Merge pull request #1076 from mjr5749/patch-1 
Fix syntax errors in kv examples
 2014-02-25 09:21:47 +00:00
Richard Pijnenburg
4c488525b0 Merge pull request #1114 from colinsurprenant/getting_started_tutorial 
log files path into /tmp, added missing mutate + replace statements, bad syslogs for cut&paste
 2014-02-25 09:09:55 +00:00
Richard Pijnenburg
3fc3c820b6 Merge pull request #1116 from kurtado/doc/codec/rubydebug 
awesome description
 2014-02-25 09:07:38 +00:00
Lorenzo González
e5c94b14b7 Not range in Alert is | 2014-02-25 09:24:18 +01:00
Kurt Hurtado
679bba0f58 awesome description 2014-02-24 23:23:14 -08:00
Kurt Hurtado
30a469927c geoip touchup 2014-02-24 22:23:11 -08:00
Colin Surprenant
6ed923f0cf log files path into /tmp, added missing mutate + replace statements 2014-02-24 19:00:54 -05:00
Aaron Mildenstein
71e8432998 Merge pull request #1113 from untergeek/untergeek-binfix 
Fix for LOGSTASH-1920
 2014-02-24 17:46:33 -06:00
Jordan Sissel
2e5b082be9 Only abort on 'embedded => true' if we are *NOT* JRuby. 
As it turns out, programming is this terrible journey where we have
humans using some kind of silly error prone process whereby intent of
function is converted to instructions.

I am bad at programming sometimes.
 2014-02-24 15:41:36 -08:00
Aaron Mildenstein
74b8e99712 I yield. Going with unset CDPATH. May the odd user this affects forgive me now. 2014-02-24 17:41:28 -06:00
Aaron Mildenstein
bdfe096e47 Remove path from pwd 2014-02-24 17:33:50 -06:00
Aaron Mildenstein
455cb03fa6 Fix for LOGSTASH-1920 2014-02-24 17:26:43 -06:00
Aaron Mildenstein
4f369e77a6 Merge pull request #1112 from ronnocol/master 
Fix LOGSTASH-1936
 2014-02-24 17:21:12 -06:00
Lance O'Connor
040ae9f6a2 Plugin script failed because it was trying to gzip -dc ${TARGETDIR}${FILENAME}, 
This was missing a / between the directory and the filename, so it was trying to
uncompress: /opt/logstash/logstash-1.4.0.beta1/vendor/logstashlogstash-contrib-1.4.0.beta1.tar.gz

Changed to uncompress ${TARGET}, which is defined as: ${TARGETDIR}/${FILENAME}
 2014-02-24 23:11:06 +00:00
Faye Salwin
69d5fb3583 add recommended options to fpm for centos, which should negate the need to set executable 2014-02-24 14:21:01 -08:00
Faye Salwin
3537c6b847 Tarball packages. Homogenized init. Common defaults. 2014-02-24 14:21:01 -08:00
Aaron Mildenstein
d62bffe3aa Merge pull request #1111 from ronnocol/master 
Close LOGSTASH-1933:
 2014-02-24 15:24:56 -06:00
Lance O'Connor
0ba3cc2eb3 Fix the 2yyp typo, and properly attribute post_string to come *after* the event 2014-02-24 21:18:31 +00:00
Lance O'Connor
fe87534dd9 Modified syntax as per suggestion 2014-02-24 21:09:16 +00:00
Lance O'Connor
b3ccedc34a Close LOGSTASH-1933: 
Add two (2) new config stanzas to IRC output:

pre_string: Message you want emitted to IRC server before the event text
post_string: Message you want emitted to the IRC server after the event text

[12:32]  <logstash> This is a pre message
[12:32]  <logstash> This is the actual message
[12:32]  <logstash> Tis is a post message

In both cases, they are sent as seperate messages to the IRC server, leaving the
event text unmodified.

(N.B. My 1st real modification to the ruby codebase, so someone who knows ruby
should really validate I did this correctly.)
 2014-02-24 20:35:07 +00:00
Aaron Mildenstein
9e159c6a4c Merge pull request #1109 from ronnocol/master 
FIX for 1931: plugin script doesn't complete
 2014-02-24 13:17:31 -06:00
Lance O'Connor
b730a7f95d remove the exec fixing JIRA issue 1931 2014-02-24 17:58:09 +00:00
Lance O'Connor
9dff8f2e68 Merge remote-tracking branch 'upstream/master' 2014-02-24 17:09:19 +00:00
subsection
068078fde8 Added warning when registering insecure state 2014-02-24 16:52:35 +01:00
Aaron Mildenstein
8336ce60d3 Merge pull request #1 from pieterlexis/collectd-untergeek 
Add tests for the collectd codec
 2014-02-24 08:41:51 -06:00