grafana-rb 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dc7f51380b937fa32c5800be68e2e200520f167
-  data.tar.gz: 345ad01d4b454bc1cc49bd24e428241b9b7f208b
+  metadata.gz: 0e6c02cb82164ba72d54f357f7666261006ce9f8
+  data.tar.gz: 777d42766e7c1fcce465b5f019cc5a8afe61825f
 SHA512:
-  metadata.gz: ac85c8eb209c986dd6dad22eec536ba1083b5cb830b817b89dc14be11d790c7528bf5125a95ff5d8ffc9fc3ae2d2bf000f606faee86d78fd3d4d9c70dc371a00
-  data.tar.gz: faa5c3e7ac4f4c1aa312f9a83706668b3dd95cf99b44709789550e51c9c8ed310aaa2b2023b894d1fedb8e6445443190b49d2e7b147ec112bdb00ee0ca832c8a
+  metadata.gz: 64a23476e8a9ea937fe249474a9773a448347e3c222adf5b39a2ff99a88be5bb5fecaebc07fa3ab19e05ed61bfccf100e0cc23b710405334339270767071ba95
+  data.tar.gz: 89c5539c887a303761e40868c8f9577d0b0cb8cfa939277631b0afbdb7ebe1b62d57ca4af392b4c18df05a1ea223d3cbfc0158636bd79a1fe200a94e8231d6f5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Grafana-rb 0.15.0 (April 11, 2017) ##
+
+* Support of multiple datasources and notifications.
+
 ## Grafana-rb 0.14.0 (April 10, 2017) ##
 
 * Add text panel support.

data/lib/grafana-rb/cli.rb

@@ -79,13 +79,11 @@ module GrafanaRb
         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"
         puts "grafana_password: secret            # 'admin' if missed"
-        puts "slack_channel: #alerts              # no slack notifications if missed"
-        puts "slack_url: https://hooks.slack.com/services/... # no slack notifications if missed"
-        puts "slack_mention: @john, @michelle     # optional"
         puts "require: [main.yml, dash*.yml]      # optional, [*.yml] by default"
+        puts "datasources: ...                    # datasources"
+        puts "notifications: ...                  # notifications"
         puts ""
         die
       end
@@ -117,39 +115,35 @@ module GrafanaRb
       }
     end
 
-    def create_or_update_prometheus_datasource
-      payload = {
-        name: "prometheus",
-        type: "prometheus",
-        url: "http://" + config["prometheus_url"],
-        access: "proxy"
-      }
-      if @datasource_id = request(:get, "/api/datasources/id/prometheus")["id"]
-        puts "update datasource"
-        request(:put, "/api/datasources/#{@datasource_id}", payload)
-      else
-        puts "create datasource"
-        @datasource_id = request(:post, "/api/datasources", payload)["id"]
+    def create_or_update_datasources
+      @datasource_ids = {}
+      (config["datasources"] || []).each do |payload|
+        if @datasource_ids[payload["name"]] = request(:get, "/api/datasources/id/#{payload["name"]}")["id"]
+          puts "update datasource: #{payload["name"]}"
+          request(:put, "/api/datasources/#{@datasource_ids[payload["name"]]}", payload)
+        else
+          puts "create datasource: #{payload["name"]}"
+          @datasource_ids[payload["name"]] = request(:post, "/api/datasources", payload)["id"]
+        end
       end
     end
 
     def create_or_update_slack_notifications
-      notif = request(:get, "/api/alert-notifications").find{ |s| s["name"] == "slack" }
-      if notif
-        method = :put
-        url = "/api/alert-notifications/#{notif["id"]}"
-        opts = {id: notif["id"]}
-      else
-        method = :post
-        url = "/api/alert-notifications"
-        opts = {}
+      @notif_ids = {}
+      (config["notifications"] || []).each do |payload|
+        notif = request(:get, "/api/alert-notifications").find{ |s| s["name"] == payload["name"] }
+        if notif
+          method = :put
+          url = "/api/alert-notifications/#{notif["id"]}"
+          opts = {id: notif["id"]}
+        else
+          method = :post
+          url = "/api/alert-notifications"
+          opts = {}
+        end
+        puts "create/update slack notifications: #{payload["name"]}"
+        @notif_ids[payload["name"]] = request(method, url, opts.merge(payload))["id"]
       end
