From 541b673414b1983d341114686880e1186f07f53f Mon Sep 17 00:00:00 2001
From: Jordan Sissel <jls@semicomplete.com>
Date: Tue, 19 Nov 2013 09:11:32 -0800
Subject: [PATCH] Set the 'ruby code' encoding for all files to UTF-8. This has
 the effect that all string literals are UTF-8 now.

This was achieved with:
sed -i -e '1 { /^# encoding: utf-8/! { i # encoding: utf-8
} }' lib/logstash/**/*.rb
---
 lib/logstash/JRUBY-6970-openssl.rb                 | 1 +
 lib/logstash/JRUBY-6970.rb                         | 1 +
 lib/logstash/agent.rb                              | 1 +
 lib/logstash/codecs/base.rb                        | 1 +
 lib/logstash/codecs/compress_spooler.rb            | 1 +
 lib/logstash/codecs/dots.rb                        | 1 +
 lib/logstash/codecs/fluent.rb                      | 1 +
 lib/logstash/codecs/graphite.rb                    | 1 +
 lib/logstash/codecs/json.rb                        | 1 +
 lib/logstash/codecs/json_lines.rb                  | 1 +
 lib/logstash/codecs/json_spooler.rb                | 1 +
 lib/logstash/codecs/line.rb                        | 1 +
 lib/logstash/codecs/msgpack.rb                     | 1 +
 lib/logstash/codecs/multiline.rb                   | 1 +
 lib/logstash/codecs/netflow.rb                     | 1 +
 lib/logstash/codecs/netflow/util.rb                | 1 +
 lib/logstash/codecs/noop.rb                        | 1 +
 lib/logstash/codecs/oldlogstashjson.rb             | 1 +
 lib/logstash/codecs/plain.rb                       | 1 +
 lib/logstash/codecs/rubydebug.rb                   | 1 +
 lib/logstash/codecs/spool.rb                       | 1 +
 lib/logstash/config/config_ast.rb                  | 1 +
 lib/logstash/config/file.rb                        | 1 +
 lib/logstash/config/grammar.rb                     | 1 +
 lib/logstash/config/mixin.rb                       | 1 +
 lib/logstash/config/registry.rb                    | 1 +
 lib/logstash/errors.rb                             | 1 +
 lib/logstash/event.rb                              | 1 +
 lib/logstash/filters/advisor.rb                    | 1 +
 lib/logstash/filters/alter.rb                      | 1 +
 lib/logstash/filters/anonymize.rb                  | 1 +
 lib/logstash/filters/base.rb                       | 1 +
 lib/logstash/filters/checksum.rb                   | 1 +
 lib/logstash/filters/cidr.rb                       | 1 +
 lib/logstash/filters/cipher.rb                     | 1 +
 lib/logstash/filters/clone.rb                      | 1 +
 lib/logstash/filters/collate.rb                    | 1 +
 lib/logstash/filters/csv.rb                        | 1 +
 lib/logstash/filters/date.rb                       | 1 +
 lib/logstash/filters/dns.rb                        | 1 +
 lib/logstash/filters/drop.rb                       | 1 +
 lib/logstash/filters/environment.rb                | 1 +
 lib/logstash/filters/extractnumbers.rb             | 1 +
 lib/logstash/filters/gelfify.rb                    | 1 +
 lib/logstash/filters/geoip.rb                      | 1 +
 lib/logstash/filters/grep.rb                       | 1 +
 lib/logstash/filters/grok.rb                       | 1 +
 lib/logstash/filters/grokdiscovery.rb              | 1 +
 lib/logstash/filters/json.rb                       | 1 +
 lib/logstash/filters/json_encode.rb                | 1 +
 lib/logstash/filters/kv.rb                         | 1 +
 lib/logstash/filters/metaevent.rb                  | 1 +
 lib/logstash/filters/metrics.rb                    | 1 +
 lib/logstash/filters/multiline.rb                  | 1 +
 lib/logstash/filters/mutate.rb                     | 1 +
 lib/logstash/filters/noop.rb                       | 1 +
 lib/logstash/filters/prune.rb                      | 1 +
 lib/logstash/filters/railsparallelrequest.rb       | 1 +
 lib/logstash/filters/range.rb                      | 1 +
 lib/logstash/filters/ruby.rb                       | 1 +
 lib/logstash/filters/sleep.rb                      | 1 +
 lib/logstash/filters/split.rb                      | 1 +
 lib/logstash/filters/syslog_pri.rb                 | 1 +
 lib/logstash/filters/translate.rb                  | 1 +
 lib/logstash/filters/unique.rb                     | 1 +
 lib/logstash/filters/urldecode.rb                  | 1 +
 lib/logstash/filters/useragent.rb                  | 1 +
 lib/logstash/filters/uuid.rb                       | 1 +
 lib/logstash/filters/xml.rb                        | 1 +
 lib/logstash/filters/zeromq.rb                     | 1 +
 lib/logstash/filterworker.rb                       | 1 +
 lib/logstash/inputs/base.rb                        | 1 +
 lib/logstash/inputs/drupal_dblog.rb                | 1 +
 lib/logstash/inputs/drupal_dblog/jdbcconnection.rb | 1 +
 lib/logstash/inputs/elasticsearch.rb               | 1 +
 lib/logstash/inputs/eventlog.rb                    | 1 +
 lib/logstash/inputs/eventlog/racob_fix.rb          | 1 +
 lib/logstash/inputs/exec.rb                        | 1 +
 lib/logstash/inputs/file.rb                        | 1 +
 lib/logstash/inputs/ganglia.rb                     | 1 +
 lib/logstash/inputs/ganglia/gmondpacket.rb         | 1 +
 lib/logstash/inputs/ganglia/xdr.rb                 | 1 +
 lib/logstash/inputs/gelf.rb                        | 1 +
 lib/logstash/inputs/gemfire.rb                     | 1 +
 lib/logstash/inputs/generator.rb                   | 1 +
 lib/logstash/inputs/graphite.rb                    | 1 +
 lib/logstash/inputs/heroku.rb                      | 1 +
 lib/logstash/inputs/imap.rb                        | 1 +
 lib/logstash/inputs/irc.rb                         | 1 +
 lib/logstash/inputs/log4j.rb                       | 1 +
 lib/logstash/inputs/lumberjack.rb                  | 3 ++-
 lib/logstash/inputs/pipe.rb                        | 1 +
 lib/logstash/inputs/rabbitmq.rb                    | 1 +
 lib/logstash/inputs/rabbitmq/bunny.rb              | 1 +
 lib/logstash/inputs/rabbitmq/hot_bunnies.rb        | 1 +
 lib/logstash/inputs/redis.rb                       | 1 +
 lib/logstash/inputs/relp.rb                        | 1 +
 lib/logstash/inputs/s3.rb                          | 1 +
 lib/logstash/inputs/snmptrap.rb                    | 1 +
 lib/logstash/inputs/sqlite.rb                      | 1 +
 lib/logstash/inputs/sqs.rb                         | 1 +
 lib/logstash/inputs/stdin.rb                       | 1 +
 lib/logstash/inputs/stomp.rb                       | 1 +
 lib/logstash/inputs/syslog.rb                      | 1 +
 lib/logstash/inputs/tcp.rb                         | 1 +
 lib/logstash/inputs/threadable.rb                  | 1 +
 lib/logstash/inputs/twitter.rb                     | 1 +
 lib/logstash/inputs/udp.rb                         | 1 +
 lib/logstash/inputs/unix.rb                        | 1 +
 lib/logstash/inputs/varnishlog.rb                  | 1 +
 lib/logstash/inputs/websocket.rb                   | 1 +
 lib/logstash/inputs/wmi.rb                         | 1 +
 lib/logstash/inputs/xmpp.rb                        | 1 +
 lib/logstash/inputs/zenoss.rb                      | 1 +
 lib/logstash/inputs/zeromq.rb                      | 1 +
 lib/logstash/kibana.rb                             | 1 +
 lib/logstash/loadlibs.rb                           | 1 +
 lib/logstash/logging.rb                            | 1 +
 lib/logstash/monkeypatches-for-bugs.rb             | 1 +
 lib/logstash/monkeypatches-for-debugging.rb        | 1 +
 lib/logstash/monkeypatches-for-performance.rb      | 1 +
 lib/logstash/multiqueue.rb                         | 1 +
 lib/logstash/namespace.rb                          | 1 +
 lib/logstash/outputs/base.rb                       | 1 +
 lib/logstash/outputs/boundary.rb                   | 1 +
 lib/logstash/outputs/circonus.rb                   | 1 +
 lib/logstash/outputs/cloudwatch.rb                 | 1 +
 lib/logstash/outputs/datadog.rb                    | 1 +
 lib/logstash/outputs/datadog_metrics.rb            | 1 +
 lib/logstash/outputs/elasticsearch.rb              | 1 +
 lib/logstash/outputs/elasticsearch_http.rb         | 1 +
 lib/logstash/outputs/elasticsearch_river.rb        | 1 +
 lib/logstash/outputs/email.rb                      | 1 +
 lib/logstash/outputs/exec.rb                       | 1 +
 lib/logstash/outputs/file.rb                       | 1 +
 lib/logstash/outputs/ganglia.rb                    | 1 +
 lib/logstash/outputs/gelf.rb                       | 1 +
 lib/logstash/outputs/gemfire.rb                    | 1 +
 lib/logstash/outputs/google_cloud_storage.rb       | 1 +
 lib/logstash/outputs/graphite.rb                   | 1 +
 lib/logstash/outputs/graphtastic.rb                | 1 +
 lib/logstash/outputs/hipchat.rb                    | 1 +
 lib/logstash/outputs/http.rb                       | 1 +
 lib/logstash/outputs/irc.rb                        | 1 +
 lib/logstash/outputs/jira.rb                       | 1 +
 lib/logstash/outputs/juggernaut.rb                 | 1 +
 lib/logstash/outputs/librato.rb                    | 1 +
 lib/logstash/outputs/loggly.rb                     | 1 +
 lib/logstash/outputs/lumberjack.rb                 | 1 +
 lib/logstash/outputs/metriccatcher.rb              | 1 +
 lib/logstash/outputs/mongodb.rb                    | 1 +
 lib/logstash/outputs/nagios.rb                     | 1 +
 lib/logstash/outputs/nagios_nsca.rb                | 1 +
 lib/logstash/outputs/null.rb                       | 1 +
 lib/logstash/outputs/opentsdb.rb                   | 1 +
 lib/logstash/outputs/pagerduty.rb                  | 1 +
 lib/logstash/outputs/pipe.rb                       | 1 +
 lib/logstash/outputs/rabbitmq.rb                   | 1 +
 lib/logstash/outputs/rabbitmq/bunny.rb             | 1 +
 lib/logstash/outputs/rabbitmq/hot_bunnies.rb       | 1 +
 lib/logstash/outputs/redis.rb                      | 1 +
 lib/logstash/outputs/riak.rb                       | 1 +
 lib/logstash/outputs/riemann.rb                    | 1 +
 lib/logstash/outputs/s3.rb                         | 1 +
 lib/logstash/outputs/sns.rb                        | 1 +
 lib/logstash/outputs/solr_http.rb                  | 1 +
 lib/logstash/outputs/sqs.rb                        | 1 +
 lib/logstash/outputs/statsd.rb                     | 1 +
 lib/logstash/outputs/stdout.rb                     | 1 +
 lib/logstash/outputs/stomp.rb                      | 1 +
 lib/logstash/outputs/syslog.rb                     | 1 +
 lib/logstash/outputs/tcp.rb                        | 1 +
 lib/logstash/outputs/udp.rb                        | 1 +
 lib/logstash/outputs/websocket.rb                  | 1 +
 lib/logstash/outputs/websocket/app.rb              | 1 +
 lib/logstash/outputs/websocket/pubsub.rb           | 1 +
 lib/logstash/outputs/xmpp.rb                       | 1 +
 lib/logstash/outputs/zabbix.rb                     | 1 +
 lib/logstash/outputs/zeromq.rb                     | 1 +
 lib/logstash/pipeline.rb                           | 1 +
 lib/logstash/plugin.rb                             | 1 +
 lib/logstash/plugin_mixins/aws_config.rb           | 1 +
 lib/logstash/program.rb                            | 1 +
 lib/logstash/runner.rb                             | 1 +
 lib/logstash/sized_queue.rb                        | 1 +
 lib/logstash/test.rb                               | 1 +
 lib/logstash/threadwatchdog.rb                     | 1 +
 lib/logstash/time_addon.rb                         | 1 +
 lib/logstash/util.rb                               | 1 +
 lib/logstash/util/buftok.rb                        | 1 +
 lib/logstash/util/charset.rb                       | 1 +
 lib/logstash/util/fieldreference.rb                | 1 +
 lib/logstash/util/password.rb                      | 1 +
 lib/logstash/util/prctl.rb                         | 1 +
 lib/logstash/util/relp.rb                          | 1 +
 lib/logstash/util/require-helper.rb                | 1 +
 lib/logstash/util/socket_peer.rb                   | 1 +
 lib/logstash/util/zenoss.rb                        | 1 +
 lib/logstash/util/zeromq.rb                        | 1 +
 lib/logstash/version.rb                            | 1 +
 200 files changed, 201 insertions(+), 1 deletion(-)

