ruminate 0.0.2 → 0.0.3

data/History.md

@@ -1,6 +1,14 @@
 Ruminate Changelog
 =====================
 
+0.0.3
+
+ - Beginning template stuff.
+
+0.0.2
+
+ - Bug fix for removing links after capistrano deploys.
+
 0.0.1
 
  - Initial release

data/README.md

@@ -96,7 +96,7 @@ When you deploy, perform the following:
 
 ## TODO
 
-Too much repitition.  Create templates for plot stuff in timers, etc.
+Use deep_merge for better templating?
 
 Make sure the example above actually works.
 

data/config/templates/plot_timer.yml

@@ -0,0 +1,16 @@
+:requires: measurement
+:graph_args: --base 1000 -l 0
+:graph_vlabel: msec
+:plot:
+  - :label: avg
+    :info: Average time of %measurement%
+    :draw: LINE
+    :field: avg_time
+  - :label: min
+    :info: Min time of %measurement%
+    :draw: LINE
+    :field: min_time
+  - :label: max
+    :info: Max time of %measurement%
+    :draw: LINE
+    :field: max_time

data/lib/ruminate/plugin.rb

@@ -40,8 +40,11 @@ def ruminate(arg0, rumx_mount, username, password, host, port, smtp_host, config
     res.body.split("\n").each do |line|
       if (i = line.index('=')) >= 0
         value = line[(i+1)..-1]
-        # TODO: Necessary to do an integer check?
-        value = value.to_f if value.match(/^\s*[+-]?((\d+_?)*\d+(\.(\d+_?)*\d+)?|\.(\d+_?)*\d+)(\s*|([eE][+-]?(\d+_?)*\d+)\s*)$/)
+        if value.match(/^\s*[+-]?\d+\s*$/)
+          value = value.to_i
+        elsif value.match(/^\s*[+-]?((\d+_?)*\d+(\.(\d+_?)*\d+)?|\.(\d+_?)*\d+)(\s*|([eE][+-]?(\d+_?)*\d+)\s*)$/)
+          value = value.to_f
+        end
         result_hash[line[0,i]] = value
       end
     end
@@ -64,6 +67,9 @@ def ruminate(arg0, rumx_mount, username, password, host, port, smtp_host, config
 The following filter has been triggered:
 
 #{filter}
+
+Output:
+#{res.body}
           EOM
           send_email(smtp_host, alert[:email], "ALERT: #{alert[:title]}", message)
         end
@@ -73,8 +79,12 @@ The following filter caused an exception #{e.message}:
 
 Original Filter: #{alert[:filter]}
 Evaled Filter:   #{filter}
+
+Output:
+#{res.body}
         EOM
         send_email(smtp_host, alert[:email], "ALERT EXCEPTION: #{alert[:title]}", message)
+        raise
       end
     end
   end

data/lib/ruminate.rb

@@ -5,7 +5,6 @@ module Ruminate
   require 'ruminate/railtie' if defined?(Rails)
 
   def self.create_plugins(config_file, ruminate_dir, plugin_dir)
-    FileUtils.rm_rf(plugin_dir)
     FileUtils.mkdir_p(plugin_dir)
     config = YAML.load(File.read(config_file))
     ruminate_plugin = File.expand_path('../ruminate/plugin.rb', __FILE__)
@@ -20,8 +19,10 @@ module Ruminate
     Dir["#{ruminate_dir}/*.yml"].each do |plugin_config_file|
       plugin_basename = File.basename(plugin_config_file, '.*')
       plugin_config = YAML.load(File.read(plugin_config_file))
+      replace_templates(plugin_config, ruminate_dir)
       plugin_config.each do |graph_category, graph_configs|
         graph_configs.each do |graph_config|
+          raise "No plot\n#{graph_config.inspect}" unless graph_config[:plot]
           config_params = ''
           graph_config.each do |key, value|
             config_params += "#{key} #{value}\n" if key.to_s.start_with?('graph_')
@@ -29,6 +30,7 @@ module Ruminate
           config_params += "graph_category #{graph_category}\n" unless graph_config[:graph_category]
           graph_config[:plot].each_with_index do |field_hash, i|
             field_hash.each do |key, value|
+              next if key == :field
               config_params += "field#{i}.#{key} #{value}\n"
             end
           end
@@ -87,4 +89,59 @@ ruminate(
     end
     #system '/etc/init.d/munin-node restart'
   end
+
+  private
+
+  def self.replace_templates(hash, ruminate_dir)
+    read_hash = hash.dup
+    read_hash.each do |key, value|
+      if key == :template
+        hash.delete(:template)
+        add_template_to_hash(hash, ruminate_dir, value)
+      else
+        replace_value(value, ruminate_dir)
+      end
+    end
+  end
+
+  def self.add_template_to_hash(hash, ruminate_dir, template_value)
+    variables = template_value.split
+    template_name = variables.shift
+    filename = File.join(ruminate_dir, 'templates', "#{template_name}.yml")
+    unless File.exist?(filename)
+      filename = File.expand_path("../../config/templates/#{template_name}.yml", __FILE__)
+      raise "Could not find template #{template_name}.yml" unless File.exist?(filename)
+    end
+    child_hash = YAML.load(File.read(filename))
+    raise "Template #{template_name}.yml is not a hash" unless child_hash.kind_of?(Hash)
+    variable_hash = {}
+    variables.each do |value|
+      eq_i = value.index('=')
+      raise "Invalid substitution value #{value}" unless eq_i
+      variable_hash[value[0,eq_i]] = value[eq_i+1..-1]
+    end
+    replace_variables(child_hash, variable_hash)
+    replace_templates(child_hash, ruminate_dir)
+    hash.merge!(child_hash)
+  end
+
+  def self.replace_value(value, ruminate_dir)
+    if value.kind_of?(Array)
+      value.each {|sub_value| replace_value(sub_value, ruminate_dir)}
+    elsif value.kind_of?(Hash)
+      replace_templates(value, ruminate_dir)
+    end
+  end
+
+  def self.replace_variables(value, variable_hash)
+    if value.kind_of?(String)
+      variable_hash.each do |variable, sub|
+        value.gsub!("%#{variable}%", sub)
+      end
+    elsif value.kind_of?(Array)
+      value.each {|sub_value| replace_variables(sub_value, variable_hash)}
+    elsif value.kind_of?(Hash)
+      value.each_value {|sub_value| replace_variables(sub_value, variable_hash)}
+    end
+  end
 end

metadata

@@ -1,64 +1,73 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ruminate
-version: !ruby/object:Gem::Version
-  version: 0.0.2
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.0.3
 platform: ruby
-authors:
-- Brad Pardee
+authors: 
+  - Brad Pardee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rumx
-  requirement: &70280445823820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70280445823820
+
+date: 2012-01-11 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: rumx
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: 0.1.5
+    type: :runtime
+    version_requirements: *id001
 description: Simple process for generating munin plugins to monitor your Rails application
-email:
-- bradpardee@gmail.com
+email: 
+  - bradpardee@gmail.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- lib/ruminate/plugin.rb
-- lib/ruminate/railtie.rb
-- lib/ruminate.rb
-- lib/tasks/ruminate.rake
-- LICENSE.txt
-- Rakefile
-- History.md
-- README.md
+
+files: 
+  - lib/ruminate.rb
+  - lib/ruminate/plugin.rb
+  - lib/ruminate/railtie.rb
+  - lib/tasks/ruminate.rake
+  - config/templates/plot_timer.yml
+  - LICENSE.txt
+  - Rakefile
+  - History.md
+  - README.md
 homepage: http://github.com/ClarityServices/ruminate
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Easy generation of munin plugins to monitor your app
 test_files: []
+