-      puts "create/update slack notifications"
-      request(method, url, opts.merge(type: "slack", name: "slack", isDefault: true, settings: {
-        url: config["slack_url"],
-        recipient: config["slack_channel"],
-        mention: config["slack_mention"]
-      }))
     end
 
     def gen_panel_custom(id, datasource_id, desc)
@@ -157,7 +151,7 @@ module GrafanaRb
       i = -1
       exprs = desc.key?("exprs") ? desc["exprs"] : [{"expr" => desc["expr"]}]
       {
-        datasource: "prometheus",
+        datasource: @datasource_ids.invert[datasource_id],
         id: id,
         span: desc["span"] || 2,
         stack: desc["stack"],
@@ -181,7 +175,7 @@ module GrafanaRb
       }.merge(desc.key?("alert") ? {alert: desc["alert"], thresholds: desc["thresholds"]} : {})
     end
 
-    def gen_panel(id, datasource_id, desc)
+    def gen_panel(id, datasource_id, notif_id, desc)
       if desc["type"] == "text"
         {
           "content": desc["content"].to_s,
@@ -258,6 +252,10 @@ module GrafanaRb
           raise "wrong expr"
         end
 
+        notification = desc.delete('notification')
+        if notification
+          notif_id = @notif_ids[notification]
+        end
         gen_panel_custom(id, datasource_id, desc.merge(JSON.load(JSON.dump({
           exprs: [{expr: expr, title: nil}],
           fill: 0,
@@ -279,7 +277,8 @@ module GrafanaRb
             ],
             executionErrorState: "alerting",
             frequency: "30s",
-            name: desc["expr"]
+            name: desc["expr"],
+            notifications: (notif_id ? [{"id": notif_id}] : [])
           }
         }))))
 
@@ -292,16 +291,23 @@ module GrafanaRb
       editable = config.delete("editable") { true }
       duration = config.delete("duration") { "30m" }
       refresh = config.delete("refresh") { "10s" }
+      datasource = config.delete("datasource") { "unknown" }
+      notification = config.delete("notification") { nil }
       name = config.delete("name")
       puts "create/update dashboard '#{name}'"
 
+      unless @datasource_ids.key?(datasource)
+        puts "FATAL: unknown datasource for #{name} dashboard"
+        exit
+      end
+
       rows = config.map { |name, group| 
         group = {"panels" => group} if group.is_a?(Array)
         {
           title: group["title"] || name,
           showTitle: group.delete("showTitle") { true },
           height: group["height"] || 200,
-          panels: group["panels"].map { |panel| gen_panel((@panel_id += 1), @datasource_id, panel) }
+          panels: group["panels"].map { |panel| gen_panel((@panel_id += 1), @datasource_ids[datasource], @notif_ids[notification], panel) }
         }
       }
 
@@ -335,7 +341,6 @@ module GrafanaRb
     def apply
       check_config_existance
       die("missed grafana_url variable") unless config["grafana_url"]
-      die("missed prometheus_url variable") unless config["prometheus_url"]
 
       tool_version = config["tool_version"] || GrafanaRb::VERSION
       if compare_versions(tool_version, GrafanaRb::VERSION) > 0
@@ -343,8 +348,8 @@ module GrafanaRb
         exit -1
       end
 
-      create_or_update_prometheus_datasource
-      create_or_update_slack_notifications if config["slack_url"] && config["slack_channel"] 
+      create_or_update_datasources
+      create_or_update_slack_notifications
       dashboards.each do |dashboard|
         create_or_update_dashboard(deep_clone(dashboard))
       end

data/lib/grafana-rb/version.rb

@@ -1,3 +1,3 @@
 module GrafanaRb
-  VERSION = "0.14.0"
+  VERSION = "0.15.0"
 end

metadata

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