diff --git a/lib/logstash/JRUBY-6970-openssl.rb b/lib/logstash/JRUBY-6970-openssl.rb
index 1d2d1b9a9..5c36288b1 100644
--- a/lib/logstash/JRUBY-6970-openssl.rb
+++ b/lib/logstash/JRUBY-6970-openssl.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # TODO(sissel): require "openssl" takes *ages* from the logstash jar
 # TODO(sissel): monkeypatch Kernel.require to apply this monkeypatch only after
 # a 'require "openssl" has occurred.
diff --git a/lib/logstash/JRUBY-6970.rb b/lib/logstash/JRUBY-6970.rb
index 95b6ee225..e8b9cbe39 100644
--- a/lib/logstash/JRUBY-6970.rb
+++ b/lib/logstash/JRUBY-6970.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Monkeypatch for JRUBY-6970
 module Kernel
   alias_method :require_JRUBY_6970_hack, :require
diff --git a/lib/logstash/agent.rb b/lib/logstash/agent.rb
index fd4e83e4d..eacce13d2 100644
--- a/lib/logstash/agent.rb
+++ b/lib/logstash/agent.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "clamp" # gem 'clamp'
 require "logstash/errors"
 require "i18n"
diff --git a/lib/logstash/codecs/base.rb b/lib/logstash/codecs/base.rb
index 8d3818401..e5041704d 100644
--- a/lib/logstash/codecs/base.rb
+++ b/lib/logstash/codecs/base.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/event"
 require "logstash/plugin"
diff --git a/lib/logstash/codecs/compress_spooler.rb b/lib/logstash/codecs/compress_spooler.rb
index fab0d3174..1e4f17bea 100644
--- a/lib/logstash/codecs/compress_spooler.rb
+++ b/lib/logstash/codecs/compress_spooler.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 
 class LogStash::Codecs::CompressSpooler < LogStash::Codecs::Base
diff --git a/lib/logstash/codecs/dots.rb b/lib/logstash/codecs/dots.rb
index a7c8e85b3..471e60dfb 100644
--- a/lib/logstash/codecs/dots.rb
+++ b/lib/logstash/codecs/dots.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 
 class LogStash::Codecs::Dots < LogStash::Codecs::Base
diff --git a/lib/logstash/codecs/fluent.rb b/lib/logstash/codecs/fluent.rb
index 8d46ee867..d1e6acd33 100644
--- a/lib/logstash/codecs/fluent.rb
+++ b/lib/logstash/codecs/fluent.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 require "logstash/util/charset"
 
diff --git a/lib/logstash/codecs/graphite.rb b/lib/logstash/codecs/graphite.rb
index ef2486193..fbf293d42 100644
--- a/lib/logstash/codecs/graphite.rb
+++ b/lib/logstash/codecs/graphite.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 require "logstash/codecs/line"
 require "json"
diff --git a/lib/logstash/codecs/json.rb b/lib/logstash/codecs/json.rb
index 109555799..fd097d21b 100644
--- a/lib/logstash/codecs/json.rb
+++ b/lib/logstash/codecs/json.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 require "logstash/codecs/line"
 require "json"
diff --git a/lib/logstash/codecs/json_lines.rb b/lib/logstash/codecs/json_lines.rb
index c8aaa2da3..039db8367 100644
--- a/lib/logstash/codecs/json_lines.rb
+++ b/lib/logstash/codecs/json_lines.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 require "logstash/codecs/line"
 require "json"
diff --git a/lib/logstash/codecs/json_spooler.rb b/lib/logstash/codecs/json_spooler.rb
index da3b97d20..00544b250 100644
--- a/lib/logstash/codecs/json_spooler.rb
+++ b/lib/logstash/codecs/json_spooler.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 require "logstash/codecs/spool"
 
diff --git a/lib/logstash/codecs/line.rb b/lib/logstash/codecs/line.rb
index a2b1da21c..21ae47a89 100644
--- a/lib/logstash/codecs/line.rb
+++ b/lib/logstash/codecs/line.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 require "logstash/util/charset"
 
diff --git a/lib/logstash/codecs/msgpack.rb b/lib/logstash/codecs/msgpack.rb
index 0852656f2..05dedf449 100644
--- a/lib/logstash/codecs/msgpack.rb
+++ b/lib/logstash/codecs/msgpack.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 
 class LogStash::Codecs::Msgpack < LogStash::Codecs::Base
diff --git a/lib/logstash/codecs/multiline.rb b/lib/logstash/codecs/multiline.rb
index bc5818d68..7445032cb 100644
--- a/lib/logstash/codecs/multiline.rb
+++ b/lib/logstash/codecs/multiline.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 
 # The multiline codec is for taking line-oriented text and merging them into a
diff --git a/lib/logstash/codecs/netflow.rb b/lib/logstash/codecs/netflow.rb
index a4c96e0f3..ce88c509d 100644
--- a/lib/logstash/codecs/netflow.rb
+++ b/lib/logstash/codecs/netflow.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/codecs/netflow/util.rb b/lib/logstash/codecs/netflow/util.rb
index f589705cd..627fb1265 100644
--- a/lib/logstash/codecs/netflow/util.rb
+++ b/lib/logstash/codecs/netflow/util.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "bindata"
 require "ipaddr"
 
diff --git a/lib/logstash/codecs/noop.rb b/lib/logstash/codecs/noop.rb
index a04200706..8a7a0d721 100644
--- a/lib/logstash/codecs/noop.rb
+++ b/lib/logstash/codecs/noop.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 
 class LogStash::Codecs::Noop < LogStash::Codecs::Base
diff --git a/lib/logstash/codecs/oldlogstashjson.rb b/lib/logstash/codecs/oldlogstashjson.rb
index e7feab417..2cc05979a 100644
--- a/lib/logstash/codecs/oldlogstashjson.rb
+++ b/lib/logstash/codecs/oldlogstashjson.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 
 class LogStash::Codecs::OldLogStashJSON < LogStash::Codecs::Base
diff --git a/lib/logstash/codecs/plain.rb b/lib/logstash/codecs/plain.rb
index d4d63236e..40071f5ad 100644
--- a/lib/logstash/codecs/plain.rb
+++ b/lib/logstash/codecs/plain.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 require "logstash/util/charset"
 
diff --git a/lib/logstash/codecs/rubydebug.rb b/lib/logstash/codecs/rubydebug.rb
index 2695a26e7..63848447e 100644
--- a/lib/logstash/codecs/rubydebug.rb
+++ b/lib/logstash/codecs/rubydebug.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 
 class LogStash::Codecs::RubyDebug < LogStash::Codecs::Base
diff --git a/lib/logstash/codecs/spool.rb b/lib/logstash/codecs/spool.rb
index 6d63a3751..67ff480b0 100644
--- a/lib/logstash/codecs/spool.rb
+++ b/lib/logstash/codecs/spool.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/codecs/base"
 
 class LogStash::Codecs::Spool < LogStash::Codecs::Base
diff --git a/lib/logstash/config/config_ast.rb b/lib/logstash/config/config_ast.rb
index 908ef91d1..a217a1f52 100644
--- a/lib/logstash/config/config_ast.rb
+++ b/lib/logstash/config/config_ast.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "treetop"
 class Treetop::Runtime::SyntaxNode
   def compile
diff --git a/lib/logstash/config/file.rb b/lib/logstash/config/file.rb
index 18cfaa339..fb0d939df 100644
--- a/lib/logstash/config/file.rb
+++ b/lib/logstash/config/file.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/config/grammar"
 require "logstash/config/config_ast"
diff --git a/lib/logstash/config/grammar.rb b/lib/logstash/config/grammar.rb
index 28bf5ab71..750c83f01 100644
--- a/lib/logstash/config/grammar.rb
+++ b/lib/logstash/config/grammar.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Autogenerated from a Treetop grammar. Edits may be lost.
 
 
diff --git a/lib/logstash/config/mixin.rb b/lib/logstash/config/mixin.rb
index 479ec5ca5..b92f5e686 100644
--- a/lib/logstash/config/mixin.rb
+++ b/lib/logstash/config/mixin.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 require "logstash/namespace"
 require "logstash/config/registry"
diff --git a/lib/logstash/config/registry.rb b/lib/logstash/config/registry.rb
index 46df5b534..8463716cf 100644
--- a/lib/logstash/config/registry.rb
+++ b/lib/logstash/config/registry.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 
 # Global config registry.
diff --git a/lib/logstash/errors.rb b/lib/logstash/errors.rb
index 25fb08fc0..e9ffadf86 100644
--- a/lib/logstash/errors.rb
+++ b/lib/logstash/errors.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 module LogStash
   class Error < ::StandardError; end
   class ConfigurationError < Error; end
diff --git a/lib/logstash/event.rb b/lib/logstash/event.rb
index ad2ff0c6d..fb84bec38 100644
--- a/lib/logstash/event.rb
+++ b/lib/logstash/event.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "json"
 require "time"
 require "date"
diff --git a/lib/logstash/filters/advisor.rb b/lib/logstash/filters/advisor.rb
index fea8a8305..46f4d9e9b 100644
--- a/lib/logstash/filters/advisor.rb
+++ b/lib/logstash/filters/advisor.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/alter.rb b/lib/logstash/filters/alter.rb
index 8ea0d0d6d..1f9a478cc 100644
--- a/lib/logstash/filters/alter.rb
+++ b/lib/logstash/filters/alter.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/anonymize.rb b/lib/logstash/filters/anonymize.rb
index a96d9989e..027d61cc5 100644
--- a/lib/logstash/filters/anonymize.rb
+++ b/lib/logstash/filters/anonymize.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/base.rb b/lib/logstash/filters/base.rb
index 1185a3f00..4ad068e97 100644
--- a/lib/logstash/filters/base.rb
+++ b/lib/logstash/filters/base.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/logging"
 require "logstash/plugin"
diff --git a/lib/logstash/filters/checksum.rb b/lib/logstash/filters/checksum.rb
index a1c2cd38d..1d06fc3a5 100644
--- a/lib/logstash/filters/checksum.rb
+++ b/lib/logstash/filters/checksum.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 require "yaml"
diff --git a/lib/logstash/filters/cidr.rb b/lib/logstash/filters/cidr.rb
index b03410add..4a4ad4884 100644
--- a/lib/logstash/filters/cidr.rb
+++ b/lib/logstash/filters/cidr.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 require "ipaddr"
diff --git a/lib/logstash/filters/cipher.rb b/lib/logstash/filters/cipher.rb
index a2e31d9a0..d9e55b434 100644
--- a/lib/logstash/filters/cipher.rb
+++ b/lib/logstash/filters/cipher.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/clone.rb b/lib/logstash/filters/clone.rb
index 373cf0058..162d18156 100644
--- a/lib/logstash/filters/clone.rb
+++ b/lib/logstash/filters/clone.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/collate.rb b/lib/logstash/filters/collate.rb
index 8bfae9582..30afe0398 100644
--- a/lib/logstash/filters/collate.rb
+++ b/lib/logstash/filters/collate.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/csv.rb b/lib/logstash/filters/csv.rb
index 118437a5b..4be7767a4 100644
--- a/lib/logstash/filters/csv.rb
+++ b/lib/logstash/filters/csv.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/date.rb b/lib/logstash/filters/date.rb
index 1b63d2b3f..262e150c2 100644
--- a/lib/logstash/filters/date.rb
+++ b/lib/logstash/filters/date.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/dns.rb b/lib/logstash/filters/dns.rb
index 606d86b3d..86c6177fb 100644
--- a/lib/logstash/filters/dns.rb
+++ b/lib/logstash/filters/dns.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # DNS Filter
 #
 # This filter will resolve any IP addresses from a field of your choosing.
diff --git a/lib/logstash/filters/drop.rb b/lib/logstash/filters/drop.rb
index a456c81ae..9c50f8b4a 100644
--- a/lib/logstash/filters/drop.rb
+++ b/lib/logstash/filters/drop.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/environment.rb b/lib/logstash/filters/environment.rb
index 4ea13015e..cbf6fc464 100644
--- a/lib/logstash/filters/environment.rb
+++ b/lib/logstash/filters/environment.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/extractnumbers.rb b/lib/logstash/filters/extractnumbers.rb
index 12038c72b..86a7cc575 100644
--- a/lib/logstash/filters/extractnumbers.rb
+++ b/lib/logstash/filters/extractnumbers.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'logstash/namespace'
 require 'logstash/filters/base'
 
