grafana-rb 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c327536b433f8d1a7ee301f62448bb85fa5b87bb
-  data.tar.gz: cb9ff0e4f9d98c5d84feea2cecb1f212442b67b6
+  metadata.gz: 3156ec2300608d7d5823033df58876cdf87ed54e
+  data.tar.gz: b4a2f11146e868cb6499d7ae954ae05f2ba0c9d7
 SHA512:
-  metadata.gz: f6b74e99e30807939dc72d9c1cc19c5c3cb45687cbcecc2c671036f88a635db49ef0e5417de604359d86ad9a852acaccecdacc81bbf890e67d2c7d9531ec6e9a
-  data.tar.gz: 4d935e6572aedfb577417dc3b4b5c63b3dac6d55e9d4364000276bb9468705f1865cc42ada0aafd10a6f136851f186d637701d1ccbd3168339f379a1d088a59a
+  metadata.gz: a640c8ebbf28899e98017853f94168deaaaf9890d4267344b8cdd06043c38b8bda991ecc9ff9267742fb7be2d8ebfbeacc8a2babdd773299c8c16d941a196ffc
+  data.tar.gz: 5486cd0110270a11c408f6a1b26f8805b9ee1181f9f0c2a88ddf030ed6a4a949436e5fd3aec13eb352464110c4e8f36d825833183639501b9162248036eef740

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Grafana-rb 0.11.0 (April 6, 2017) ##
+
+* Add `tool_version` param to check minimum version
+* Add param to alow use custom working directory
+
 ## Grafana-rb 0.10.0 (April 3, 2017) ##
 
 * Add optional `duration` param.

data/lib/grafana-rb/cli.rb

@@ -7,11 +7,15 @@ module GrafanaRb
   class Cli
     def initialize(argv)
       @argv = argv
+      @workdir = Dir.pwd
       @panel_id = 0
     end
 
     def run
-      if @argv[0] == "apply" || @argv[0] == "a" || @argv[0] == "q"
+      if @argv.last == "apply" || @argv.last == "a" || @argv.last == "q"
+        if @argv.size >= 2
+          @workdir = @argv[0]
+        end
         apply
       else
         usage
@@ -19,12 +23,15 @@ module GrafanaRb
     end
 
   private
-    CONFIG_FILE = "grafana.yml"
     REQUIRE_DEFAULT_TEMPLATE = ["*.yml"]
     DEFAULT_GRAFANA_USER = "admin"
     DEFAULT_GRAFANA_PASSWORD = "admin"
     TAG = "grafana-rb"
 
+    def config_file 
+      @config_file ||= File.join(@workdir, "grafana.yml")
+    end
+
     def request(method, path, params = {})
       uri = URI("http://" + config["grafana_url"] + path)
       http = Net::HTTP.new(uri.host, uri.port)
@@ -60,11 +67,12 @@ module GrafanaRb
     end
 
     def check_config_existance
-      unless File.exists?(CONFIG_FILE)
-        puts "FATAL: missed #{CONFIG_FILE} in current directory"
-        puts "#{CONFIG_FILE} example:"
+      unless File.exists?(config_file)
+        puts "FATAL: missed #{config_file} in current directory"
+        puts "#{config_file} example:"
         puts ""
         puts "---"
+        puts "tool_version: #{GrafanaRb::VERSION}"
         puts "grafana_url: monitoring.your-domain.com:3000     # required"
         puts "prometheus_url: monitoring.your-domain.com:9090  # required"
         puts "grafana_user: user                  # 'admin' if missed"
@@ -79,7 +87,7 @@ module GrafanaRb
     end
 
     def config
-      @config ||= YAML.load(File.read(CONFIG_FILE)) || {}
+      @config ||= YAML.load(File.read(config_file)) || {}
     end
 
     def grafana_user
@@ -92,8 +100,8 @@ module GrafanaRb
 
     def require_files
       @require_files ||= (config["require"] || REQUIRE_DEFAULT_TEMPLATE).flat_map { |template|
-        Dir[template]
-      }.map { |path| File.expand_path(path) } - [File.expand_path(CONFIG_FILE)]
+        Dir[File.join(@workdir, template)]
+      }.map { |path| File.expand_path(path) } - [File.expand_path(config_file)]
     end
 
     def dashboards
@@ -312,6 +320,13 @@ module GrafanaRb
       check_config_existance
       die("missed grafana_url variable") unless config["grafana_url"]
       die("missed prometheus_url variable") unless config["prometheus_url"]
+
+      tool_version = config["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
+      end
+
       create_or_update_prometheus_datasource
       create_or_update_slack_notifications if config["slack_url"] && config["slack_channel"] 
       dashboards.each do |dashboard|
@@ -321,12 +336,17 @@ module GrafanaRb
       puts "done."
     end
 
+    def compare_versions(a, b)
+      parse = proc { |v| v.split(".", 3).map(&:to_i) + [v.index("-dev") ? 1 : 0] }
+      parse.call(a) <=> parse.call(b)
+    end
+
     def usage
       puts "Grafana-rb: utility to configure grafana dashboards as a code"
       puts "Version: #{VERSION}"
       puts ""
       puts "Usage:"
-      puts "  grafana-rb <cmd>"
+      puts "  grafana-rb [work-dir] <cmd>"
       puts ""
       puts "Commands:"
       puts "  apply  - update dashboards"

data/lib/grafana-rb/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grafana-rb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Alexey Vakhov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-03 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler