barkdog 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c21615f347dced36cd4409fb53dc2df65166ee91
-  data.tar.gz: 08dae8f1e3eaab800c87fc5bae38068466b49193
+  metadata.gz: 72c3787a7e3e9dbfe3739e193c70e5d9a64113b5
+  data.tar.gz: e5362d78f263ba2a77e0aa28ad6c648c6d5d510a
 SHA512:
-  metadata.gz: 979495548620024f79d5bebf457f6826d307479ac239d567c45db493ebe4a3de4384c6a851914d6107517425d17c07a8ee6e023580011a725dda93649e718287
-  data.tar.gz: ec08151e9f466f7b00ea6cc32ab94248233ad27967605a257f118fb20358b09398ab7b85a89f127cd7295d54b05205e0c32fa72b1635876c880799a4ce86ccbd
+  metadata.gz: 56afbf59c6f690d741d4230058800a0617b68268f3c12ae74fd4aab58ec0fffeaf49a0e7afbdd683a709ffdb472ae0e4740b754087e3abd4c04e7335d7f71a1b
+  data.tar.gz: 2831088d7adb245160e4a1ed7d85f7be3aeea267bb59abf088b22158573e34896c633b8e031d5fbd3f817828daea85c5336affc179202943d147957259a268f5

data/.travis.yml

@@ -6,5 +6,5 @@ script:
   - bundle exec rake
 env:
   global:
-    - secure: "isrR0KYg4po5oZNWV3X6eSIryA7BdcMdyztIJPILZR0gRVd0IQLbe/0npvxFKzn7Y4mwQ/4N3oLnd1Jv/okuIC+zvMim+ZDyZP6uK0mDg9AFY718BVBhDcXjp85aW2KXki7dpUZ6G+cbsAtYbomEh/Soi3y47m+Ov/1odz7qylXBnwEZKbsxsoGd9iwb/DmFOCQeXvit+pQa4lPkTynu2etUxJtrzUPCxEBjcDXOB08GuDOQlAbnokiqN2pMwq60HC1UxynRF8OsUgb9yWOu+w80MbR5Qd+ZOXLe9sxY9/vuPPK3U3bwuuWEla2UVj/Ep2t19IzzkRTTrSBALqirOFJCMExJDBbgFgbwJ/uRYdpuNpvJvo5GcPWeYYJwvVQVA8vkOgUQkMZkhDPyOVNjwCrh+p43Qkjp52TcN/TzgMDSPI2FVKT/MkaymlbzVS/foq68E3D4DllapRr1GeDC1QWrBudVLyu+qjvlMAnTFb3tNj1nEo1FMS9bjgAvx9ZozWe6c04ERp58UWS9Yhd+zVaj92opJjC3NDopBTQpp7Qm3NSgWDexAmBmIVJZK1J7zjCZleaUXJSeYLzDvraiGdWwh1RLv494m0UvI1Mk+iKe6XvPnA0qN8hC+5lCUX2DgfoW5lVvzpYRUbT1+51/6dl37EPxyDMrTTMeCUuswgY="
-    - secure: "WDt4jTFiBqERrGGA1XUIDKkbidYfvoXA1FLXPU70fj2xoB1tjVMW8MPZfgcVwMhDtqEVeVZ75lygad3Ib8yJLpGtWMnI9Lw6a4/kSnruSdn9pgrqxIOZqndjnIPPkiTZSWd+jrVypsq+z9NSkEYAcLUhLSV72AZB4hcQ0/LO9p3gNS0dqT83hILvuMF34WCx1oTIS9QmjBFuJInAK2vAObb4zfw50HTQUxjtfiZRDN+TUUzHNeZAPPUVg/jGrD+mUxnPi2m5hPUiSga9tyBgTCEMvJV4JuvK3qtcB1PHdsrddEnyAHRsE3GUBSosqKgEFHOib9NLYVx/9UQp/EEq4D+df+8rFK6setYTgZNNOV/S+7odX8/kd/N9PUVRUULjHnYGgSuqQFGXU07qYvdLPVFedmYVWoM+HdCQ+S1FYARqz0W7skrcIg/MuDXAu9PmTLUgCQMr5Ti4vkPaGnq0KHtkxxA73XzYg9zeti7WUFZ14pNH+2MBQ87mjW73ZZ5b5bkxOQ1TTZGaNSiu0Eds58fonVvg1GZrwkxeWgOuxJ6j8+cKQi554AmpRLCUS66e0J3teDWPiJZSc+1VoHm26OFN2UGh8M9XPDRIIF/DO6Xl8/3EnI0O0HsHTSeaXtPkUh6+QJtjoeOcEewl6EDheKVw07CmaFbR1tS2DDiUlGk="
+    - BARKDOG_TEST_API_KEY=31aef8b41be3ad6070ea1013b90fc9e8
+    - BARKDOG_TEST_APP_KEY=d31f2d115e8a70f5647bf691081a292cd631c3be