diff --git a/lib/logstash/filters/gelfify.rb b/lib/logstash/filters/gelfify.rb
index d7e1a1c94..fcd2c3c95 100644
--- a/lib/logstash/filters/gelfify.rb
+++ b/lib/logstash/filters/gelfify.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/geoip.rb b/lib/logstash/filters/geoip.rb
index c9dcb06d3..004aeb5b4 100644
--- a/lib/logstash/filters/geoip.rb
+++ b/lib/logstash/filters/geoip.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 require "tempfile"
diff --git a/lib/logstash/filters/grep.rb b/lib/logstash/filters/grep.rb
index 1a11bd089..bb8bc3b33 100644
--- a/lib/logstash/filters/grep.rb
+++ b/lib/logstash/filters/grep.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/grok.rb b/lib/logstash/filters/grok.rb
index ed3b526a6..7241109b2 100644
--- a/lib/logstash/filters/grok.rb
+++ b/lib/logstash/filters/grok.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 require "set"
diff --git a/lib/logstash/filters/grokdiscovery.rb b/lib/logstash/filters/grokdiscovery.rb
index b21ad4912..6541e2de5 100644
--- a/lib/logstash/filters/grokdiscovery.rb
+++ b/lib/logstash/filters/grokdiscovery.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/json.rb b/lib/logstash/filters/json.rb
index 09628bbc9..569bfe8f9 100644
--- a/lib/logstash/filters/json.rb
+++ b/lib/logstash/filters/json.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/json_encode.rb b/lib/logstash/filters/json_encode.rb
index fe7ac2f89..07f4b7449 100644
--- a/lib/logstash/filters/json_encode.rb
+++ b/lib/logstash/filters/json_encode.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/kv.rb b/lib/logstash/filters/kv.rb
index 33fad922a..b96ea878d 100644
--- a/lib/logstash/filters/kv.rb
+++ b/lib/logstash/filters/kv.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/metaevent.rb b/lib/logstash/filters/metaevent.rb
index 37ce0d418..b31549e0e 100644
--- a/lib/logstash/filters/metaevent.rb
+++ b/lib/logstash/filters/metaevent.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/metrics.rb b/lib/logstash/filters/metrics.rb
index 6069c2190..22ca17e67 100644
--- a/lib/logstash/filters/metrics.rb
+++ b/lib/logstash/filters/metrics.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "securerandom"
 require "logstash/filters/base"
 require "logstash/namespace"
diff --git a/lib/logstash/filters/multiline.rb b/lib/logstash/filters/multiline.rb
index b6e3dc762..c2d604cca 100644
--- a/lib/logstash/filters/multiline.rb
+++ b/lib/logstash/filters/multiline.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # multiline filter
 #
 # This filter will collapse multiline messages into a single event.
diff --git a/lib/logstash/filters/mutate.rb b/lib/logstash/filters/mutate.rb
index e2fd5a471..ffb8ac8ef 100644
--- a/lib/logstash/filters/mutate.rb
+++ b/lib/logstash/filters/mutate.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/noop.rb b/lib/logstash/filters/noop.rb
index c3d9ff3fb..a26137b36 100644
--- a/lib/logstash/filters/noop.rb
+++ b/lib/logstash/filters/noop.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/prune.rb b/lib/logstash/filters/prune.rb
index f0d733b59..29baf2e6f 100644
--- a/lib/logstash/filters/prune.rb
+++ b/lib/logstash/filters/prune.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/railsparallelrequest.rb b/lib/logstash/filters/railsparallelrequest.rb
index 5533678d5..c2f54cabe 100644
--- a/lib/logstash/filters/railsparallelrequest.rb
+++ b/lib/logstash/filters/railsparallelrequest.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # parallel request filter
 #
 # This filter will separate out the parallel requests into separate events.
diff --git a/lib/logstash/filters/range.rb b/lib/logstash/filters/range.rb
index 00b0e8ece..88725f03e 100644
--- a/lib/logstash/filters/range.rb
+++ b/lib/logstash/filters/range.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/ruby.rb b/lib/logstash/filters/ruby.rb
index f92fe0c0e..01f8f60b5 100644
--- a/lib/logstash/filters/ruby.rb
+++ b/lib/logstash/filters/ruby.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/sleep.rb b/lib/logstash/filters/sleep.rb
index a936f79ab..3b83b6442 100644
--- a/lib/logstash/filters/sleep.rb
+++ b/lib/logstash/filters/sleep.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/split.rb b/lib/logstash/filters/split.rb
index 2f2bb0ed6..3524f0d6f 100644
--- a/lib/logstash/filters/split.rb
+++ b/lib/logstash/filters/split.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/syslog_pri.rb b/lib/logstash/filters/syslog_pri.rb
index 9e59c0ba0..6b92c719e 100644
--- a/lib/logstash/filters/syslog_pri.rb
+++ b/lib/logstash/filters/syslog_pri.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/translate.rb b/lib/logstash/filters/translate.rb
index abbd0a557..b23a88b42 100644
--- a/lib/logstash/filters/translate.rb
+++ b/lib/logstash/filters/translate.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/unique.rb b/lib/logstash/filters/unique.rb
index 22e06c72c..d55b4bc7d 100644
--- a/lib/logstash/filters/unique.rb
+++ b/lib/logstash/filters/unique.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/urldecode.rb b/lib/logstash/filters/urldecode.rb
index ce3ac45d0..b6d50881a 100644
--- a/lib/logstash/filters/urldecode.rb
+++ b/lib/logstash/filters/urldecode.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 require "uri"
diff --git a/lib/logstash/filters/useragent.rb b/lib/logstash/filters/useragent.rb
index 49a578703..03777a4cd 100644
--- a/lib/logstash/filters/useragent.rb
+++ b/lib/logstash/filters/useragent.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 require "tempfile"
diff --git a/lib/logstash/filters/uuid.rb b/lib/logstash/filters/uuid.rb
index 1f42a8f80..f7e04813a 100644
--- a/lib/logstash/filters/uuid.rb
+++ b/lib/logstash/filters/uuid.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 require "securerandom"
diff --git a/lib/logstash/filters/xml.rb b/lib/logstash/filters/xml.rb
index e8ab499d7..80c7bfea4 100644
--- a/lib/logstash/filters/xml.rb
+++ b/lib/logstash/filters/xml.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filters/zeromq.rb b/lib/logstash/filters/zeromq.rb
index 447487a27..a144ae4e6 100644
--- a/lib/logstash/filters/zeromq.rb
+++ b/lib/logstash/filters/zeromq.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/filters/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/filterworker.rb b/lib/logstash/filterworker.rb
index 4a42abd10..59a886c3c 100644
--- a/lib/logstash/filterworker.rb
+++ b/lib/logstash/filterworker.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/logging"
 require "logstash/plugin"
diff --git a/lib/logstash/inputs/base.rb b/lib/logstash/inputs/base.rb
index 63580ef8e..ee529ed63 100644
--- a/lib/logstash/inputs/base.rb
+++ b/lib/logstash/inputs/base.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/event"
 require "logstash/plugin"
diff --git a/lib/logstash/inputs/drupal_dblog.rb b/lib/logstash/inputs/drupal_dblog.rb
index 7009305aa..c2c4be628 100644
--- a/lib/logstash/inputs/drupal_dblog.rb
+++ b/lib/logstash/inputs/drupal_dblog.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "date"
 require "logstash/inputs/base"
 require "logstash/namespace"
diff --git a/lib/logstash/inputs/drupal_dblog/jdbcconnection.rb b/lib/logstash/inputs/drupal_dblog/jdbcconnection.rb
index 85aea3d79..a46cefc84 100644
--- a/lib/logstash/inputs/drupal_dblog/jdbcconnection.rb
+++ b/lib/logstash/inputs/drupal_dblog/jdbcconnection.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "java"
 require "rubygems"
 require "jdbc/mysql"
diff --git a/lib/logstash/inputs/elasticsearch.rb b/lib/logstash/inputs/elasticsearch.rb
index 716afaad6..0acdc0d50 100644
--- a/lib/logstash/inputs/elasticsearch.rb
+++ b/lib/logstash/inputs/elasticsearch.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "logstash/util/socket_peer"
diff --git a/lib/logstash/inputs/eventlog.rb b/lib/logstash/inputs/eventlog.rb
index 0f3aa88a8..00534ad2c 100644
--- a/lib/logstash/inputs/eventlog.rb
+++ b/lib/logstash/inputs/eventlog.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "socket"
diff --git a/lib/logstash/inputs/eventlog/racob_fix.rb b/lib/logstash/inputs/eventlog/racob_fix.rb
index e82e98606..8c352d403 100644
--- a/lib/logstash/inputs/eventlog/racob_fix.rb
+++ b/lib/logstash/inputs/eventlog/racob_fix.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # The jruby-win32ole gem uses 'java.lang.System.set_property' to
 # tell java(?) where to find the racob dll.
 #
diff --git a/lib/logstash/inputs/exec.rb b/lib/logstash/inputs/exec.rb
index 4cf176f35..4ae1d483a 100644
--- a/lib/logstash/inputs/exec.rb
+++ b/lib/logstash/inputs/exec.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "socket" # for Socket.gethostname
diff --git a/lib/logstash/inputs/file.rb b/lib/logstash/inputs/file.rb
index 18ed11d3b..9eed284fe 100644
--- a/lib/logstash/inputs/file.rb
+++ b/lib/logstash/inputs/file.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/inputs/ganglia.rb b/lib/logstash/inputs/ganglia.rb
index f491fc937..32e306b65 100644
--- a/lib/logstash/inputs/ganglia.rb
+++ b/lib/logstash/inputs/ganglia.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "date"
 require "logstash/filters/grok"
 require "logstash/filters/date"
