barkdog 0.1.2 → 0.1.3.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11f3c7e8736406d04f6da5e71f45232c4500bd4b
-  data.tar.gz: b6d7a7c5c62508db1229601493f0cb229c57ba17
+  metadata.gz: dc077f2b8f5cfeab22bd61716f4e5d8c190807df
+  data.tar.gz: e28e0d51e3b0ef5c189fdbd86821aa3dd230ad3b
 SHA512:
-  metadata.gz: 38afc5f64030c17118c9c09bce2341d4021527f309223eecb6cfb68539b1944b3501ad40e5b956c781ba47f05ee6dcefb1197ce265b7a4d08b94c8486b451889
-  data.tar.gz: ab2beb61c67ba74b7cf1678b11dda5b2b8eba48146f691e110a476eba8431b98717659649efd3b7d8cad5d91a2a6f03fe9942e3b61dca7c082c8079f094bc800
+  metadata.gz: 57764456db101f7d17803181905527515f31063fc49fbf9527ab7f2e1d807c1cbf29f02f3b7085b1f6c6a7893157fec6a5a75c5ca5aa4a7d84d6ec93de5251be
+  data.tar.gz: 52f0766f525a6dc04d5821b36de2a945c594b079b2418b65f57ab79f6d3a50736b468b1d569c19c57253aa6ab9e5898d1ff3ac96f1d8f773e0fb5ff1155b5dc3

data/README.md

@@ -65,3 +65,23 @@ monitor "Check load avg", :type=>"metric alert" do
   end
 end
 ```
+
+### Use template
+
+```ruby
+template "cpu template" do
+  query "avg(last_5m):avg:#{context.target}.load_avg.1m{host:i-XXXXXXXX} > 1"
+  message context.message
+  options do
+    notify_no_data true
+    no_data_timeframe 2
+    notify_audit true
+    silenced({})
+  end
+end
+
+monitor "Check load avg", :type=>"metric alert" do
+  context.message = "@winebarrel@example.net"
+  include_template "cpu template", :target => "ddstat"
+end
+```

data/barkdog.gemspec

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

data/lib/barkdog.rb

@@ -3,12 +3,14 @@ require 'logger'
 require 'singleton'
 require 'term/ansicolor'
 require 'diffy'
+require 'hashie'
 
 module Barkdog; end
 
 require 'barkdog/ext/string_ext'
 require 'barkdog/constants'
 require 'barkdog/logger'
+require 'barkdog/template_helper'
 require 'barkdog/client'
 require 'barkdog/driver'
 require 'barkdog/dsl'

data/lib/barkdog/dsl/context.rb

@@ -1,4 +1,6 @@
 class Barkdog::DSL::Context
+  include Barkdog::TemplateHelper
+
   def self.eval(dsl, path, options = {})
     self.new(path, options) {
       eval(dsl, binding, path)
@@ -11,11 +13,22 @@ class Barkdog::DSL::Context
     @path = path
     @options = options
     @result = {}
+
+    @context = Hashie::Mash.new(
+      :path => path,
+      :options => options,
+      :templates => {}
+    )
+
     instance_eval(&block)
   end
 
   private
 
+  def template(name, &block)
+    @context.templates[name.to_s] = block
+  end
+
   def require(file)
     barkfile = (file =~ %r|\A/|) ? file : File.expand_path(File.join(File.dirname(@path), file))
 
@@ -42,7 +55,7 @@ class Barkdog::DSL::Context
     end
 
     fixed_options = Hash[fixed_options.map {|k, v| [k.to_s, v] }]
-    attrs = Barkdog::DSL::Context::Monitor.new(name, &block).result
+    attrs = Barkdog::DSL::Context::Monitor.new(@context, name, &block).result
     @result[name] = fixed_options.merge(attrs)
   end
 end

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

@@ -1,6 +1,9 @@
 class Barkdog::DSL::Context::Monitor
-  def initialize(name, &block)
+  include Barkdog::TemplateHelper
+
+  def initialize(context, name, &block)
     @monitor_name = name
+    @context = context.merge(:monitor_name => name)
     @result = {}
     instance_eval(&block)
   end
@@ -18,6 +21,6 @@ class Barkdog::DSL::Context::Monitor
   end
 
   def options(&block)
-    @result['options'] = Barkdog::DSL::Context::Monitor::Options.new(&block).result
+    @result['options'] = Barkdog::DSL::Context::Monitor::Options.new(@context, &block).result
   end
 end

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

@@ -1,5 +1,8 @@
 class Barkdog::DSL::Context::Monitor::Options
-  def initialize(&block)
+  include Barkdog::TemplateHelper
+
+  def initialize(context, &block)
+    @context = context.dup
     @result = {}
     instance_eval(&block)
   end

data/lib/barkdog/template_helper.rb

@@ -0,0 +1,18 @@
+module Barkdog::TemplateHelper
+  def include_template(template_name, context = {})
+    tmplt = @context.templates[template_name.to_s]
+
+    unless tmplt
+      raise "Template `#{template_name}` is not defined"
+    end
+
+    context_orig = @context
+    @context = @context.merge(context)
+    instance_eval(&tmplt)
+    @context = context_orig
+  end
+
+  def context
+    @context
+  end
+end

data/lib/barkdog/version.rb

@@ -1,3 +1,3 @@
 module Barkdog
-  VERSION = '0.1.2'
+  VERSION = '0.1.3.beta'
 end

data/spec/barkdog_spec.rb

@@ -1,7 +1,7 @@
 describe Barkdog::Client do
   subject { barkdog_client.export }
 
-  let(:actual_dsl) do
+  let(:dsl) do
     <<-'RUBY'
 monitor "my metric check", :type=>"metric alert" do
   query "avg(last_5m):avg:datadog.dogstatsd.packet.count{*} > 1"
@@ -31,10 +31,56 @@ 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 actual_dsl }
+    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
+    no_data_timeframe context.no_data_timeframe
+    notify_audit false
+    notify_no_data false
+    silenced({})
+  end
+end
+
+template "my service check options" do
+  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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: barkdog
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3.beta
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dogapi
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: hashie
+  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
@@ -123,6 +137,7 @@ files:
 - lib/barkdog/exporter.rb
 - lib/barkdog/ext/string_ext.rb
 - lib/barkdog/logger.rb
+- lib/barkdog/template_helper.rb
 - lib/barkdog/version.rb
 - spec/barkdog_spec.rb
 - spec/spec_helper.rb
@@ -141,12 +156,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Barkdog is a tool to manage Datadog monitors.