doggy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d45de1eb568f088f9c702bbb55e2961691337c45
-  data.tar.gz: 733512dea50824d0800967443ab6827e79d155b7
+  metadata.gz: b31e6a9cbbd6eff0526a4df39a096933b7671831
+  data.tar.gz: 0b7a87bdc2f8ba9215a928e9f4abe49241d94e5b
 SHA512:
-  metadata.gz: 60049f997c3552d938fbf8d70e709f525716939658e3f08a2d4101b679fd12b82285d5266355f6349bc8ba6d998d803f56a2c6dbbaed8987fe90bf64f0a6ba21
-  data.tar.gz: ab72d81d8e5d83561e67c126ad52e0a5320f28ccc4905943e60d529e5d2c7617b862e8ffc677a7e38f42e093e9a2983df385914468a39273ba4e789fa75bb0f6
+  metadata.gz: b909f6afb9689da50ad3ae588e6c99e688403e067b9b3a52c53febea1cb229e90a2256c174595afac507a2893f86289e0114bd373f8644d1a37475421668713f
+  data.tar.gz: a8f482850619478ab97f5b602891a55a7e0dc688cd90171b0d46587a4d47025f683b846de0f198d6687d34b25a735c09d5d078cad2c540aa6ae96e9097a47cd9

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/Gemfile.lock