diff --git a/lib/logstash/inputs/ganglia/gmondpacket.rb b/lib/logstash/inputs/ganglia/gmondpacket.rb
index e5a4f49bc..6ad7f890a 100644
--- a/lib/logstash/inputs/ganglia/gmondpacket.rb
+++ b/lib/logstash/inputs/ganglia/gmondpacket.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Inspiration
 # https://github.com/fastly/ganglia/blob/master/lib/gm_protocol.x
 # https://github.com/igrigorik/gmetric/blob/master/lib/gmetric.rb
diff --git a/lib/logstash/inputs/ganglia/xdr.rb b/lib/logstash/inputs/ganglia/xdr.rb
index e8d4a71a4..117635401 100644
--- a/lib/logstash/inputs/ganglia/xdr.rb
+++ b/lib/logstash/inputs/ganglia/xdr.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # xdr.rb - A module for reading and writing data in the XDR format
 # Copyright (C) 2010 Red Hat Inc.
 #
diff --git a/lib/logstash/inputs/gelf.rb b/lib/logstash/inputs/gelf.rb
index 186c8d8b0..51ec52fd2 100644
--- a/lib/logstash/inputs/gelf.rb
+++ b/lib/logstash/inputs/gelf.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "date"
 require "logstash/inputs/base"
 require "logstash/namespace"
diff --git a/lib/logstash/inputs/gemfire.rb b/lib/logstash/inputs/gemfire.rb
index 50722e75b..611664d40 100644
--- a/lib/logstash/inputs/gemfire.rb
+++ b/lib/logstash/inputs/gemfire.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/threadable"
 require "logstash/namespace"
 
diff --git a/lib/logstash/inputs/generator.rb b/lib/logstash/inputs/generator.rb
index bb0f64c49..7da3613e0 100644
--- a/lib/logstash/inputs/generator.rb
+++ b/lib/logstash/inputs/generator.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/threadable"
 require "logstash/namespace"
 require "socket" # for Socket.gethostname
diff --git a/lib/logstash/inputs/graphite.rb b/lib/logstash/inputs/graphite.rb
index d9fb90875..e590cc3bd 100644
--- a/lib/logstash/inputs/graphite.rb
+++ b/lib/logstash/inputs/graphite.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/tcp"
 require "logstash/namespace"
 
diff --git a/lib/logstash/inputs/heroku.rb b/lib/logstash/inputs/heroku.rb
index ae420274b..b27aba659 100644
--- a/lib/logstash/inputs/heroku.rb
+++ b/lib/logstash/inputs/heroku.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/inputs/imap.rb b/lib/logstash/inputs/imap.rb
index 51c7501f8..fb178542b 100644
--- a/lib/logstash/inputs/imap.rb
+++ b/lib/logstash/inputs/imap.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "stud/interval"
diff --git a/lib/logstash/inputs/irc.rb b/lib/logstash/inputs/irc.rb
index 42b1fa55d..656fc7109 100644
--- a/lib/logstash/inputs/irc.rb
+++ b/lib/logstash/inputs/irc.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "thread"
diff --git a/lib/logstash/inputs/log4j.rb b/lib/logstash/inputs/log4j.rb
index c62c250ab..5717b06c6 100644
--- a/lib/logstash/inputs/log4j.rb
+++ b/lib/logstash/inputs/log4j.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "logstash/util/socket_peer"
diff --git a/lib/logstash/inputs/lumberjack.rb b/lib/logstash/inputs/lumberjack.rb
index ca1a8f636..8be996f42 100644
--- a/lib/logstash/inputs/lumberjack.rb
+++ b/lib/logstash/inputs/lumberjack.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 
@@ -44,7 +45,7 @@ class LogStash::Inputs::Lumberjack < LogStash::Inputs::Base
     @lumberjack.run do |l|
       @codec.decode(l.delete("line")) do |event|
         decorate(event)
-        l.each { |k,v| event[k] = v }
+        l.each { |k,v| event[k] = v; v.force_encoding("UTF-8") }
         output_queue << event
       end
     end
diff --git a/lib/logstash/inputs/pipe.rb b/lib/logstash/inputs/pipe.rb
index e90f75f39..d4506bacd 100644
--- a/lib/logstash/inputs/pipe.rb
+++ b/lib/logstash/inputs/pipe.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "socket" # for Socket.gethostname
diff --git a/lib/logstash/inputs/rabbitmq.rb b/lib/logstash/inputs/rabbitmq.rb
index 83b5b2a3a..d9dbecc87 100644
--- a/lib/logstash/inputs/rabbitmq.rb
+++ b/lib/logstash/inputs/rabbitmq.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/threadable"
 require "logstash/namespace"
 
diff --git a/lib/logstash/inputs/rabbitmq/bunny.rb b/lib/logstash/inputs/rabbitmq/bunny.rb
index 84f710ad8..2819a9113 100644
--- a/lib/logstash/inputs/rabbitmq/bunny.rb
+++ b/lib/logstash/inputs/rabbitmq/bunny.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 class LogStash::Inputs::RabbitMQ
   module BunnyImpl
     def register
diff --git a/lib/logstash/inputs/rabbitmq/hot_bunnies.rb b/lib/logstash/inputs/rabbitmq/hot_bunnies.rb
index daea9efec..da9c5cafe 100644
--- a/lib/logstash/inputs/rabbitmq/hot_bunnies.rb
+++ b/lib/logstash/inputs/rabbitmq/hot_bunnies.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 class LogStash::Inputs::RabbitMQ
   # HotBunnies-based implementation for JRuby
   module HotBunniesImpl
diff --git a/lib/logstash/inputs/redis.rb b/lib/logstash/inputs/redis.rb
index 7ec8bf69f..ce3d88f18 100644
--- a/lib/logstash/inputs/redis.rb
+++ b/lib/logstash/inputs/redis.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/inputs/threadable"
 require "logstash/namespace"
diff --git a/lib/logstash/inputs/relp.rb b/lib/logstash/inputs/relp.rb
index 6f52b7c53..a15b060b2 100644
--- a/lib/logstash/inputs/relp.rb
+++ b/lib/logstash/inputs/relp.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "logstash/util/relp"
diff --git a/lib/logstash/inputs/s3.rb b/lib/logstash/inputs/s3.rb
index dc6e08fc9..7d208a44e 100644
--- a/lib/logstash/inputs/s3.rb
+++ b/lib/logstash/inputs/s3.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/inputs/snmptrap.rb b/lib/logstash/inputs/snmptrap.rb
index 1983e6f86..c8bb2fa51 100644
--- a/lib/logstash/inputs/snmptrap.rb
+++ b/lib/logstash/inputs/snmptrap.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/inputs/sqlite.rb b/lib/logstash/inputs/sqlite.rb
index b6955213c..012e7708c 100644
--- a/lib/logstash/inputs/sqlite.rb
+++ b/lib/logstash/inputs/sqlite.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "socket"
diff --git a/lib/logstash/inputs/sqs.rb b/lib/logstash/inputs/sqs.rb
index e2d425b60..8934aa0dc 100644
--- a/lib/logstash/inputs/sqs.rb
+++ b/lib/logstash/inputs/sqs.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/threadable"
 require "logstash/namespace"
 require "logstash/plugin_mixins/aws_config"
diff --git a/lib/logstash/inputs/stdin.rb b/lib/logstash/inputs/stdin.rb
index 667291a64..bc9756fff 100644
--- a/lib/logstash/inputs/stdin.rb
+++ b/lib/logstash/inputs/stdin.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "socket" # for Socket.gethostname
diff --git a/lib/logstash/inputs/stomp.rb b/lib/logstash/inputs/stomp.rb
index e6ca38191..4db7b542e 100644
--- a/lib/logstash/inputs/stomp.rb
+++ b/lib/logstash/inputs/stomp.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require 'pp'
diff --git a/lib/logstash/inputs/syslog.rb b/lib/logstash/inputs/syslog.rb
index 42ca079ed..41a0fa872 100644
--- a/lib/logstash/inputs/syslog.rb
+++ b/lib/logstash/inputs/syslog.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "date"
 require "logstash/filters/grok"
 require "logstash/filters/date"
diff --git a/lib/logstash/inputs/tcp.rb b/lib/logstash/inputs/tcp.rb
index 345b9006b..05dd99d34 100644
--- a/lib/logstash/inputs/tcp.rb
+++ b/lib/logstash/inputs/tcp.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "logstash/util/socket_peer"
diff --git a/lib/logstash/inputs/threadable.rb b/lib/logstash/inputs/threadable.rb
index 73c08af97..04d834b72 100644
--- a/lib/logstash/inputs/threadable.rb
+++ b/lib/logstash/inputs/threadable.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/inputs/base"
 
diff --git a/lib/logstash/inputs/twitter.rb b/lib/logstash/inputs/twitter.rb
index 63bead42f..be1781d10 100644
--- a/lib/logstash/inputs/twitter.rb
+++ b/lib/logstash/inputs/twitter.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "json"
diff --git a/lib/logstash/inputs/udp.rb b/lib/logstash/inputs/udp.rb
index 2b58f5055..80be779b6 100644
--- a/lib/logstash/inputs/udp.rb
+++ b/lib/logstash/inputs/udp.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "date"
 require "logstash/inputs/base"
 require "logstash/namespace"
