barkdog 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ad96f41f70527e373b9a3692bd958719dd8c252
-  data.tar.gz: 88506b2d709e7b35f051cc56f9632578e0626f70
+  metadata.gz: 664faf09036f76de878c2740b01aba796d7bfc04
+  data.tar.gz: 86e38039a21ecca783b6cb8a8e78541844830190
 SHA512:
-  metadata.gz: b5dd8b5e4961137354df664f063c0de173301d6f4f8a920a3499c4798ae135482e9638aa143d3ccca2b3c451b408692998bf4404951e7c8670edc7029677e779
-  data.tar.gz: d27eb6b936e21369ae4766f9d7ceb1e8ad7b122797785af2c2bd877618945da4b7f6a21d2402d77811b4327c67ceffcf4f330ecd14429bd1fa4b7c5893840fa2
+  metadata.gz: 4451cb38fdeffd9c21b7fcdfa96026a69708fe0d985c04877c0e3fef7c5d8e33e086d1804d032842488e856deec9bbf4d955dac074323a06ce8845da6e7717a8
+  data.tar.gz: 8a73bf98f571b4768a48f515f4ca57f7006948324126ec55c2d71807d33dd3b2f7781300157ee7b9e46fecdfa38a2a5891a37ff12b041feff7779d9380901738

data/README.md

@@ -53,8 +53,10 @@ Usage: barkdog [options]
     -o, --output FILE
         --no-color
         --no-delete
+        --delete-only-tagged TAG
         --debug
         --datadog-timeout TIMEOUT
+        --fail-if-empty
     -h, --help
 ```
 
@@ -64,6 +66,7 @@ Usage: barkdog [options]
 monitor "Check load avg", :type=>"metric alert" do
   query "avg(last_5m):avg:ddstat.load_avg.1m{host:i-XXXXXXXX} > 1"
   message "@winebarrel@example.net"
+  tags ["load", "host", "example"]
   options do
     locked false
     new_host_delay 300

data/bin/barkdog

@@ -23,7 +23,8 @@ options = {
   :ignore_silenced => false,
   :color           => true,
   :debug           => false,
-  :datadog_timeout => nil
+  :datadog_timeout => nil,
+  :fail_if_empty   => false
 }
 
 ARGV.options do |opt|
@@ -38,8 +39,10 @@ ARGV.options do |opt|
     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(''  , '--delete-only-tagged TAG')  {|v| options[:delete_tagged]    = v        }
     opt.on(''  , '--debug')                   {    options[:debug]            = true     }
     opt.on(''  , '--datadog-timeout TIMEOUT') {|v| options[:datadog_timeout]  = v.to_i   }
+    opt.on(''  , '--fail-if-empty')           {    options[:fail_if_empty]    = false    }
 
     opt.on('-h', '--help') do
       puts opt.help

data/lib/barkdog/client.rb

@@ -28,6 +28,9 @@ class Barkdog::Client
   def walk(file)
     expected = load_file(file)
     actual = Barkdog::Exporter.export(@dog, @options)
+    if actual.empty? && @options[:fail_if_empty]
+      raise 'Zero existing monitors reported, failing as --fail-if-empty is set'
+    end
     walk_monitors(expected, actual)
   end
 

data/lib/barkdog/driver.rb

@@ -14,13 +14,16 @@ class Barkdog::Driver
       attrs['options'].delete('silenced')
     end
 
+    tags = attrs['tags'] || []
+
     unless @options[:dry_run]
       _, response = @dog.monitor(
         attrs['type'],
         attrs['query'],
         :name => name,
         :message => attrs['message'],
-        :options => attrs['options']
+        :options => attrs['options'],
+        :tags => tags
       )
 
       validate_response(response)
@@ -33,6 +36,11 @@ class Barkdog::Driver
   def delete_monitor(name, attrs)
     return false if @options[:no_delete]
 
+    # If restricting deletions to a tag, validate the tag
+    if @options[:delete_tagged]
+      return false unless attrs['tags'].include?(@options[:delete_tagged])
+    end
+
     updated = false
     log(:info, "Delete Monitor: #{name}", :color => :red)
 
@@ -69,7 +77,8 @@ class Barkdog::Driver
           expected['query'],
           :name => name,
           :message => expected['message'],
-          :options => expected['options']
+          :options => expected['options'],
+          :tags => expected['tags']
         )
 
         validate_response(response)

data/lib/barkdog/dsl/context/monitor.rb

@@ -20,6 +20,10 @@ class Barkdog::DSL::Context::Monitor
     @result['message'] = value.to_s
   end
 
+  def tags(value)
+    @result['tags'] = value.to_a
+  end
+
   def options(&block)
     @result['options'] = Barkdog::DSL::Context::Monitor::Options.new(@context, &block).result
   end

data/lib/barkdog/dsl/converter.rb

@@ -25,6 +25,7 @@ class Barkdog::DSL::Converter
     fixed_options = Hash[Barkdog::FIXED_OPTION_KEYS.map {|k| [k.to_sym, attrs[k]] }]
     query = attrs['query']
     message = attrs['message']
+    tags = attrs['tags'] || []
     monitor_options = attrs['options'] || {}
 
     if monitor_options.empty?
@@ -33,10 +34,17 @@ class Barkdog::DSL::Converter
       monitor_options = "\n" + output_monitor_options(monitor_options)
     end
 
+    if tags.empty?
+      tags_output = ''
+    else
+      tags_output = "\n  tags #{tags.inspect}"
+    end
+
     <<-EOS
 monitor #{monitor_name.inspect}, #{unbrace(fixed_options.inspect)} do
   query #{query.inspect}
   message #{message.inspect}#{
+  tags_output}#{
   monitor_options}
 end
     EOS

data/lib/barkdog/version.rb

@@ -1,3 +1,3 @@
 module Barkdog
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barkdog
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogapi
@@ -177,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Barkdog is a tool to manage Datadog monitors.