barkdog 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8eb8ef495351e01eb4686bbc1d73c68529267ae0
-  data.tar.gz: 69eeda438a1769ddce356e142ff224397b3830b9
+  metadata.gz: 0b5e5d649d610c2a18c3e7185cf455c98ef6adcb
+  data.tar.gz: 99bb65f4e8e0e695a6adda0e95c8d56f62af6b25
 SHA512:
-  metadata.gz: 912452f325a9a745879cb0ca115494967d73cea9c1a460e16101b7fcfc12990d21b7436126206c9575a655769b1936122088fac701bb556bd5a6cf9ed3dfaa59
-  data.tar.gz: 8fb714af798b001fee0d23ca4c7ea63237b86fd39ffdd3bfc7f615d5ad60712526d6d42869336d2f027a3dc547fcdfa16891d0a0d2e8f550d0fcc86a187ba9c5
+  metadata.gz: 8ed8488deaa1d47587baef8eaa428bc96f5531dfae1844edf9da4b0e8ef4da8015b53f5041e00b1d88d65a04ca37cf191e63f3041dd7b45fd768c2b50f58c7cb
+  data.tar.gz: 007ec89d86de1ad97fc72e3ec9dfc7ed2189d3288cef44568df6c60b52bfcb878886450e7ef6ca3b60325266056488ed2c052806c39edca34c57f626a4827c76

data/barkdog.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'dogapi'
   spec.add_dependency 'term-ansicolor'
+  spec.add_dependency 'diffy'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/barkdog.rb

@@ -2,6 +2,7 @@ require 'dogapi'
 require 'logger'
 require 'singleton'
 require 'term/ansicolor'
+require 'diffy'
 
 module Barkdog; end
 

data/lib/barkdog/client.rb

@@ -63,7 +63,7 @@ class Barkdog::Client
     monitor_id = actual_without_id.delete('id')
 
     if expected != actual_without_id
-      updated = @driver.update_monitor(name, expected.merge('id' => monitor_id)) || updated
+      updated = @driver.update_monitor(name, expected.merge('id' => monitor_id), actual) || updated
     end
 
     updated

data/lib/barkdog/driver.rb

@@ -37,25 +37,28 @@ class Barkdog::Driver
     updated
   end
 
-  def update_monitor(name, attrs)
+  def update_monitor(name, expected, actual)
     updated = false
-    log(:info, "Update Monitor: #{name}", :color => :green)
 
-    attrs.each do |key, value|
-      next if key == 'id'
-      log(:info, " set #{key}=#{value}", :color => :green)
-    end
+    diffy = Diffy::Diff.new(
+      Barkdog::DSL::Converter.convert({name => actual}),
+      Barkdog::DSL::Converter.convert({name => expected}),
+      :diff => "-u"
+    )
 
-    unless @options[:dry_run]
-      @dog.update_monitor(
-        attrs['id'],
-        attrs['query'],
-        :name => name,
-        :message => attrs['message'],
-        :options => attrs['options']
-      )
-
-      updated = true
+    if diffy.diff.size > 0
+      log(:info, "Update Monitor: #{name}", :color => :cyan)
+      log(:info, diffy.to_s(:color), :color => false )
+      unless @options[:dry_run]
+        @dog.update_monitor(
+          expected['id'],
+          expected['query'],
+          :name => name,
+          :message => expected['message'],
+          :options => expected['options']
+        )
+        updated = true
+      end
     end
 
     updated

data/lib/barkdog/dsl/converter.rb

@@ -51,17 +51,16 @@ end
   def output_monitor_options(monitor_options)
     options_body = monitor_options.map {|key, value|
       value_is_hash = value.is_a?(Hash)
-      value = value.inspect
 
       if value_is_hash
-        value = unbrace(value).strip
+        value = value.map{ |k,v| "#{k.inspect}=>#{v.inspect}" }.sort.join(", ")
         value = value.empty? ? '({})' : " #{value}"
       else
-        value = " #{value}"
+        value = " #{value.inspect}"
       end
 
       "#{key}#{value}"
-    }.join("\n    ")
+    }.sort.join("\n    ")
 
     <<-RUBY.chomp
   options do

data/lib/barkdog/version.rb

@@ -1,3 +1,3 @@
 module Barkdog
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/barkdog_spec.rb

@@ -7,9 +7,9 @@ monitor "my metric check", :type=>"metric alert" do
   query "avg(last_5m):avg:datadog.dogstatsd.packet.count{*} > 1"
   message "metric check message"
   options do
-    notify_no_data false
     no_data_timeframe 2
     notify_audit false
+    notify_no_data false
     silenced({})
   end
 end
@@ -18,14 +18,14 @@ monitor "my service check", :type=>"service check" do
   query "\"datadog.agent.up\".over(\"*\").last(2).count_by_status()"
   message "service check message"
   options do
+    no_data_timeframe 2
     notify_audit false
-    timeout_h 0
-    silenced({})
-    thresholds "warning"=>1, "ok"=>1, "critical"=>1
-    period 15
     notify_no_data true
+    period 15
     renotify_interval 0
-    no_data_timeframe 2
+    silenced({})
+    thresholds "critical"=>1, "ok"=>1, "warning"=>1
+    timeout_h 0
   end
 end
     RUBY
@@ -50,9 +50,9 @@ monitor "my metric check", :type=>"metric alert" do
   query "avg(last_5m):avg:datadog.dogstatsd.packet.count{*} > 2"
   message "metric check message2"
   options do
-    notify_no_data true
     no_data_timeframe 3
     notify_audit true
+    notify_no_data true
     silenced "*"=>nil
   end
 end
@@ -61,14 +61,14 @@ monitor "my service check", :type=>"service check" do
   query "\"datadog.agent.up\".over(\"*\").last(3).count_by_status()"
   message "service check message2"
   options do
+    no_data_timeframe 3
     notify_audit true
-    timeout_h 1
-    silenced "*"=>nil
-    thresholds "warning"=>2, "ok"=>2, "critical"=>2
-    period 30
     notify_no_data true
+    period 30
     renotify_interval 1
-    no_data_timeframe 3
+    silenced "*"=>nil
+    thresholds "critical"=>2, "ok"=>2, "warning"=>2
+    timeout_h 1
   end
 end
       RUBY

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barkdog
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogapi
@@ -38,6 +38,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement