barkdog 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0df44e3dab1e9d1e2ca862e8cca4723d1f490712
-  data.tar.gz: 342257b4f1e85fab2cb2b9460434883b8297c303
+  metadata.gz: c21615f347dced36cd4409fb53dc2df65166ee91
+  data.tar.gz: 08dae8f1e3eaab800c87fc5bae38068466b49193
 SHA512:
-  metadata.gz: 36a699f5f4c5ba8b291f20dda35ced3a77e5c18ad68e08aab330f0078860f2a957c1859ac93dbbdec7aa2e7b59fc5e7a97e8a65a48353daf1dfa0385721f6dd5
-  data.tar.gz: 24b1acc3d0598a33ee87e1652e698586daddb4ab471f0691a61b37e9fa6546d0c635d58785a1cf4891d05bb2f5253842805cf28f43c250cd834e60975126f0e5
+  metadata.gz: 979495548620024f79d5bebf457f6826d307479ac239d567c45db493ebe4a3de4384c6a851914d6107517425d17c07a8ee6e023580011a725dda93649e718287
+  data.tar.gz: ec08151e9f466f7b00ea6cc32ab94248233ad27967605a257f118fb20358b09398ab7b85a89f127cd7295d54b05205e0c32fa72b1635876c880799a4ce86ccbd

data/README.md

@@ -62,6 +62,7 @@ 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"
   options do
+    locked false
     notify_no_data true
     no_data_timeframe 2
     notify_audit true
@@ -77,6 +78,7 @@ template "cpu template" do
   query "avg(last_5m):avg:#{context.target}.load_avg.1m{host:i-XXXXXXXX} > 1"
   message context.message
   options do
+    locked false
     notify_no_data true
     no_data_timeframe 2
     notify_audit true
@@ -90,7 +92,7 @@ monitor "Check load avg", :type=>"metric alert" do
 end
 
 template "basic monitor" do
-  monitor "#{target} cpu" do
+  monitor "#{context.target} cpu" do
     query "avg(last_5m):avg:#{context.target}.load_avg.1m{host:i-XXXXXXXX} > 1"
     ...
   end
@@ -105,3 +107,6 @@ end
   ...
 end
 ```
+
+## Similar tools
+* [Codenize.tools](http://codenize.tools/)

data/bin/barkdog

@@ -11,6 +11,10 @@ DEFAULT_FILENAME = 'Barkfile'
 mode = nil
 file = DEFAULT_FILENAME
 output_file = '-'
+MAGIC_COMMENT = <<-EOS
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+EOS
 
 options = {
   :api_key         => ENV['BARKDOG_API_KEY'],
@@ -69,7 +73,10 @@ begin
       puts client.export
     else
       logger.info("Export Datadog monitors to `#{output_file}`")
-      open(output_file, 'wb') {|f| f.puts client.export }
+      open(output_file, 'wb') do |f|
+        f.puts MAGIC_COMMENT
+        f.puts client.export
+      end
     end
   when :apply
     unless File.exist?(file)

data/lib/barkdog/driver.rb

@@ -15,7 +15,7 @@ class Barkdog::Driver
     end
 
     unless @options[:dry_run]
-      @dog.monitor(
+      _, response = @dog.monitor(
         attrs['type'],
         attrs['query'],
         :name => name,
@@ -23,6 +23,7 @@ class Barkdog::Driver
         :options => attrs['options']
       )
 
+      validate_response(response)
       updated = true
     end
 
@@ -34,7 +35,8 @@ class Barkdog::Driver
     log(:info, "Delete Monitor: #{name}", :color => :red)
 
     unless @options[:dry_run]
-      @dog.delete_monitor(attrs['id'])
+      _, response = @dog.delete_monitor(attrs['id'])
+      validate_response(response)
       updated = true
     end
 
@@ -60,17 +62,31 @@ class Barkdog::Driver
       log(:info, diffy.to_s(@options[:color] ? :color : :text), :color => false)
 
       unless @options[:dry_run]
-        @dog.update_monitor(
+        _, response = @dog.update_monitor(
           expected['id'],
           expected['query'],
           :name => name,
           :message => expected['message'],
           :options => expected['options']
         )
+
+        validate_response(response)
         updated = true
       end
     end
 
     updated
   end
+
+  private
+
+  def validate_response(response)
+    if response['warnings']
+      log(:warn, response['warnings'].join("\n"), :color => :yellow)
+    end
+
+    if response['errors']
+      raise response['errors'].join("\n")
+    end
+  end
 end

data/lib/barkdog/version.rb

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

data/spec/barkdog_spec.rb

@@ -7,6 +7,7 @@ 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
@@ -18,6 +19,7 @@ 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
@@ -47,6 +49,7 @@ 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
@@ -55,6 +58,7 @@ template 'my metric check' do
 end
 
 template "my service check options" do
+  locked false
   no_data_timeframe 2
   notify_audit false
   notify_no_data true
@@ -96,6 +100,7 @@ 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
@@ -107,6 +112,7 @@ 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barkdog
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2016-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogapi
@@ -161,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Barkdog is a tool to manage Datadog monitors.