grafana-rb 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3156ec2300608d7d5823033df58876cdf87ed54e
-  data.tar.gz: b4a2f11146e868cb6499d7ae954ae05f2ba0c9d7
+  metadata.gz: 8d628d0e4ba67c8c1bb2242a292953d6edf67107
+  data.tar.gz: d646b0be5c8373b9b76b9d52bdab9bed79ea27f7
 SHA512:
-  metadata.gz: a640c8ebbf28899e98017853f94168deaaaf9890d4267344b8cdd06043c38b8bda991ecc9ff9267742fb7be2d8ebfbeacc8a2babdd773299c8c16d941a196ffc
-  data.tar.gz: 5486cd0110270a11c408f6a1b26f8805b9ee1181f9f0c2a88ddf030ed6a4a949436e5fd3aec13eb352464110c4e8f36d825833183639501b9162248036eef740
+  metadata.gz: b4a13c8f56a580b0337d8407b48e3d68773a22972639f5c1683ed4ad676ec050c22cc0b46807e18ba16839a1bbbf0bac73b6975ce1d0effce64b5ec1c3d3785e
+  data.tar.gz: 4f7aea50f71487907cb68cc801e0b5e3770c8c2ef9ff7b746c32dcf67edb40f6954368cbd195bc78d93c95343cd1ee4b06849aa25cde9f5e5222a764b570fbf8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Grafana-rb 0.12.0 (April 6, 2017) ##
+
+* Add optional `refresh` param.
+
 ## Grafana-rb 0.11.0 (April 6, 2017) ##
 
 * Add `tool_version` param to check minimum version

data/lib/grafana-rb/cli.rb

@@ -54,7 +54,12 @@ module GrafanaRb
         req.body = params.to_json
       end
       req.basic_auth grafana_user, grafana_password
-      JSON.load(http.request(req).body)
+      body = http.request(req).body
+      begin
+        JSON.load(body)
+      rescue
+        body
+      end
     end
 
     def die(msg = nil)
@@ -68,7 +73,7 @@ module GrafanaRb
 
     def check_config_existance
       unless File.exists?(config_file)
-        puts "FATAL: missed #{config_file} in current directory"
+        puts "FATAL: missed #{config_file} in working directory"
         puts "#{config_file} example:"
         puts ""
         puts "---"
@@ -276,6 +281,7 @@ module GrafanaRb
     def create_or_update_dashboard(config)
       editable = config.delete("editable") { true }
       duration = config.delete("duration") { "30m" }
+      refresh = config.delete("refresh") { "10s" }
       name = config.delete("name")
       puts "create/update dashboard '#{name}'"
 
@@ -295,7 +301,7 @@ module GrafanaRb
           tags: [TAG],
           editable: editable,
           time: {from: "now-#{duration}", to: "now"},
-          refresh: "10s",
+          refresh: refresh,
           rows: rows
         },
         overwrite: true
@@ -321,7 +327,7 @@ module GrafanaRb
       die("missed grafana_url variable") unless config["grafana_url"]
       die("missed prometheus_url variable") unless config["prometheus_url"]
 
-      tool_version = config["version"] || GrafanaRb::VERSION
+      tool_version = config["tool_version"] || GrafanaRb::VERSION
       if compare_versions(tool_version, GrafanaRb::VERSION) > 0
         puts "FATAL: need at least '#{tool_version}' tool version but current version is '#{GrafanaRb::VERSION}'"
         exit -1

data/lib/grafana-rb/version.rb

@@ -1,3 +1,3 @@
 module GrafanaRb
-  VERSION = "0.11.0"
+  VERSION = "0.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grafana-rb
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Alexey Vakhov