data/README.md

@@ -9,7 +9,7 @@ It defines Datadog monitors using Ruby DSL, and updates monitors according to DS
 
 ## Notice
 * `>= 0.1.3`
-  * Support Template 
+  * Support Template
 
 ## Installation
 
@@ -48,10 +48,13 @@ Usage: barkdog [options]
     -a, --apply
     -f, --file FILE
         --dry-run
+        --ignore-silenced
     -e, --export
     -o, --output FILE
         --no-color
+        --no-delete
         --debug
+        --datadog-timeout TIMEOUT
     -h, --help
 ```
 

data/barkdog.gemspec

@@ -26,4 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec', '>= 0.3.0'
+  spec.add_development_dependency 'rspec-match_fuzzy'
 end

data/bin/barkdog

@@ -23,20 +23,23 @@ options = {
   :ignore_silenced => false,
   :color           => true,
   :debug           => false,
+  :datadog_timeout => nil
 }
 
 ARGV.options do |opt|
   begin
-    opt.on(''  , '--api-key API_KEY') {|v| options[:api_key]          = v       }
-    opt.on(''  , '--app-key APP_KEY') {|v| options[:application_key]  = v       }
-    opt.on('-a', '--apply')           {    mode                       = :apply   }
-    opt.on('-f', '--file FILE')       {|v| file                       = v        }
-    opt.on(''  , '--dry-run')         {    options[:dry_run]          = true     }
-    opt.on(''  , '--ignore-silenced') {    options[:ignore_silenced]  = true     }
-    opt.on('-e', '--export')          {    mode                       = :export  }
-    opt.on('-o', '--output FILE')     {|v| output_file                = v        }
-    opt.on(''  , '--no-color')        {    options[:color]            = false    }
-    opt.on(''  , '--debug')           {    options[:debug]            = true     }
+    opt.on(''  , '--api-key API_KEY')         {|v| options[:api_key]          = v        }
+    opt.on(''  , '--app-key APP_KEY')         {|v| options[:application_key]  = v        }
+    opt.on('-a', '--apply')                   {    mode                       = :apply   }
+    opt.on('-f', '--file FILE')               {|v| file                       = v        }
+    opt.on(''  , '--dry-run')                 {    options[:dry_run]          = true     }
+    opt.on(''  , '--ignore-silenced')         {    options[:ignore_silenced]  = true     }
+    opt.on('-e', '--export')                  {    mode                       = :export  }
+    opt.on('-o', '--output FILE')             {|v| output_file                = v        }
+    opt.on(''  , '--no-color')                {    options[:color]            = false    }
+    opt.on(''  , '--no-delete')               {    options[:no_delete]        = true     }
+    opt.on(''  , '--debug')                   {    options[:debug]            = true     }
+    opt.on(''  , '--datadog-timeout TIMEOUT') {|v| options[:datadog_timeout]  = v.to_i   }
 
     opt.on('-h', '--help') do
       puts opt.help

data/lib/barkdog/client.rb

@@ -8,7 +8,9 @@ class Barkdog::Client
     raise 'API Key does not exist' unless api_key
     raise 'Application Key does not exist' unless app_key
 
-    @dog = Dogapi::Client.new(api_key, app_key)
+    # api_key, application_key=nil, host=nil, device=nil, silent=true, timeout=nil
+    # We force silent to false so any exceptions get propated back out and we fail loudly.
+    @dog = Dogapi::Client.new(api_key, app_key, nil, nil, false, @options[:datadog_timeout])
     @driver = Barkdog::Driver.new(@dog, @options)
   end
 

data/lib/barkdog/driver.rb

@@ -31,6 +31,8 @@ class Barkdog::Driver
   end
 
   def delete_monitor(name, attrs)
+    return false if @options[:no_delete]
+
     updated = false
     log(:info, "Delete Monitor: #{name}", :color => :red)
 
@@ -47,8 +49,8 @@ class Barkdog::Driver
     updated = false
 
     if @options[:ignore_silenced]
-      expected['options'].delete('silenced')
-      actual['options'].delete('silenced')
+      expected['options'].delete('silenced') if expected['options']
+      actual['options'].delete('silenced') if actual['options']
     end
 
     diffy = Diffy::Diff.new(

data/lib/barkdog/version.rb

@@ -1,3 +1,3 @@
 module Barkdog
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/spec/barkdog_create_spec.rb

@@ -0,0 +1,90 @@
+describe Barkdog::Client do
+  subject { barkdog_client(options).export }
+  let(:options) { {} }
+
+  let(:dsl) {
+    <<-'RUBY'
+      monitor "my metric check", :type=>"metric alert" do
+        query "avg(last_5m):avg:datadog.dogstatsd.packet.count{*} > 1"
+        message "metric check message"
+        options do
+          locked false
+          no_data_timeframe 2
+          notify_audit false
+          notify_no_data false
+          silenced({})
+        end
+      end
+
+      monitor "my service check", :type=>"service check" do
+        query "\"datadog.agent.up\".over(\"*\").last(2).count_by_status()"
+        message "service check message"
+        options do
+          locked false
+          no_data_timeframe 2
+          notify_audit false
+          notify_no_data true
+          period 15
+          renotify_interval 0
+          silenced({})
+          thresholds "critical"=>1, "ok"=>1, "warning"=>1
+          timeout_h 0
+        end
+      end
+    RUBY
+  }
+
+  context 'when create monitors' do
+    specify do
+      barkdog(options) { dsl }
+      expect(subject).to match_fuzzy dsl
+    end
+  end
+
+  context 'when use template monitors' do
+    specify do
+      barkdog(options) {
+        <<-'RUBY'
+          template 'my metric check' do
+            query "avg(last_5m):avg:datadog.dogstatsd.packet.count{*} > 1"
+            message "metric check message"
+            options do
+              locked false
+              no_data_timeframe context.no_data_timeframe
+              notify_audit false
+              notify_no_data false
+              silenced({})
+            end
+          end
+
+          template "my service check options" do
+            locked false
+            no_data_timeframe 2
+            notify_audit false
+            notify_no_data true
+            period context.period
+            renotify_interval 0
+            silenced({})
+            thresholds "critical"=>1, "ok"=>1, "warning"=>1
+            timeout_h 0
+          end
+
+          monitor "my metric check", :type=>"metric alert" do
+            include_template "my metric check", :no_data_timeframe=>2
+          end
+
+          monitor "my service check", :type=>"service check" do
+            query "\"datadog.agent.up\".over(\"*\").last(2).count_by_status()"
+            message "service check message"
+            options do
+              context.period = 15
+              include_template "my service check options"
+            end
+          end
+        RUBY
+      }
+
+      expect(subject).to match_fuzzy dsl
+    end
+  end
+end

data/spec/barkdog_delete_spec.rb

@@ -0,0 +1,60 @@
+describe Barkdog::Client do
+  subject { barkdog_client(options).export }
+  let(:options) { {} }
+
+  let(:dsl) {
+    <<-'RUBY'
+      monitor "my metric check", :type=>"metric alert" do
+        query "avg(last_5m):avg:datadog.dogstatsd.packet.count{*} > 1"
+        message "metric check message"
+        options do
+          locked false
+          no_data_timeframe 2
+          notify_audit false
+          notify_no_data false
+          silenced({})
+        end
+      end
+
+      monitor "my service check", :type=>"service check" do
+        query "\"datadog.agent.up\".over(\"*\").last(2).count_by_status()"
+        message "service check message"
+        options do
+          locked false
+          no_data_timeframe 2
+          notify_audit false
+          notify_no_data true
+          period 15
+          renotify_interval 0
+          silenced({})
+          thresholds "critical"=>1, "ok"=>1, "warning"=>1
+          timeout_h 0
+        end
+      end
+    RUBY
+  }
+
+  context 'when delete monitors' do
+    before do
+      barkdog(options) { dsl }
+    end
+
+    specify do
+      barkdog(options) { '' }
+      expect(subject).to match_fuzzy ''
+    end
+  end
+
+  context 'when delete monitors (no delete)' do
+    let(:options) { {no_delete: true} }
+
+    before do
+      barkdog(options) { dsl }
+    end
+
+    specify do
+      barkdog(options) { '' }
+      expect(subject).to match_fuzzy dsl
+    end
+  end
+end

data/spec/barkdog_update_spec.rb

@@ -0,0 +1,88 @@
+describe Barkdog::Client do
+  subject { barkdog_client(options).export }
+  let(:options) { {} }
+
+  let(:before_dsl) do
+    <<-'RUBY'
+      monitor "my metric check", :type=>"metric alert" do
+        query "avg(last_5m):avg:datadog.dogstatsd.packet.count{*} > 1"
+        message "metric check message"
+        options do
+          locked false
+          no_data_timeframe 2
+          notify_audit false
+          notify_no_data false
+          silenced({})
+        end
+      end
+
+      monitor "my service check", :type=>"service check" do
+        query "\"datadog.agent.up\".over(\"*\").last(2).count_by_status()"
+        message "service check message"
+        options do
+          locked false
+          no_data_timeframe 2
+          notify_audit false
+          notify_no_data true
+          period 15
+          renotify_interval 0
+          silenced({})
+          thresholds "critical"=>1, "ok"=>1, "warning"=>1
+          timeout_h 0
+        end
+      end
+    RUBY
+  end
+
+  let(:update_dsl) do
+    <<-'RUBY'
+      monitor "my metric check", :type=>"metric alert" do
+        query "avg(last_5m):avg:datadog.dogstatsd.packet.count{*} > 2"
+        message "metric check message2"
+        options do
+          locked false
+          no_data_timeframe 3
+          notify_audit true
+          notify_no_data true
+          silenced "*"=>nil
+        end
+      end
+
+      monitor "my service check", :type=>"service check" do
+        query "\"datadog.agent.up\".over(\"*\").last(3).count_by_status()"
+        message "service check message2"
+        options do
+          locked false
+          no_data_timeframe 3
+          notify_audit true
+          notify_no_data true
+          period 30
+          renotify_interval 1
+          silenced "*"=>nil
+          thresholds "critical"=>2, "ok"=>2, "warning"=>2
+          timeout_h 1
+        end
+      end
+    RUBY
+  end
+
+  context 'when update monitors' do
+    before do
+      barkdog(options) { before_dsl }
+    end
+
+    specify do
+      barkdog(options) { update_dsl }
+      expect(subject).to match_fuzzy update_dsl
+    end
+  end
+
+  context 'when use template monitors (ignore silenced)' do
+    let(:options) { {ignore_silenced: true} }
+
+    specify do
+      barkdog(options) { update_dsl }
+      expect(subject).to match_fuzzy update_dsl.gsub('silenced "*"=>nil', '')
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'barkdog'
 require 'tempfile'
+require 'rspec/match_fuzzy'
 
 BARKDOG_TEST_API_KEY = ENV['BARKDOG_TEST_API_KEY']
 BARKDOG_TEST_APP_KEY = ENV['BARKDOG_TEST_APP_KEY']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barkdog
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogapi
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: rspec-match_fuzzy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Barkdog is a tool to manage Datadog monitors.
 email:
 - sgwr_dts@yahoo.co.jp
@@ -139,7 +153,9 @@ files:
 - lib/barkdog/logger.rb
 - lib/barkdog/template_helper.rb
 - lib/barkdog/version.rb
-- spec/barkdog_spec.rb
+- spec/barkdog_create_spec.rb
+- spec/barkdog_delete_spec.rb
+- spec/barkdog_update_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/winebarrel/barkdog
 licenses:
@@ -166,5 +182,7 @@ signing_key:
 specification_version: 4
 summary: Barkdog is a tool to manage Datadog monitors.
 test_files:
-- spec/barkdog_spec.rb
+- spec/barkdog_create_spec.rb
+- spec/barkdog_delete_spec.rb
+- spec/barkdog_update_spec.rb
 - spec/spec_helper.rb

data/spec/barkdog_spec.rb

@@ -1,132 +0,0 @@
-describe Barkdog::Client do
-  subject { barkdog_client.export }
-
-  let(:dsl) do
-    <<-'RUBY'
-monitor "my metric check", :type=>"metric alert" do
-  query "avg(last_5m):avg:datadog.dogstatsd.packet.count{*} > 1"
-  message "metric check message"
-  options do
-    locked false
-    no_data_timeframe 2
-    notify_audit false
-    notify_no_data false
-    silenced({})
-  end
-end
-
-monitor "my service check", :type=>"service check" do
-  query "\"datadog.agent.up\".over(\"*\").last(2).count_by_status()"
-  message "service check message"
-  options do
-    locked false
-    no_data_timeframe 2
-    notify_audit false
-    notify_no_data true
-    period 15
-    renotify_interval 0
-    silenced({})
-    thresholds "critical"=>1, "ok"=>1, "warning"=>1
-    timeout_h 0
-  end
-end
-    RUBY
-  end
-
-  let(:actual_dsl) { dsl }
-  let(:expected_dsl) { dsl }
-
-  before { barkdog { actual_dsl } }
-
-  context 'when create monitors' do
-    it { is_expected.to eq expected_dsl }
-  end
-
-  context 'when use template monitors' do
-    let(:actual_dsl) do
-      <<-'RUBY'
-template 'my metric check' do
-  query "avg(last_5m):avg:datadog.dogstatsd.packet.count{*} > 1"
-  message "metric check message"
-  options do
-    locked false
-    no_data_timeframe context.no_data_timeframe
-    notify_audit false
-    notify_no_data false
-    silenced({})
-  end
-end
-
-template "my service check options" do
-  locked false
-  no_data_timeframe 2
-  notify_audit false
-  notify_no_data true
-  period context.period
-  renotify_interval 0
-  silenced({})
-  thresholds "critical"=>1, "ok"=>1, "warning"=>1
-  timeout_h 0
-end
-
-monitor "my metric check", :type=>"metric alert" do
-  include_template "my metric check", :no_data_timeframe=>2
-end
-
-monitor "my service check", :type=>"service check" do
-  query "\"datadog.agent.up\".over(\"*\").last(2).count_by_status()"
-  message "service check message"
-  options do
-    context.period = 15
-    include_template "my service check options"
-  end
-end
-      RUBY
-    end
-
-    it { is_expected.to eq expected_dsl }
-  end
-
-  context 'when delete monitors' do
-    let(:expected_dsl) { '' }
-    before { barkdog { expected_dsl } }
-    it { is_expected.to eq expected_dsl }
-  end
-
-  context 'when update monitors' do
-    let(:expected_dsl) do
-      <<-'RUBY'
-monitor "my metric check", :type=>"metric alert" do
-  query "avg(last_5m):avg:datadog.dogstatsd.packet.count{*} > 2"
-  message "metric check message2"
-  options do
-    locked false
-    no_data_timeframe 3
-    notify_audit true
-    notify_no_data true
-    silenced "*"=>nil
-  end
-end
-
-monitor "my service check", :type=>"service check" do
-  query "\"datadog.agent.up\".over(\"*\").last(3).count_by_status()"
-  message "service check message2"
-  options do
-    locked false
-    no_data_timeframe 3
-    notify_audit true
-    notify_no_data true
-    period 30
-    renotify_interval 1
-    silenced "*"=>nil
-    thresholds "critical"=>2, "ok"=>2, "warning"=>2
-    timeout_h 1
-  end
-end
-      RUBY
-    end
-
-    before { barkdog { expected_dsl } }
-    it { is_expected.to eq expected_dsl }
-  end
-end