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
Jordan Sissel
4886dc1e3c Add sinatra gem. This was accidentally removed in a previous commit. 
This fixes 'bin/logstash web' to run correctly (was broken in an earlier
1.4.0 beta)
 2014-03-12 14:51:00 -07:00
Jordan Sissel
68d139ea09 Merge pull request #1164 from jordansissel/LOGSTASH-1918 
Add missing 'rack' gem
 2014-03-12 14:03:24 -07:00
Jordan Sissel
e5383f28ce Add test coverage for LOGSTASH-1918 2014-03-12 14:02:05 -07:00
Jordan Sissel
15558b1e28 Add 'rack' gem back in 
This is required for 'logstash web' to serve Kibana and was
removed accidentally.

This fixes LOGSTASH-1918
 2014-03-12 14:01:54 -07:00
Jordan Sissel
83ab14983a Actually clear GEM_PATH 
This helps ensure we provide only our own gem directory for rubygems.

Helps improve LOGSTASH-1918. Before this patch, my local ruby install
was accidentally providing 'rack' so I never noticed this problem.
 2014-03-12 14:00:23 -07:00
Jordan Sissel
cd1f529867 Merge pull request #1161 from rtkmhart/master 
Fix event::overwrite to copy timestamp properly
 2014-03-11 10:09:53 -07:00
Michael Hart
2435c63770 updates as per code review 2014-03-11 11:42:39 -04:00
Michael Hart
ef816ae23c Fix event::overwrite to copy timestamp properly 2014-03-11 11:16:37 -04:00
Darren Holloway
b783f9ded8 Fix bug LOGSTASH-1225 "Cannot Clone Fixnum" 
The clone {} filter will throw an exception if any of the values in the
    event map are numbers. Problem is that numbers are not clonable.

    This is a single-line fix that wraps the .clone call in a try block and
    does a simple set-by-value if the clone raises an exception.

    Included under spec/filters/clone.rb is a test case that fails without
    the change in lib/logstash/event.rb and passes with the fix applied.
 2014-03-08 13:54:54 -08:00
Colin Surprenant
d9ad5b7930 explicit return for explicit explicitness 2014-03-07 20:44:48 -05:00
Colin Surprenant
5e01c52731 actually encode to UTF-8 when input charset is non UTF-8 + basic specs 2014-03-07 19:35:47 -05:00
Greg Mefford
ffe8166288 json_lines codec documentation is special since it isn't used with the file input. 
Also fixed formatting issues with the config examples in the synopsis section.
 2014-03-06 00:22:02 -05:00
Greg Mefford
e9291f3fe4 bluecloth is needed to build the docs 2014-03-06 00:14:08 -05:00
Kurt Hurtado
fa27dc9fcf Merge pull request #1149 from mv/json-silly-fix 
Json silly fix
 2014-03-05 18:07:36 -08:00
Marcus Vinicius Ferreira
22a5a71dea Comment fixed (there is no 'data' field in the example :P ) 2014-03-05 21:55:58 -03:00
Marcus Vinicius Ferreira
53d83f10bb README.md as '0644' 2014-03-05 21:53:11 -03:00
Colin Surprenant
5ed9c5e0ff fix handling of more than 2 repetitions of same mail header 2014-02-28 17:33:57 -05:00
Kurt Hurtado
b06679c993 Merge pull request #1106 from kurtado/doc/output/graphite 
Doc/output/graphite
 2014-02-28 12:03:06 -08:00
Kurt Hurtado
1566e3b0e8 Merge pull request #1115 from kurtado/doc/filter/geoip 
geoip touchup
 2014-02-28 12:01:58 -08:00
Kurt Hurtado
97c80115e8 Merge pull request #1130 from kurtado/doc/input/gelf 
gelf input docs
 2014-02-28 12:01:36 -08:00
Kurt Hurtado
24ee1cdcb3 Merge pull request #1129 from kurtado/doc/output/gelf 
For you Graylog2 fans out there
 2014-02-28 12:01:24 -08:00
Kurt Hurtado
f858e1d962 Merge pull request #1131 from kurtado/doc/input/elasticsearch 
elasticsearch input
 2014-02-28 12:01:12 -08:00
Kurt Hurtado
76cd72f98b Merge pull request #1135 from kurtado/doc/output/nagios 
alert: nagios
 2014-02-28 12:00:59 -08:00
Aaron Mildenstein
4245c41d0c Merge pull request #1140 from untergeek/1.4.x 
Updated CHANGELOG
 2014-02-28 13:58:44 -06:00
Aaron Mildenstein
da13a74978 Updated CHANGELOG 2014-02-28 13:57:56 -06:00
Jordan Sissel
ad6f681486 Try more times to fetch from rubygems.org 
Of the last 14 build failures, 6 of them were because of bad_record_mac.
Hopefully retrying more will work around this.
 2014-02-28 11:56:43 -08:00
