visage-app 1.0.0 → 2.0.0

data/features/support/config/with_old_profile_yaml/profiles.yaml

@@ -0,0 +1,116 @@
+--- 
+zend+tail+on+ubuntu: 
+  :metrics: tail*/*
+  :hosts: ubuntu.localdomain
+  :url: zend+tail+on+ubuntu
+  :profile_name: zend tail on ubuntu
+load+on+ubuntu+localdomain: 
+  :metrics: load/*
+  :hosts: ubuntu.localdomain
+  :url: load+on+ubuntu+localdomain
+  :profile_name: load on ubuntu.localdomain
+apache+on+blah: 
+  :metrics: apache/*
+  :hosts: blah
+  :url: apache+on+blah
+  :profile_name: apache on blah
+interfaces+on+blah: 
+  :metrics: interface/*
+  :hosts: blah
+  :url: interfaces+on+blah
+  :profile_name: interfaces on blah
+all+on+all: 
+  :metrics: "*"
+  :hosts: "*"
+  :url: all+on+all
+  :profile_name: all on all
+object+space+on+ree: 
+  :metrics: curl_json-object_space/*
+  :hosts: ubuntu*
+  :url: object+space+on+ree
+  :profile_name: Object space on REE
+disk+sda+on+ubuntu: 
+  :metrics: disk-sda/*
+  :hosts: ubuntu.localdomain
+  :url: disk+sda+on+ubuntu
+  :profile_name: disk-sda on ubuntu
+gc+on+ree: 
+  :metrics: curl_json-gc/*
+  :hosts: ubuntu*
+  :url: gc+on+ree
+  :profile_name: GC on REE
+gateway+ping+from+blah: 
+  :metrics: ping/*
+  :hosts: blah
+  :url: gateway+ping+from+blah
+  :profile_name: gateway ping from blah
+tcpconns+on+ubuntu: 
+  :metrics: tcpconns*/*
+  :hosts: ubuntu*
+  :url: tcpconns+on+ubuntu
+  :profile_name: tcpconns on ubuntu
+entropy+on+blah: 
+  :metrics: entropy/*
+  :hosts: blah
+  :url: entropy+on+blah
+  :profile_name: entropy on blah
+memory+on+ubunttu: 
+  :metrics: memory/*
+  :hosts: ubuntu*
+  :url: memory+on+ubunttu
+  :profile_name: memory on ubunttu
+processes+on+blah: 
+  :metrics: processes/*
+  :hosts: blah
+  :url: processes+on+blah
+  :profile_name: processes on blah
+ruby+gc+on+ubuntu+localdomain: 
+  :metrics: curl_json-gc/*
+  :hosts: ubuntu*
+  :url: ruby+gc+on+ubuntu+localdomain
+  :profile_name: Ruby GC on ubuntu.localdomain
+cpu+statistics+for+ubuntu+localdomain: 
+  :metrics: cpu*/*
+  :hosts: ubuntu*
+  :url: cpu+statistics+for+ubuntu+localdomain
+  :profile_name: CPU statistics for ubuntu.localdomain
+swap+on+blah: 
+  :metrics: swap/*
+  :hosts: blah
+  :url: swap+on+blah
+  :profile_name: swap on blah
+cpu+and+load+on+ubuntu: 
+  :metrics: cpu*/*,load/*
+  :hosts: ubuntu*
+  :url: cpu+and+load+on+ubuntu
+  :profile_name: cpu and load on ubuntu
+cpu+on+flapjack+workers: 
+  :metrics: cpu*/*
+  :hosts: flapjack-*
+  :url: cpu+on+flapjack+workers
+  :profile_name: cpu on flapjack workers
+memory+on+flapjack+workers+and+blah: 
+  :metrics: memory/*
+  :hosts: flapjack-worker*,blah
+  :url: memory+on+flapjack+workers+and+blah
+  :profile_name: memory on flapjack workers and blah
+uptime+on+blah: 
+  :metrics: uptime/*
+  :hosts: blah
+  :url: uptime+on+blah
+  :profile_name: uptime on blah
+users+on+blah: 
+  :metrics: users/*
+  :hosts: blah
+  :url: users+on+blah
+  :profile_name: users on blah
+irqs+on+blah: 
+  :metrics: irq/*
+  :hosts: blah
+  :url: irqs+on+blah
+  :profile_name: irqs on blah
+vmem+on+blah: 
+  :metrics: vmem/*
+  :hosts: blah
+  :url: vmem+on+blah
+  :profile_name: vmem on blah

data/features/support/env.rb

@@ -1,16 +1,15 @@
 #!/usr/bin/env ruby
 
+require 'rubygems'
 require 'pathname'
 
 @root = Pathname.new(File.dirname(__FILE__)).parent.parent.expand_path
 app_file = @root.join('lib/visage-app')
 
-require 'rubygems'
-require 'spec/expectations'
 require 'rack/test'
 require 'webrat'
 
-ENV['CONFIG_PATH'] = @root.join('features/data/config/default')
+ENV['CONFIG_PATH'] = @root.join('features/support/config/default')
 
 require app_file
 # Force the application name because polyglot breaks the auto-detection logic.

data/lib/visage-app.rb

@@ -18,20 +18,21 @@ require 'yajl/json_gem'
 module Visage
   class Application < Sinatra::Base
     @root = Pathname.new(File.dirname(__FILE__)).parent.expand_path
-    set :public, @root.join('lib/visage-app/public')
-    set :views,  @root.join('lib/visage-app/views')
+    set :public_folder, @root.join('lib/visage-app/public')
+    set :views,         @root.join('lib/visage-app/views')
 
     helpers Sinatra::LinkToHelper
     helpers Sinatra::PageTitleHelper
+    helpers Sinatra::RequireJSHelper
 
     configure do
       Visage::Config.use do |c|
         # FIXME: make this configurable through file
         c['rrddir'] = ENV["RRDDIR"] ? Pathname.new(ENV["RRDDIR"]).expand_path : Pathname.new("/var/lib/collectd/rrd").expand_path
-        c['types']  = ENV["TYPES"] ? Visage::Types.new(:filename => ENV["TYPES"]) : Visage::Types.new
+        c['types']  = ENV["TYPES"]  ? Visage::Types.new(:filename => ENV["TYPES"]) : Visage::Types.new
       end
 
-      # Load up the profile.yaml. Creates it if it doesn't already exist.
+      # Load up the profiles.yaml. Creates it if it doesn't already exist.
       Visage::Profile.load
     end
   end
@@ -44,9 +45,6 @@ module Visage
     get '/profiles/:url' do
       @profile = Visage::Profile.get(params[:url])
       raise Sinatra::NotFound unless @profile
-      @start  = params[:start]
-      @finish = params[:finish]
-      @live   = params[:live] ? true : false
       haml :profile
     end
 
@@ -59,6 +57,17 @@ module Visage
 
   class Builder < Application
 
+    post '/builder' do
+      @profile = Visage::Profile.new(params)
+
+      if @profile.save
+        {'status' => 'ok'}.to_json
+      else
+        status 400 # Bad Request
+        {'status' => 'error', 'errors' => @profile.errors}.to_json
+      end
+    end
+
     get "/builder" do
       if params[:submit] == "create"
         @profile = Visage::Profile.new(params)
@@ -75,7 +84,7 @@ module Visage
       end
     end
 
-    # infrastructure for embedding
+    # Infrastructure for embedding.
     get '/javascripts/visage.js' do
       javascript = ""
       %w{raphael-min g.raphael g.line mootools-1.2.3-core mootools-1.2.3.1-more graph}.each do |js|
@@ -98,27 +107,28 @@ module Visage
 
     # /data/:host/:plugin/:optional_plugin_instance
     get %r{/data/([^/]+)/([^/]+)((/[^/]+)*)} do
-      host = params[:captures][0].gsub("\0", "")
-      plugin = params[:captures][1].gsub("\0", "")
-      plugin_instances = params[:captures][2].gsub("\0", "")
-      start  = params[:start]
-      finish = params[:finish]
-
-      collectd = CollectdJSON.new(:rrddir => Visage::Config.rrddir)
-      json = collectd.json(:host             => host,
-                           :plugin           => plugin,
-                           :plugin_instances => plugin_instances,
-                           :start            => start,
-                           :finish           => finish)
-      # if the request is cross-domain, we need to serve JSONP
+      host      = params[:captures][0].gsub("\0", "")
+      plugin    = params[:captures][1].gsub("\0", "")
+      instances = params[:captures][2].gsub("\0", "")
+      start     = params[:start]
+      finish    = params[:finish]
+
+      collectd = Visage::Collectd::JSON.new(:rrddir => Visage::Config.rrddir)
+      json = collectd.json(:host      => host,
+                           :plugin    => plugin,
+                           :instances => instances,
+                           :start     => start,
+                           :finish    => finish)
+
+      # If the request is cross-domain, we need to serve JSON-P.
       maybe_wrap_with_callback(json)
     end
 
     get %r{/data/([^/]+)} do
-      host = params[:captures][0].gsub("\0", "")
-      metrics = Visage::Collectd::RRDs.metrics(:host => host)
+      hosts = params[:captures][0].gsub("\0", "")
+      metrics = Visage::Collectd::RRDs.metrics(:hosts => hosts)
 
-      json = { host => metrics }.to_json
+      json = { :metrics => metrics }.to_json
       maybe_wrap_with_callback(json)
     end
 
@@ -128,7 +138,7 @@ module Visage
       maybe_wrap_with_callback(json)
     end
 
-    # wraps json with a callback method that JSONP clients can call
+    # Wraps json with a callback method that JSON-P clients can call.
     def maybe_wrap_with_callback(json)
       params[:callback] ? params[:callback] + '(' + json + ')' : json
     end

data/lib/visage-app/collectd/json.rb

@@ -10,133 +10,130 @@ require 'yajl'
 #
 # A loose shim onto RRDtool, with some extra logic to normalise the data.
 #
-class CollectdJSON
-
-  def initialize(opts={})
-    @rrddir = opts[:rrddir] || CollectdJSON.rrddir
-    @types  = opts[:types]  || CollectdJSON.types
-  end
-
-  # Entry point.
-  def json(opts={})
-    host             = opts[:host]
-    plugin           = opts[:plugin]
-    plugin_instances = opts[:plugin_instances][/\w.*/]
-    instances        = plugin_instances.blank? ? '*' : '{' + plugin_instances.split('/').join(',') + '}'
-    rrdglob          = "#{@rrddir}/#{host}/#{plugin}/#{instances}.rrd"
-
-    start = case
-    when opts[:start] && opts[:start].index('.')
-      opts[:start].split('.').first
-    when opts[:start]
-      opts[:start]
-    else
-      (Time.now - 3600).to_i
-    end
-
-    finish = case
-    when opts[:finish] && opts[:finish].index('.')
-      opts[:finish].split('.').first
-    when opts[:finish]
-      opts[:finish]
-    else
-      Time.now.to_i
-    end
-
-    data = []
-
-    Dir.glob(rrdglob).map do |rrdname|
-      parts         = rrdname.gsub(/#{@rrddir}\//, '').split('/')
-      host_name     = parts[0]
-      plugin_name   = parts[1]
-      instance_name = File.basename(parts[2], '.rrd')
-      rrd = Errand.new(:filename => rrdname)
-
-
-      data << {  :plugin => plugin_name, :instance => instance_name,
-                 :host   => host_name,
-                 :start  => start,
-                 :finish => finish,
-                 :rrd    => rrd }
-    end
-
-    encode(data)
-  end
-
-  private
-  # Attempt to structure the JSON reasonably sanely, so the consumer (i.e. a
-  # browser) doesn't have to do a lot of computationally expensive work.
-  def encode(datas)
-
-    structure = {}
-    datas.each do |data|
-      fetch = data[:rrd].fetch(:function => "AVERAGE",
-                               :start => data[:start],
-                               :finish => data[:finish])
-      rrd_data = fetch[:data]
-
-      # A single rrd can have multiple data sets (multiple metrics within
-      # the same file). Separate the metrics.
-      rrd_data.each_pair do |source, metric|
-
-        # Filter out NaNs and weirdly massive values so yajl doesn't choke
-        metric.map! do |datapoint|
-          case
-          when datapoint && datapoint.nan?
-            @tripped = true
-            @last_valid
-          when @tripped
-            @last_valid
-          else
-            @last_valid = datapoint
-          end
-        end
+module Visage
+  module Collectd
+    class JSON
 
-        # Last value is always wack. Set to 0, so the timescale isn't off by 1.
-        metric[-1] = 0.0
-        host     = data[:host]
-        plugin   = data[:plugin]
-        instance = data[:instance]
-        start    = data[:start].to_i
-        finish   = data[:finish].to_i
-
-        structure[host] ||= {}
-        structure[host][plugin] ||= {}
-        structure[host][plugin][instance] ||= {}
-        structure[host][plugin][instance][source] ||= {}
-        structure[host][plugin][instance][source][:start]  ||= start
-        structure[host][plugin][instance][source][:finish] ||= finish
-        structure[host][plugin][instance][source][:data]   ||= metric
+      def initialize(opts={})
+        @rrddir = opts[:rrddir] || Visage::Collectd::JSON.rrddir
+        @types  = opts[:types]  || Visage::Collectd::JSON.types
+      end
 
+      def parse_time(time, opts={})
+        case
+        when time && time.index('.')
+          time.split('.').first.to_i
+        when time
+          time.to_i
+        else
+         opts[:default] || Time.now.to_i
+        end
       end
-    end
 
-    encoder = Yajl::Encoder.new
-    encoder.encode(structure)
-  end
+      # Entry point.
+      def json(opts={})
+        host      = opts[:host]
+        plugin    = opts[:plugin]
+        instances = opts[:instances][/\w.*/]
+        instances = instances.blank? ? '*' : '{' + instances.split('/').join(',') + '}'
+        rrdglob   = "#{@rrddir}/#{host}/#{plugin}/#{instances}.rrd"
+        finish    = parse_time(opts[:finish])
+        start     = parse_time(opts[:start],  :default => (finish - 3600 || (Time.now - 3600).to_i))
+        data      = []
+
+        Dir.glob(rrdglob).map do |rrdname|
+          parts         = rrdname.gsub(/#{@rrddir}\//, '').split('/')
+          host_name     = parts[0]
+          plugin_name   = parts[1]
+          instance_name = File.basename(parts[2], '.rrd')
+          rrd           = Errand.new(:filename => rrdname)
+
+          data << {  :plugin => plugin_name, :instance => instance_name,
+                     :host   => host_name,
+                     :start  => start,
+                     :finish => finish,
+                     :rrd    => rrd }
+        end
 
-  class << self
-    attr_writer :rrddir
+        encode(data)
+      end
 
-    def rrddir
-      @rrddir ||= Visage::Config.rrddir
-    end
+      private
+      # Attempt to structure the JSON reasonably sanely, so the consumer (i.e. a
+      # browser) doesn't have to do a lot of computationally expensive work.
+      def encode(datas)
+
+        structure = {}
+        datas.each do |data|
+          fetch    = data[:rrd].fetch(:function => "AVERAGE",
+                                      :start    => data[:start],
+                                      :finish   => data[:finish])
+          rrd_data = fetch[:data]
+
+          # A single rrd can have multiple data sets (multiple metrics within
+          # the same file). Separate the metrics.
+          rrd_data.each_pair do |source, metric|
+
+            # Filter out NaNs and weirdly massive values so yajl doesn't choke
+            metric.map! do |datapoint|
+              case
+              when datapoint && datapoint.nan?
+                @tripped = true
+                @last_valid
+              when @tripped
+                @last_valid
+              else
+                @last_valid = datapoint
+              end
+            end
+
+            # Last value is always wack. Set to 0, so the timescale isn't off by 1.
+            metric[-1] = 0.0
+            host     = data[:host]
+            plugin   = data[:plugin]
+            instance = data[:instance]
+            start    = data[:start].to_i
+            finish   = data[:finish].to_i
+
+            structure[host] ||= {}
+            structure[host][plugin] ||= {}
+            structure[host][plugin][instance] ||= {}
+            structure[host][plugin][instance][source] ||= {}
+            structure[host][plugin][instance][source][:start]  ||= start
+            structure[host][plugin][instance][source][:finish] ||= finish
+            structure[host][plugin][instance][source][:data]   ||= metric
 
-    def types
-      @types  ||= Visage::Config.types
-    end
+          end
+        end
 
-    def hosts
-      if @rrddir
-        Dir.glob("#{@rrddir}/*").map {|e| e.split('/').last }.sort
+        encoder = Yajl::Encoder.new
+        encoder.encode(structure)
       end
-    end
 
-    def plugins(opts={})
-      host = opts[:host] || '*'
-      Dir.glob("#{@rrddir}/#{host}/*").map {|e| e.split('/').last }.sort
-    end
+      class << self
+        attr_writer :rrddir
+
+        def rrddir
+          @rrddir ||= Visage::Config.rrddir
+        end
+
+        def types
+          @types  ||= Visage::Config.types
+        end
 
-  end
+        def hosts
+          if @rrddir
+            Dir.glob("#{@rrddir}/*").map {|e| e.split('/').last }.sort
+          end
+        end
+
+        def plugins(opts={})
+          host = opts[:host] || '*'
+          Dir.glob("#{@rrddir}/#{host}/*").map {|e| e.split('/').last }.sort
+        end
+
+      end
 
-end
+    end # class JSON
+  end # module Collectd
+end # module Visage