github-mirrors/logstash
1
0
Fork 0
mirror of https://github.com/elastic/logstash.git synced 2025-04-24 06:37:19 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix #7277 Review updates

Browse source 
Fixes #7321
This commit is contained in:
Jake Landis 2017-06-09 08:59:04 -05:00
parent 55979c3a07
commit 5b4a725a36
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
qa/integration/services/monitoring_api.rb
View file

@ -38,8 +38,8 @@ class MonitoringAPI
JSON.parse(resp)
end
def logging_put(json_body)
resp = Manticore.put("http://localhost:9600/_node/logging", {headers: {"Content-Type" => "application/json"}, body: json_body }).body
def logging_put(body)
resp = Manticore.put("http://localhost:9600/_node/logging", {headers: {"Content-Type" => "application/json"}, body: body.to_json }).body
JSON.parse(resp)
end
end

12
qa/integration/specs/monitoring_api_spec.rb
View file

@ -92,20 +92,20 @@ describe "Test Monitoring API" do
logging_get_assert logstash_service, "INFO", "TRACE"
#root logger - does not apply to logger.slowlog
logging_put_assert logstash_service.monitoring_api.logging_put({"logger." => "WARN"}.to_json)
logging_put_assert logstash_service.monitoring_api.logging_put({"logger." => "WARN"})
logging_get_assert logstash_service, "WARN", "TRACE"
logging_put_assert logstash_service.monitoring_api.logging_put({"logger." => "INFO"}.to_json)
logging_put_assert logstash_service.monitoring_api.logging_put({"logger." => "INFO"})
logging_get_assert logstash_service, "INFO", "TRACE"
#package logger
logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash.agent" => "DEBUG"}.to_json)
logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash.agent" => "DEBUG"})
expect(logstash_service.monitoring_api.logging_get["loggers"]["logstash.agent"]).to eq ("DEBUG")
logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash.agent" => "INFO"}.to_json)
logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash.agent" => "INFO"})
logging_get_assert logstash_service, "INFO", "TRACE"
#parent package loggers
logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash" => "ERROR"}.to_json)
logging_put_assert logstash_service.monitoring_api.logging_put({"logger.slowlog" => "ERROR"}.to_json)
logging_put_assert logstash_service.monitoring_api.logging_put({"logger.logstash" => "ERROR"})
logging_put_assert logstash_service.monitoring_api.logging_put({"logger.slowlog" => "ERROR"})
result = logstash_service.monitoring_api.logging_get
result["loggers"].each do | k, v |