From 76eab4e4280ebfec4b8dcc53b157e343ff8121e0 Mon Sep 17 00:00:00 2001 From: YammerAaron Date: Mon, 10 Jan 2011 14:42:43 -0800 Subject: [PATCH] Added zbx.dryrun call with JSON pretty print for human consumption --- lib/zabbix/sender.rb | 12 +++++++++++- lib/zabbix/sender/buffer.rb | 7 +++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/zabbix/sender.rb b/lib/zabbix/sender.rb index 5f46551..29b124a 100644 --- a/lib/zabbix/sender.rb +++ b/lib/zabbix/sender.rb @@ -68,10 +68,20 @@ def cons_zabbix_data_element(host, key, value, clock=Time.now.to_i) } end + def dryrun_zabbix_request(data) + request = Yajl::Encoder.encode({ + :request => 'agent data' , + :clock => Time.now.to_i, + :data => data + },:pretty => true) + puts "#{request}" + end + + def send_zabbix_request(data) status = false request = Yajl::Encoder.encode({ - :request => 'agent data' , + :request => 'agent data' , :clock => Time.now.to_i, :data => data }) diff --git a/lib/zabbix/sender/buffer.rb b/lib/zabbix/sender/buffer.rb index f6ffc3b..ba66ab3 100644 --- a/lib/zabbix/sender/buffer.rb +++ b/lib/zabbix/sender/buffer.rb @@ -21,4 +21,11 @@ def flush return ret end + def dryrun + return false unless @buffer.size > 0 + ret = dryrun_zabbix_request(@buffer) + @buffer.clear + return ret + end + end