Aaron Mildenstein
ddadb011fb Merge pull request #1139 from untergeek/master 
Prepare for version bump
 2014-02-28 13:21:48 -06:00
Aaron Mildenstein
9134b32301 Prepare for version bump 2014-02-28 13:15:57 -06:00
Jordan Sissel
d8f52e20dc Merge pull request #1138 from jordansissel/add-elasticsearch-gem 
Add elasticsearch rubygem
 2014-02-28 10:26:56 -08:00
Jordan Sissel
8d91f7edaa Add elasticsearch rubygem 
This is used in the new http support of elasticsearch output.
 2014-02-28 10:26:06 -08:00
Kurt Hurtado
89c2280075 alert: nagios 2014-02-27 16:28:54 -08:00
Jordan Sissel
fd0073dfef Merge pull request #1134 from jordansissel/add-env-command 
Add 'env' command
 2014-02-27 15:55:13 -08:00
Jordan Sissel
28c67bdcdc Add 'env' command 
This aims to let developers run arbitrary commands with the logstash
environment setup (env vars for RUBYLIB, GEM_HOME, etc)
 2014-02-27 15:51:19 -08:00
Jordan Sissel
dfe7dafe69 Merge pull request #1133 from jordansissel/LOGSTASH-1898 
Update gemfile locks for various rubies.
 2014-02-27 14:28:24 -08:00
Jordan Sissel
94fe7a4d01 Update gemfile locks for various rubies. 
Notable changes for JRuby:
* atomic 1.1.14-java -> 1.1.15-java
* aws-sdk 1.29.0 -> 1.35.0
* backports 3.3.5 -> 3.6.0
* bindata 1.6.0 -> 2.0.0
* cinch 2.0.10 -> 2.1.0
* docile 1.1.1 -> 1.1.3
* faraday 0.8.8 -> 0.9.0
* geoip 1.3.3 -> 1.3.5
* metaclass 0.0.1 -> 0.0.4
* metriks 0.9.9.5 -> 0.9.9.6
* minitest 5.0.8 -> 5.3.0
* msgpack-jruby 1.3.2-java -> 1.4.0-java
* multi_json 1.8.2 -> 1.8.4
* multipart-post 1.2.0 -> 2.0.0
* murmurhash3 0.1.3 -> 0.1.4
* nokogiri 1.6.0-java -> 1.6.1-java
* polyglot 0.3.3 -> 0.3.4
* redis 3.0.6 -> 3.0.7
* thread_safe 0.1.3-java -> 0.2.0-java
* user_agent_parser 2.1.1 -> 2.1.2
* xml-simple 1.1.2 -> 1.1.3
 2014-02-27 14:23:28 -08:00
Jordan Sissel
016945106a Merge pull request #1132 from untergeek/untergeek-pkgbuild 
Clean up old jar stuff
 2014-02-27 14:04:37 -08:00
Aaron Mildenstein
8cfc496699 Clean up old jar building code... 2014-02-27 15:50:58 -06:00
Aaron Mildenstein
aad144f801 No longer making the flatjar. 2014-02-27 15:44:10 -06:00
Kurt Hurtado
6e80b2d13f elasticsearch input 2014-02-27 13:14:36 -08:00
Kurt Hurtado
482a96eadf escape underscores 2014-02-27 00:19:24 -08:00
Kurt Hurtado
75f3214f65 additional fields, underscores 2014-02-27 00:13:14 -08:00
Kurt Hurtado
e2818ac884 gelfin 2014-02-27 00:03:43 -08:00
Kurt Hurtado
56edca98d9 Repeat after me: Logstash is a proper noun. 2014-02-26 18:04:35 -08:00
Kurt Hurtado
8c8ed3fb87 For you Graylog2 fans out there 2014-02-26 18:01:55 -08:00
Jordan Sissel
6c70d9926d Merge pull request #1128 from miah/whitespace 
clean trailing whitespace in elasticsearch output modules.
 2014-02-26 10:29:39 -08:00
Miah Johnson
ec5533d486 clean trailing whitespace. 2014-02-26 10:02:50 -08:00
Jordan Sissel
e23b09f1d0 Merge pull request #1126 from kurtado/1.4.x-changelog 
1.4.x changelog
 2014-02-26 09:10:40 -08:00
Richard Pijnenburg
c67e0f8a92 Merge pull request #1125 from fayep/deb73awkfix 
Fix for the awk version in debian 7.3 (by not using awk)
 2014-02-26 12:22:23 +00:00
Lorenzo González
7bbb594f73 Change [A|a] by [Aa], etc. 2014-02-26 10:26:49 +01:00
Kurt Hurtado
3287135cb0 credit where credit is due 2014-02-25 22:04:30 -08:00