diff --git a/lib/logstash/inputs/unix.rb b/lib/logstash/inputs/unix.rb
index ecb0c18e2..b78a887b0 100644
--- a/lib/logstash/inputs/unix.rb
+++ b/lib/logstash/inputs/unix.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "socket"
diff --git a/lib/logstash/inputs/varnishlog.rb b/lib/logstash/inputs/varnishlog.rb
index 78519e20c..9fcc1e81d 100644
--- a/lib/logstash/inputs/varnishlog.rb
+++ b/lib/logstash/inputs/varnishlog.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/threadable"
 require "logstash/namespace"
 require "socket" # for Socket.gethostname
diff --git a/lib/logstash/inputs/websocket.rb b/lib/logstash/inputs/websocket.rb
index 698ea9983..9438c015b 100644
--- a/lib/logstash/inputs/websocket.rb
+++ b/lib/logstash/inputs/websocket.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "socket"
diff --git a/lib/logstash/inputs/wmi.rb b/lib/logstash/inputs/wmi.rb
index a8891325b..01da495aa 100644
--- a/lib/logstash/inputs/wmi.rb
+++ b/lib/logstash/inputs/wmi.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "socket"
diff --git a/lib/logstash/inputs/xmpp.rb b/lib/logstash/inputs/xmpp.rb
index ca338b8cb..f87308477 100644
--- a/lib/logstash/inputs/xmpp.rb
+++ b/lib/logstash/inputs/xmpp.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/inputs/zenoss.rb b/lib/logstash/inputs/zenoss.rb
index 23803ed14..e0e511c16 100644
--- a/lib/logstash/inputs/zenoss.rb
+++ b/lib/logstash/inputs/zenoss.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "date"
 require "logstash/inputs/rabbitmq"
 require "zlib"
diff --git a/lib/logstash/inputs/zeromq.rb b/lib/logstash/inputs/zeromq.rb
index bf829922d..5d1c4d273 100644
--- a/lib/logstash/inputs/zeromq.rb
+++ b/lib/logstash/inputs/zeromq.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/inputs/base"
 require "logstash/namespace"
 require "socket"
diff --git a/lib/logstash/kibana.rb b/lib/logstash/kibana.rb
index bfb2e972e..dc7cebf66 100644
--- a/lib/logstash/kibana.rb
+++ b/lib/logstash/kibana.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "rack/handler/ftw" # gem ftw
 require "ftw" # gem ftw
 require "sinatra/base" # gem sinatra
diff --git a/lib/logstash/loadlibs.rb b/lib/logstash/loadlibs.rb
index 05b4b76ef..953c74cda 100644
--- a/lib/logstash/loadlibs.rb
+++ b/lib/logstash/loadlibs.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 jarpath = File.join(File.dirname(__FILE__), "../../vendor/**/*.jar")
 Dir[jarpath].each do |jar|
   if $DEBUG
diff --git a/lib/logstash/logging.rb b/lib/logstash/logging.rb
index b2d08bb18..175891d89 100644
--- a/lib/logstash/logging.rb
+++ b/lib/logstash/logging.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "cabin"
 require "logger"
diff --git a/lib/logstash/monkeypatches-for-bugs.rb b/lib/logstash/monkeypatches-for-bugs.rb
index 9c6a807df..3fbd76f3b 100644
--- a/lib/logstash/monkeypatches-for-bugs.rb
+++ b/lib/logstash/monkeypatches-for-bugs.rb
@@ -1 +1,2 @@
+# encoding: utf-8
 require "logstash/JRUBY-6970" if RUBY_PLATFORM == "java"
diff --git a/lib/logstash/monkeypatches-for-debugging.rb b/lib/logstash/monkeypatches-for-debugging.rb
index 9a70d40b5..33d6527c8 100644
--- a/lib/logstash/monkeypatches-for-debugging.rb
+++ b/lib/logstash/monkeypatches-for-debugging.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 if $DEBUGLIST.include?("require")
   module Kernel
     alias_method :require_debug, :require
diff --git a/lib/logstash/monkeypatches-for-performance.rb b/lib/logstash/monkeypatches-for-performance.rb
index 3a754e117..212cd918f 100644
--- a/lib/logstash/monkeypatches-for-performance.rb
+++ b/lib/logstash/monkeypatches-for-performance.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 if RUBY_PLATFORM == "java"
   class << File
     # mpp == monkey patch for performance
diff --git a/lib/logstash/multiqueue.rb b/lib/logstash/multiqueue.rb
index ec686f13b..237105662 100644
--- a/lib/logstash/multiqueue.rb
+++ b/lib/logstash/multiqueue.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "cabin"
 
diff --git a/lib/logstash/namespace.rb b/lib/logstash/namespace.rb
index e2f8d0419..3ff393377 100644
--- a/lib/logstash/namespace.rb
+++ b/lib/logstash/namespace.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 #$: << File.join(File.dirname(__FILE__), "..", "..", "vendor", "bundle")
 
 module LogStash
diff --git a/lib/logstash/outputs/base.rb b/lib/logstash/outputs/base.rb
index 32cd21013..6c6142851 100644
--- a/lib/logstash/outputs/base.rb
+++ b/lib/logstash/outputs/base.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "cgi"
 require "logstash/event"
 require "logstash/logging"
diff --git a/lib/logstash/outputs/boundary.rb b/lib/logstash/outputs/boundary.rb
index 2e4fba2c7..cde4a694a 100644
--- a/lib/logstash/outputs/boundary.rb
+++ b/lib/logstash/outputs/boundary.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/circonus.rb b/lib/logstash/outputs/circonus.rb
index 26d90f70f..1f8451a9f 100644
--- a/lib/logstash/outputs/circonus.rb
+++ b/lib/logstash/outputs/circonus.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/cloudwatch.rb b/lib/logstash/outputs/cloudwatch.rb
index 29216cad8..bcd5e48a4 100644
--- a/lib/logstash/outputs/cloudwatch.rb
+++ b/lib/logstash/outputs/cloudwatch.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "logstash/plugin_mixins/aws_config"
diff --git a/lib/logstash/outputs/datadog.rb b/lib/logstash/outputs/datadog.rb
index 3957342b0..87936921a 100644
--- a/lib/logstash/outputs/datadog.rb
+++ b/lib/logstash/outputs/datadog.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/datadog_metrics.rb b/lib/logstash/outputs/datadog_metrics.rb
index 52b2f427b..04f57c923 100644
--- a/lib/logstash/outputs/datadog_metrics.rb
+++ b/lib/logstash/outputs/datadog_metrics.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "stud/buffer"
diff --git a/lib/logstash/outputs/elasticsearch.rb b/lib/logstash/outputs/elasticsearch.rb
index 408cdcfaa..160ee8c2a 100644
--- a/lib/logstash/outputs/elasticsearch.rb
+++ b/lib/logstash/outputs/elasticsearch.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/base"
 require "stud/buffer"
diff --git a/lib/logstash/outputs/elasticsearch_http.rb b/lib/logstash/outputs/elasticsearch_http.rb
index 2465f9aa0..ebecec89f 100644
--- a/lib/logstash/outputs/elasticsearch_http.rb
+++ b/lib/logstash/outputs/elasticsearch_http.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/base"
 require "stud/buffer"
diff --git a/lib/logstash/outputs/elasticsearch_river.rb b/lib/logstash/outputs/elasticsearch_river.rb
index e93677b27..34a6783d0 100644
--- a/lib/logstash/outputs/elasticsearch_river.rb
+++ b/lib/logstash/outputs/elasticsearch_river.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/base"
 require "json"
diff --git a/lib/logstash/outputs/email.rb b/lib/logstash/outputs/email.rb
index d65e24c92..340e2f93d 100644
--- a/lib/logstash/outputs/email.rb
+++ b/lib/logstash/outputs/email.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/exec.rb b/lib/logstash/outputs/exec.rb
index d78880a8b..ae3fda1f0 100644
--- a/lib/logstash/outputs/exec.rb
+++ b/lib/logstash/outputs/exec.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/base"
 
diff --git a/lib/logstash/outputs/file.rb b/lib/logstash/outputs/file.rb
index fab057ff8..7763e59f1 100644
--- a/lib/logstash/outputs/file.rb
+++ b/lib/logstash/outputs/file.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/base"
 require "zlib"
diff --git a/lib/logstash/outputs/ganglia.rb b/lib/logstash/outputs/ganglia.rb
index afdd9f07e..745a900ff 100644
--- a/lib/logstash/outputs/ganglia.rb
+++ b/lib/logstash/outputs/ganglia.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/gelf.rb b/lib/logstash/outputs/gelf.rb
index ef1db4906..89e372274 100644
--- a/lib/logstash/outputs/gelf.rb
+++ b/lib/logstash/outputs/gelf.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/base"
 