@@ -0,0 +1,30 @@
+PATH
+  remote: .
+  specs:
+    doggy (0.1.0)
+      dogapi (~> 1.17)
+      ejson (~> 1.0)
+      thor (~> 0.19)
+      thread (~> 0.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    dogapi (1.20.0)
+      multi_json
+    ejson (1.0.0)
+    multi_json (1.11.2)
+    rake (10.4.2)
+    thor (0.19.1)
+    thread (0.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.9)
+  doggy!
+  rake (~> 10.0)
+
+BUNDLED WITH
+   1.10.6

data/Rakefile

@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+Rake::TestTask.new do |t|
+  t.libs << 'test'
+end
+
+desc "Run tests"
+task :default => :test

data/doggy.gemspec

@@ -15,8 +15,8 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.9"

data/lib/doggy/model/dash.rb

@@ -50,7 +50,10 @@ module Doggy
     end
 
     def raw
-      @raw ||= Doggy.client.dog.get_dashboard(@id)[1]['dash'].sort.to_h
+      @raw ||= begin
+        result = Doggy.client.dog.get_dashboard(@id)
+        result && result[1]['dash'] && result[1]['dash'].sort.to_h || {}
+      end
     end
 
     def raw_local
@@ -59,8 +62,9 @@ module Doggy
     end
 
     def save
-      puts raw['errors'] and return if raw['errors'] # do now download an item if it doesn't exist
+      return if raw['errors'] # do now download an item if it doesn't exist
       return if raw['title'] =~ Doggy::DOG_SKIP_REGEX
+      return if raw.empty?
       File.write(path, Doggy.serializer.dump(raw))
     end
 
@@ -68,9 +72,13 @@ module Doggy
       return unless File.exists?(path)
       return if @title =~ Doggy::DOG_SKIP_REGEX
       if @id
-        Doggy.client.dog.update_dashboard(@id, @title, @description, @graphs, @template_variables)
+        Doggy.with_retry do
+          Doggy.client.dog.update_dashboard(@id, @title, @description, @graphs, @template_variables)
+        end
       else
-        dash = Doggy.client.dog.create_dashboard(@title, @description, @graphs)
+        Doggy.with_retry do
+          dash = Doggy.client.dog.create_dashboard(@title, @description, @graphs)
+        end
         # FIXME: Remove duplication
         @id = dash[1]['id']
         @graphs = dash[1]['graphs']

data/lib/doggy/model/monitor.rb

@@ -58,10 +58,11 @@ module Doggy
     def raw
       @raw ||= begin
         alert = Doggy.client.dog.get_monitor(@id)[1]
-        alert.delete('state')
-        alert.delete('overall_state')
-        alert['options'].delete('silenced')
-        alert.sort.to_h
+        alert.delete('state')                                              # delete unnecessary state
+        alert.delete('overall_state')                                      # delete unnecessary state
+        alert['options'] && alert['options'].delete('silenced')            # delete unnecessary state
+        alert['options'] = alert['options'] && alert['options'].sort.to_h  # sort option keys; DataDog response is not ordered
+        alert && alert.sort.to_h
       end
     end
 
@@ -71,8 +72,9 @@ module Doggy
     end
 
     def save
-      puts raw['errors'] and return if raw['errors'] # do now download an item if it doesn't exist
+      return if raw['errors'] # do now download an item if it doesn't exist
       return if raw['name'] =~ Doggy::DOG_SKIP_REGEX
+      return if raw.empty?
       File.write(path, Doggy.serializer.dump(raw))
     end
 
@@ -89,22 +91,26 @@ module Doggy
       if @id
         return unless File.exists?(path)
 
-        Doggy.client.dog.update_monitor(@id, @query || raw_local['query'], {
-          name: @name || raw_local['name'],
-          timeout_h: @timeout_h || raw_local['timeout_h'],
-          message: @message || raw_local['message'],
-          notify_audit: @notify_audit || raw_local['notify_audit'],
-          notify_no_data: @notify_no_data || raw_local['notify_no_data'],
-          renotify_interval: @renotify_interval || raw_local['renotify_interval'],
-          escalation_message: @escalation_message || raw_local['escalation_message'],
-          no_data_timeframe: @no_data_timeframe || raw_local['no_data_timeframe'],
-          silenced_timeout_ts: @silenced_timeout_ts || raw_local['silenced_timeout_ts'],
-          options: {
-            silenced: mute_state_for(@id),
-          },
-        })
+        Doggy.with_retry do
+          Doggy.client.dog.update_monitor(@id, @query || raw_local['query'], {
+            name: @name || raw_local['name'],
+            timeout_h: @timeout_h || raw_local['timeout_h'],
+            message: @message || raw_local['message'],
+            notify_audit: @notify_audit || raw_local['notify_audit'],
+            notify_no_data: @notify_no_data || raw_local['notify_no_data'],
+            renotify_interval: @renotify_interval || raw_local['renotify_interval'],
+            escalation_message: @escalation_message || raw_local['escalation_message'],
+            no_data_timeframe: @no_data_timeframe || raw_local['no_data_timeframe'],
+            silenced_timeout_ts: @silenced_timeout_ts || raw_local['silenced_timeout_ts'],
+            options: {
+              silenced: mute_state_for(@id),
+            },
+          })
+        end
       else
-        result = Doggy.client.dog.monitor('metric alert', @query, name: @name)
+        Doggy.with_retry do
+          result = Doggy.client.dog.monitor('metric alert', @query, name: @name)
+        end
         @id = result[1]['id']
       end
     end

data/lib/doggy/model/screen.rb

@@ -37,7 +37,10 @@ module Doggy
     end
 
     def raw
-      @raw ||= Doggy.client.dog.get_screenboard(@id)[1].sort.to_h
+      @raw ||= begin
+        result = Doggy.client.dog.get_screenboard(@id)
+        result && result[1] && result[1].sort.to_h
+      end
     end
 
     def raw_local
@@ -46,17 +49,22 @@ module Doggy
     end
 
     def save
-      puts raw['errors'] and return if raw['errors'] # do now download an item if it doesn't exist
+      return if raw['errors'] # do now download an item if it doesn't exist
       return if raw['board_title'] =~ Doggy::DOG_SKIP_REGEX
+      return if raw.empty?
       File.write(path, Doggy.serializer.dump(raw))
     end
 
     def push
       return if @description =~ Doggy::DOG_SKIP_REGEX
       if @id
-        Doggy.client.dog.update_screenboard(@id, @description)
+        Doggy.with_retry do
+          Doggy.client.dog.update_screenboard(@id, @description)
+        end
       else
-        result = Doggy.client.dog.create_screenboard(@description)
+        Doggy.with_retry do
+          result = Doggy.client.dog.create_screenboard(@description)
+        end
         @id = result[1]['id']
         @description = result[1]
       end

data/lib/doggy/version.rb

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

data/lib/doggy.rb

@@ -16,6 +16,7 @@ require 'doggy/model/screen'
 module Doggy
   DOG_SKIP_REGEX = /\[dog\s+skip\]/i.freeze
   DEFAULT_SERIALIZER_CLASS = Doggy::Serializer::Json
+  MAX_TRIES = 5
 
   class DoggyError < StandardError
     def self.status_code(code)
@@ -93,6 +94,23 @@ module Doggy
       puts "Exception: #{e.message}"
     end
 
+    def with_retry(times: MAX_TRIES, reraise: false)
+      tries = 0
+      while tries < times
+        begin
+          yield
+          break
+        rescue => e
+          error "Caught error in create_record! attempt #{tries}..."
+          error "#{e.class.name}: #{e.message}"
+          error "#{e.backtrace.join("\n")}"
+          tries += 1
+
+          raise e if tries >= times && reraise
+        end
+      end
+    end
+
     def current_version
       now = Time.now.to_i
       month_ago = now - 3600 * 24 * 30

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: doggy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Vlad Gorodetsky
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2015-09-09 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,13 +97,13 @@ dependencies:
 description: Syncs DataDog dashboards, alerts, screenboards, and monitors.
 email:
 - v@gor.io
-executables:
-- doggy
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile