diff --git a/src/kibana/components/filter_bar/filter_bar.html b/src/kibana/components/filter_bar/filter_bar.html index 86003fcbafabb..be13fd77d9746 100644 --- a/src/kibana/components/filter_bar/filter_bar.html +++ b/src/kibana/components/filter_bar/filter_bar.html @@ -5,7 +5,7 @@ "{{ filter.value }}"
- toggle + enabledisable remove
diff --git a/src/server/bin/initialize b/src/server/bin/initialize index 712c8ff38c89a..a7820ca43c085 100755 --- a/src/server/bin/initialize +++ b/src/server/bin/initialize @@ -28,6 +28,9 @@ parser = OptionParser.new do |opts| opts.on('-p', '--port PORT', 'Kibana port') do |arg| options[:port] = arg end + opts.on('-q', '--quiet', 'Turns off logging') do |arg| + options[:quiet] = arg + end opts.on('-H', '--host HOST', 'Kibana host') do |arg| options[:host] = arg end @@ -68,6 +71,7 @@ Kibana.global_settings[:host] = host || '0.0.0.0' Kibana.global_settings[:config] = config Kibana.global_settings[:elasticsearch] = elasticsearch Kibana.global_settings[:root] = File.expand_path("#{File.dirname(__FILE__)}/../") +Kibana.global_settings[:quiet] = options[:quiet] # Set the public folder based on whether we are running in production or not. if ENV['RACK_ENV'] == ('production') diff --git a/src/server/lib/app.rb b/src/server/lib/app.rb index 05d74038e0658..47afb78c80210 100644 --- a/src/server/lib/app.rb +++ b/src/server/lib/app.rb @@ -37,7 +37,7 @@ class App < Sinatra::Base end configure :production do - use JSONLogger, settings.logger + use JSONLogger, settings.logger unless Kibana.global_settings[:quiet] end configure :quiet do @@ -45,7 +45,7 @@ class App < Sinatra::Base end configure :development do - use ColorLogger, settings.logger + use ColorLogger, settings.logger unless Kibana.global_settings[:quiet] end error do diff --git a/src/server/lib/server.rb b/src/server/lib/server.rb index ea0a63e8721b4..b31854934627e 100644 --- a/src/server/lib/server.rb +++ b/src/server/lib/server.rb @@ -17,6 +17,7 @@ module Server } def self.log(msg) + return if Kibana.global_settings[:quiet] if ENV['RACK_ENV'] == 'production' data = { "@timestamp" => Time.now.iso8601,