diff --git a/lib/logstash/outputs/gemfire.rb b/lib/logstash/outputs/gemfire.rb
index 783e6b700..8c1031892 100644
--- a/lib/logstash/outputs/gemfire.rb
+++ b/lib/logstash/outputs/gemfire.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/google_cloud_storage.rb b/lib/logstash/outputs/google_cloud_storage.rb
index 75ca59e5a..41dc39240 100644
--- a/lib/logstash/outputs/google_cloud_storage.rb
+++ b/lib/logstash/outputs/google_cloud_storage.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Copyright 2013 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/lib/logstash/outputs/graphite.rb b/lib/logstash/outputs/graphite.rb
index e33c2eb7f..14a920e0a 100644
--- a/lib/logstash/outputs/graphite.rb
+++ b/lib/logstash/outputs/graphite.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "socket"
diff --git a/lib/logstash/outputs/graphtastic.rb b/lib/logstash/outputs/graphtastic.rb
index 3c6db0254..afad0154a 100644
--- a/lib/logstash/outputs/graphtastic.rb
+++ b/lib/logstash/outputs/graphtastic.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/hipchat.rb b/lib/logstash/outputs/hipchat.rb
index cba117eb1..561985889 100644
--- a/lib/logstash/outputs/hipchat.rb
+++ b/lib/logstash/outputs/hipchat.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/http"
 
diff --git a/lib/logstash/outputs/http.rb b/lib/logstash/outputs/http.rb
index ead9162ac..029fc961a 100644
--- a/lib/logstash/outputs/http.rb
+++ b/lib/logstash/outputs/http.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/irc.rb b/lib/logstash/outputs/irc.rb
index 02bbf68cd..cd1d527db 100644
--- a/lib/logstash/outputs/irc.rb
+++ b/lib/logstash/outputs/irc.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "thread"
diff --git a/lib/logstash/outputs/jira.rb b/lib/logstash/outputs/jira.rb
index 8d262bbf1..2cc533043 100644
--- a/lib/logstash/outputs/jira.rb
+++ b/lib/logstash/outputs/jira.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # Origin https://groups.google.com/forum/#!msg/logstash-users/exgrB4iQ-mw/R34apku5nXsJ
 # and https://botbot.me/freenode/logstash/msg/4169496/ 
 # via https://gist.github.com/electrical/4660061e8fff11cdcf37#file-jira-rb
diff --git a/lib/logstash/outputs/juggernaut.rb b/lib/logstash/outputs/juggernaut.rb
index 9c45df7f7..e41f89217 100644
--- a/lib/logstash/outputs/juggernaut.rb
+++ b/lib/logstash/outputs/juggernaut.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "logstash/event"
diff --git a/lib/logstash/outputs/librato.rb b/lib/logstash/outputs/librato.rb
index 27c43a688..09f9e6129 100644
--- a/lib/logstash/outputs/librato.rb
+++ b/lib/logstash/outputs/librato.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/loggly.rb b/lib/logstash/outputs/loggly.rb
index 6640de91d..ad159f7f6 100644
--- a/lib/logstash/outputs/loggly.rb
+++ b/lib/logstash/outputs/loggly.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "uri"
diff --git a/lib/logstash/outputs/lumberjack.rb b/lib/logstash/outputs/lumberjack.rb
index 853bcc8a6..c4db3da5e 100644
--- a/lib/logstash/outputs/lumberjack.rb
+++ b/lib/logstash/outputs/lumberjack.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 class LogStash::Outputs::Lumberjack < LogStash::Outputs::Base
 
   config_name "lumberjack"
diff --git a/lib/logstash/outputs/metriccatcher.rb b/lib/logstash/outputs/metriccatcher.rb
index f34c73b28..31e04ec4e 100644
--- a/lib/logstash/outputs/metriccatcher.rb
+++ b/lib/logstash/outputs/metriccatcher.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "json"
diff --git a/lib/logstash/outputs/mongodb.rb b/lib/logstash/outputs/mongodb.rb
index 5bb041b8a..2768e9e7e 100644
--- a/lib/logstash/outputs/mongodb.rb
+++ b/lib/logstash/outputs/mongodb.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/nagios.rb b/lib/logstash/outputs/nagios.rb
index 3e87f04e8..2dc19050f 100644
--- a/lib/logstash/outputs/nagios.rb
+++ b/lib/logstash/outputs/nagios.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/base"
 
diff --git a/lib/logstash/outputs/nagios_nsca.rb b/lib/logstash/outputs/nagios_nsca.rb
index 7b7a2b67e..3e721de95 100644
--- a/lib/logstash/outputs/nagios_nsca.rb
+++ b/lib/logstash/outputs/nagios_nsca.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/null.rb b/lib/logstash/outputs/null.rb
index 4d022ff80..0c8dd8abb 100644
--- a/lib/logstash/outputs/null.rb
+++ b/lib/logstash/outputs/null.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/opentsdb.rb b/lib/logstash/outputs/opentsdb.rb
index 8825ab36f..eb1d1a6c7 100644
--- a/lib/logstash/outputs/opentsdb.rb
+++ b/lib/logstash/outputs/opentsdb.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "socket"
diff --git a/lib/logstash/outputs/pagerduty.rb b/lib/logstash/outputs/pagerduty.rb
index e1ae4a91a..5a4e39f95 100644
--- a/lib/logstash/outputs/pagerduty.rb
+++ b/lib/logstash/outputs/pagerduty.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/pipe.rb b/lib/logstash/outputs/pipe.rb
index 8e0a46975..5d0213461 100644
--- a/lib/logstash/outputs/pipe.rb
+++ b/lib/logstash/outputs/pipe.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/base"
 
diff --git a/lib/logstash/outputs/rabbitmq.rb b/lib/logstash/outputs/rabbitmq.rb
index 3ce9a3bb8..ce45c578f 100644
--- a/lib/logstash/outputs/rabbitmq.rb
+++ b/lib/logstash/outputs/rabbitmq.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/rabbitmq/bunny.rb b/lib/logstash/outputs/rabbitmq/bunny.rb
index 1ed242e83..0a2b65098 100644
--- a/lib/logstash/outputs/rabbitmq/bunny.rb
+++ b/lib/logstash/outputs/rabbitmq/bunny.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 class LogStash::Outputs::RabbitMQ
   module BunnyImpl
 
diff --git a/lib/logstash/outputs/rabbitmq/hot_bunnies.rb b/lib/logstash/outputs/rabbitmq/hot_bunnies.rb
index 7876a664a..dbdb76fc4 100644
--- a/lib/logstash/outputs/rabbitmq/hot_bunnies.rb
+++ b/lib/logstash/outputs/rabbitmq/hot_bunnies.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 class LogStash::Outputs::RabbitMQ
   module HotBunniesImpl
 
diff --git a/lib/logstash/outputs/redis.rb b/lib/logstash/outputs/redis.rb
index 7aab4f2cd..fd4ae90e3 100644
--- a/lib/logstash/outputs/redis.rb
+++ b/lib/logstash/outputs/redis.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "stud/buffer"
diff --git a/lib/logstash/outputs/riak.rb b/lib/logstash/outputs/riak.rb
index e10791838..b1c799580 100644
--- a/lib/logstash/outputs/riak.rb
+++ b/lib/logstash/outputs/riak.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/riemann.rb b/lib/logstash/outputs/riemann.rb
index 0958fcc31..cb6fa32f7 100644
--- a/lib/logstash/outputs/riemann.rb
+++ b/lib/logstash/outputs/riemann.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/s3.rb b/lib/logstash/outputs/s3.rb
index 857c4392e..257356b25 100644
--- a/lib/logstash/outputs/s3.rb
+++ b/lib/logstash/outputs/s3.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/sns.rb b/lib/logstash/outputs/sns.rb
index 2a8c368bb..fd1f04405 100644
--- a/lib/logstash/outputs/sns.rb
+++ b/lib/logstash/outputs/sns.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "logstash/plugin_mixins/aws_config"
diff --git a/lib/logstash/outputs/solr_http.rb b/lib/logstash/outputs/solr_http.rb
index 3bbf2f973..15c70e7c4 100644
--- a/lib/logstash/outputs/solr_http.rb
+++ b/lib/logstash/outputs/solr_http.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "stud/buffer"
diff --git a/lib/logstash/outputs/sqs.rb b/lib/logstash/outputs/sqs.rb
index e2e063da3..1421ca50b 100644
--- a/lib/logstash/outputs/sqs.rb
+++ b/lib/logstash/outputs/sqs.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "logstash/plugin_mixins/aws_config"
diff --git a/lib/logstash/outputs/statsd.rb b/lib/logstash/outputs/statsd.rb
index 3ee9d5878..638f6270d 100644
--- a/lib/logstash/outputs/statsd.rb
+++ b/lib/logstash/outputs/statsd.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/stdout.rb b/lib/logstash/outputs/stdout.rb
index 13f92b53d..34afbc5ec 100644
--- a/lib/logstash/outputs/stdout.rb
+++ b/lib/logstash/outputs/stdout.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/stomp.rb b/lib/logstash/outputs/stomp.rb
index 115d9fcbe..bf892663f 100644
--- a/lib/logstash/outputs/stomp.rb
+++ b/lib/logstash/outputs/stomp.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/syslog.rb b/lib/logstash/outputs/syslog.rb
index 51c7e6b2e..988ebc9ed 100644
--- a/lib/logstash/outputs/syslog.rb
+++ b/lib/logstash/outputs/syslog.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "date"
diff --git a/lib/logstash/outputs/tcp.rb b/lib/logstash/outputs/tcp.rb
index b57cc95eb..5176de967 100644
--- a/lib/logstash/outputs/tcp.rb
+++ b/lib/logstash/outputs/tcp.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "thread"
diff --git a/lib/logstash/outputs/udp.rb b/lib/logstash/outputs/udp.rb
index 2c9532189..1469017e6 100644
--- a/lib/logstash/outputs/udp.rb
+++ b/lib/logstash/outputs/udp.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 require "socket"
diff --git a/lib/logstash/outputs/websocket.rb b/lib/logstash/outputs/websocket.rb
index ad75864fd..674860366 100644
--- a/lib/logstash/outputs/websocket.rb
+++ b/lib/logstash/outputs/websocket.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/base"
 
