lbrt 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d03d5b56552be94562b237b4fa6b3b7bf728752
-  data.tar.gz: 42d9b29379fa6c2c417f2586129d3cef61255dcf
+  metadata.gz: 370e9e21d25611fc0311d02d0b7eaf59462d0d6e
+  data.tar.gz: 49cf5cd865eb886f2f4157f45086ba84502f415c
 SHA512:
-  metadata.gz: 4d7673a015e2f65b429bf6b212a0ea4dec840b5d36daf86f00f8e7fd61860c1a4877f661036aeae7472529261bf503e771bec0fc86b00126f079fd22b8fa1dab
-  data.tar.gz: aaba95b5b57a80243342ae91d31dce8d9da6137b44a02bf85a7e04a1997e25ff3d6af681e0f0610618e1062006562dd801f84b484aa6c672f237c416bdc2450f
+  metadata.gz: cb7ddcbb5fd37faf563cdf762222bdbd1e886e08a703f9de816f0181d669e13d143bc1e771e9565abbdcbafc5a4f9b0a0fa7386b0630598d741b2e2bb1e9d443
+  data.tar.gz: e88b4b2db387a51abaa8c704e3c02e2f06f6da935110365c75ffdcf04e8fe5c2d808d44517e22d9febbabfa658a88a4eff17b8a66eea7118a1fe379953ae3eff

data/README.md

@@ -198,7 +198,7 @@ space "My Space2" do
 end
 ```
 
-## template
+## Using template
 
 ```ruby
 template "dstat" do
@@ -258,6 +258,49 @@ include_template "my alert", metric_name: 'login-delay'
 include_template "my alert", metric_name: 'login-delay2'
 ```
 
+```ruby
+template "alert set1" do
+  alert "#{context.hostname}/login-delay" do
+    description "desc"
+    attributes "runbook_url"=>"http://example.com"
+    active true
+    rearm_seconds 600
+    rearm_per_signal false
+
+    condition do
+      type "below"
+      metric_name 'login-delay'
+      source nil
+      threshold 4.0
+      summary_function "sum"
+    end
+
+    service "mail", "my email"
+  end
+
+  alert "#{context.hostname}/login-delay2" do
+    description "desc"
+    attributes "runbook_url"=>"http://example.com"
+    active true
+    rearm_seconds 600
+    rearm_per_signal false
+
+    condition do
+      type "below"
+      metric_name 'login-delay2'
+      source nil
+      threshold 4.0
+      summary_function "sum"
+    end
+
+    service "mail", "my email"
+  end
+end
+
+include_template "alert set1", hostname: 'host1'
+include_template "alert set1", hostname: 'host2'
+```
+
 ## Show resource by [peco](https://github.com/peco/peco)
 
 ```sh

data/lib/lbrt/cli/space.rb

@@ -11,6 +11,7 @@ class Lbrt::CLI::Space < Thor
 
   desc 'apply FILE', 'Apply spaces'
   option :'dry-run', :type => :boolean, :default => false
+  option :'ignore-no-metric', :type => :boolean, :default => true
   def apply(file)
     updated = client(Lbrt::Space).apply(file)
 

data/lib/lbrt/space.rb

@@ -84,16 +84,24 @@ class Lbrt::Space
     updated = false
 
     expected.each do |name_or_id, expected_chart|
-      actual_chart = actual.delete(name_or_id)
-
-      if not actual_chart and name_or_id.is_a?(Integer)
-        actual_chart = actual.values.find {|i| i['id'] == name_or_id }
-      end
-
-      if actual_chart
-        updated = walk_chart(space_name_or_id, space_id, name_or_id, expected_chart, actual_chart) || updated
-      else
-        updated = @driver.create_chart(space_name_or_id, space_id, name_or_id, expected_chart) || updated
+      begin
+        actual_chart = actual.delete(name_or_id)
+
+        if not actual_chart and name_or_id.is_a?(Integer)
+          actual_chart = actual.values.find {|i| i['id'] == name_or_id }
+        end
+
+        if actual_chart
+          updated = walk_chart(space_name_or_id, space_id, name_or_id, expected_chart, actual_chart) || updated
+        else
+          updated = @driver.create_chart(space_name_or_id, space_id, name_or_id, expected_chart) || updated
+        end
+      rescue Librato::Client::Error => e
+        if @options[:ignore_no_metric] and e.cause.response[:body] =~ /no metric/
+          log(:warn, e.message, :color => :yellow)
+        else
+          raise e
+        end
       end
     end
 

data/lib/lbrt/version.rb

@@ -1,3 +1,3 @@
 module Lbrt
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end

metadata

@@ -1,153 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: lbrt
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
   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: 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: librato-client
   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: parallel
   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: peco_selector
   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: term-ansicolor
   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: thor
   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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 description: A tool to manage Librato. It defines the state of Librato using DSL,
@@ -159,9 +159,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -216,17 +216,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A tool to manage Librato. It defines the state of Librato using DSL, and