zabbix_graph 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a948a295b74d3ef57097f5d32440d4f19a92cf79
-  data.tar.gz: fc54a39e4e9c3eace4c5f12ec1acb16e9f95c99c
+  metadata.gz: 7b7abd8af739adb497359596530eaf4afba87f59
+  data.tar.gz: 1680e98fb258b00120c3bd99211e2430cc60584c
 SHA512:
-  metadata.gz: 0d5099ab96cdfe4c30c4a807e9fab02f4c8954154ae890342c0a2b2b1d6d0a74e5b5f3dab726c4a622af35e42439a566bb62b74f11e417153268221739bdde28
-  data.tar.gz: e51a130b9da10afe7574de82e77e1c526f1ab7c0f95224a6e83da7cc67e19a4b60a3717e308baa368c448705c1f0efe13f8776a158cc19c03b5d011344f30076
+  metadata.gz: 676fe4ac999bf6fefafa122efef76932c9d5918536d39f9e184b2b7467b40efe9b44521c32d29dfb35bb921a8f07498d484f426852e4daf0ebc389687f67d306
+  data.tar.gz: fa62deb91dc069fe53df259392cac8a1555cc8df6b7b43f29042e569da190f70f70b4eeed2ab62299ad3600f1c5efc9dabf42b5db1994f27813e92c4f9a63e42

data/README.md

@@ -15,6 +15,17 @@ $ export ZABBIX_PASSWORD=...
 $ zabbix_graph
 ```
 
+### --item-graph and --host-graph
+
+You can view graphs per item or host.
+
+```
+$ zabbix_graph --item-graph
+$ zabbix_graph --host-graph
+$ zabbix_graph --item-graph --period=1d1h1m1s
+$ zabbix_graph --host-graph --period=1d1h1m1s
+```
+
 ## Contributing
 
 1. Fork it ( https://github.com/[my-github-username]/zabbix_graph/fork )

data/lib/zabbix_graph.rb

@@ -16,6 +16,7 @@ module ZabbixGraph
       parser = OptionParser.new
       parser.on('--host-graph') { options[:host_graph] = true }
       parser.on('--item-graph') { options[:item_graph] = true }
+      parser.on('--period=VAL') {|v| options[:period] = v }
       parser.parse!(argv)
 
       options
@@ -126,7 +127,7 @@ module ZabbixGraph
     end
 
     def query_string_from_items(items)
-      query = [['action', 'batchgraph'], ['graphtype', '0']]
+      query = [['action', 'batchgraph'], ['graphtype', '0'], ['period', period.to_s]]
       items.each do |i|
         query << ['itemids[]', i['itemid']]
       end
@@ -134,6 +135,24 @@ module ZabbixGraph
       URI.encode_www_form(query)
     end
 
+    def period
+      return 3600 unless @options[:period]
+
+      @options[:period].scan(/(\d+)([smhd])/).map do |part|
+        scale = case part[1]
+                when "s"
+                  1
+                when "m"
+                  60
+                when "h"
+                  60 * 60
+                when "d"
+                  60 * 60 * 24
+                end
+        part[0].to_i * scale
+      end.inject(0) {|sum, i| sum + i }
+    end
+
     def zbx
       @zbx ||= ZabbixApi.connect(
         url: URI.join(zabbix_url, '/api_jsonrpc.php').to_s,

data/lib/zabbix_graph/version.rb

@@ -1,3 +1,3 @@
 module ZabbixGraph
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zabbix_graph
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zabbixapi