diff --git a/lib/logstash/outputs/websocket/app.rb b/lib/logstash/outputs/websocket/app.rb
index 3b0e4f613..b21ec9c90 100644
--- a/lib/logstash/outputs/websocket/app.rb
+++ b/lib/logstash/outputs/websocket/app.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/websocket"
 require "sinatra/base"
diff --git a/lib/logstash/outputs/websocket/pubsub.rb b/lib/logstash/outputs/websocket/pubsub.rb
index e79a6aea1..04e6d58a1 100644
--- a/lib/logstash/outputs/websocket/pubsub.rb
+++ b/lib/logstash/outputs/websocket/pubsub.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/websocket"
 
diff --git a/lib/logstash/outputs/xmpp.rb b/lib/logstash/outputs/xmpp.rb
index 101af664b..930401118 100644
--- a/lib/logstash/outputs/xmpp.rb
+++ b/lib/logstash/outputs/xmpp.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/outputs/zabbix.rb b/lib/logstash/outputs/zabbix.rb
index 036dde7e0..83f5b504e 100644
--- a/lib/logstash/outputs/zabbix.rb
+++ b/lib/logstash/outputs/zabbix.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/outputs/base"
  
diff --git a/lib/logstash/outputs/zeromq.rb b/lib/logstash/outputs/zeromq.rb
index 92ea5c619..c4b088fc2 100644
--- a/lib/logstash/outputs/zeromq.rb
+++ b/lib/logstash/outputs/zeromq.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/outputs/base"
 require "logstash/namespace"
 
diff --git a/lib/logstash/pipeline.rb b/lib/logstash/pipeline.rb
index 4649ab645..a932e2a97 100644
--- a/lib/logstash/pipeline.rb
+++ b/lib/logstash/pipeline.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/config/file"
 require "logstash/namespace"
 require "thread" # stdlib
diff --git a/lib/logstash/plugin.rb b/lib/logstash/plugin.rb
index 58f2c055b..ba9d277f7 100644
--- a/lib/logstash/plugin.rb
+++ b/lib/logstash/plugin.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/logging"
 require "logstash/config/mixin"
diff --git a/lib/logstash/plugin_mixins/aws_config.rb b/lib/logstash/plugin_mixins/aws_config.rb
index 3ff515eb9..b4ec9d328 100644
--- a/lib/logstash/plugin_mixins/aws_config.rb
+++ b/lib/logstash/plugin_mixins/aws_config.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/config/mixin"
 
 module LogStash::PluginMixins::AwsConfig
diff --git a/lib/logstash/program.rb b/lib/logstash/program.rb
index 6d5074b97..06940fd22 100644
--- a/lib/logstash/program.rb
+++ b/lib/logstash/program.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 require "logstash/namespace"
 
diff --git a/lib/logstash/runner.rb b/lib/logstash/runner.rb
index ca8a91bf1..3c21be77c 100644
--- a/lib/logstash/runner.rb
+++ b/lib/logstash/runner.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 $START = Time.now
 $DEBUGLIST = (ENV["DEBUG"] || "").split(",")
diff --git a/lib/logstash/sized_queue.rb b/lib/logstash/sized_queue.rb
index 7c2b013dd..d96e27aba 100644
--- a/lib/logstash/sized_queue.rb
+++ b/lib/logstash/sized_queue.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/logging"
 
diff --git a/lib/logstash/test.rb b/lib/logstash/test.rb
index eeb30ce00..5a4b1af84 100644
--- a/lib/logstash/test.rb
+++ b/lib/logstash/test.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "rubygems"
 require "optparse"
 
diff --git a/lib/logstash/threadwatchdog.rb b/lib/logstash/threadwatchdog.rb
index fe0b8db25..ab41d3a49 100644
--- a/lib/logstash/threadwatchdog.rb
+++ b/lib/logstash/threadwatchdog.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/logging"
 
diff --git a/lib/logstash/time_addon.rb b/lib/logstash/time_addon.rb
index b053a81c4..258ce703a 100644
--- a/lib/logstash/time_addon.rb
+++ b/lib/logstash/time_addon.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 
 # Provide our own Time wrapper for ISO8601 support
diff --git a/lib/logstash/util.rb b/lib/logstash/util.rb
index 1012a4c14..76b5926b3 100644
--- a/lib/logstash/util.rb
+++ b/lib/logstash/util.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 
 module LogStash::Util
diff --git a/lib/logstash/util/buftok.rb b/lib/logstash/util/buftok.rb
index 877d9cd5c..a09387448 100644
--- a/lib/logstash/util/buftok.rb
+++ b/lib/logstash/util/buftok.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # BufferedTokenizer - Statefully split input data by a specifiable token
 #
 # Authors:: Tony Arcieri, Martin Emde
diff --git a/lib/logstash/util/charset.rb b/lib/logstash/util/charset.rb
index 4f0e3f420..60ec56bd0 100644
--- a/lib/logstash/util/charset.rb
+++ b/lib/logstash/util/charset.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/util"
 
diff --git a/lib/logstash/util/fieldreference.rb b/lib/logstash/util/fieldreference.rb
index b826a4b96..041304a6b 100644
--- a/lib/logstash/util/fieldreference.rb
+++ b/lib/logstash/util/fieldreference.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/util"
 
diff --git a/lib/logstash/util/password.rb b/lib/logstash/util/password.rb
index 778851040..6cd9beb75 100644
--- a/lib/logstash/util/password.rb
+++ b/lib/logstash/util/password.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/util"
 
diff --git a/lib/logstash/util/prctl.rb b/lib/logstash/util/prctl.rb
index 98050f0b7..02f44f0d2 100644
--- a/lib/logstash/util/prctl.rb
+++ b/lib/logstash/util/prctl.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 module LibC
   require "ffi"
diff --git a/lib/logstash/util/relp.rb b/lib/logstash/util/relp.rb
index 6eb3fd07f..2549c0195 100644
--- a/lib/logstash/util/relp.rb
+++ b/lib/logstash/util/relp.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "socket"
 
 class Relp#This isn't much use on its own, but gives RelpServer and RelpClient things
diff --git a/lib/logstash/util/require-helper.rb b/lib/logstash/util/require-helper.rb
index 90e588b3a..6e9fde0d8 100644
--- a/lib/logstash/util/require-helper.rb
+++ b/lib/logstash/util/require-helper.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "logstash/namespace"
 require "logstash/logging"
 
diff --git a/lib/logstash/util/socket_peer.rb b/lib/logstash/util/socket_peer.rb
index a5611f383..56ea2f3e2 100644
--- a/lib/logstash/util/socket_peer.rb
+++ b/lib/logstash/util/socket_peer.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 module ::LogStash::Util::SocketPeer
   public
   def peer
diff --git a/lib/logstash/util/zenoss.rb b/lib/logstash/util/zenoss.rb
index 3aab5fe1b..664331c49 100644
--- a/lib/logstash/util/zenoss.rb
+++ b/lib/logstash/util/zenoss.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require "beefcake"
 
 # Zenoss Protocol Buffers generated by beefcake then cleaned up and
diff --git a/lib/logstash/util/zeromq.rb b/lib/logstash/util/zeromq.rb
index 254aeaa9f..6939807cc 100644
--- a/lib/logstash/util/zeromq.rb
+++ b/lib/logstash/util/zeromq.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'ffi-rzmq'
 require "logstash/namespace"
 
diff --git a/lib/logstash/version.rb b/lib/logstash/version.rb
index 7f4dfd689..f93ded205 100644
--- a/lib/logstash/version.rb
+++ b/lib/logstash/version.rb
@@ -1,3 +1,4 @@
+# encoding: utf-8
 # The version of logstash.
 LOGSTASH_VERSION = "1.2.3.dev"