visage-app 0.9.4 → 0.9.5

data/Gemfile.lock

@@ -0,0 +1,62 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    builder (3.0.0)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    diff-lcs (1.1.2)
+    errand (0.7.2)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
+    git (1.2.5)
+    haml (3.0.25)
+    jeweler (1.5.2)
+      bundler (~> 1.0.0)
+      git (>= 1.2.5)
+      rake
+    json (1.4.6)
+    nokogiri (1.4.4)
+    rack (1.2.1)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rake (0.8.7)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
+    shotgun (0.8)
+      rack (>= 1.0)
+    sinatra (1.1.2)
+      rack (~> 1.1)
+      tilt (~> 1.2)
+    term-ansicolor (1.0.5)
+    tilt (1.2.2)
+    webrat (0.7.1)
+      nokogiri (>= 1.2.0)
+      rack (>= 1.0)
+      rack-test (>= 0.5.3)
+    yajl-ruby (0.7.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cucumber
+  errand
+  haml
+  jeweler
+  rack-test
+  rspec
+  shotgun
+  sinatra
+  tilt
+  webrat
+  yajl-ruby

data/README.md

@@ -35,6 +35,10 @@ On CentOS, to install dependencies run:
 
     $ sudo yum install -y ruby-RRDtool ruby rubygems collectd
 
+If you are using Ruby Enterprise Edition, instead of installing librrd-ruby or ruby-RRDtool, run
+
+    $ gem install librrd
+
 Then install the app with:
 
     $ gem install visage-app

data/VERSION

@@ -1 +1 @@
-0.9.4
+0.9.5

data/features/json.feature

@@ -36,32 +36,6 @@ Feature: Export data
     When I visit "cpu-0?callback=foobar" on the first available host
     Then I should receive JSON wrapped in a callback named "foobar"
 
-  Scenario: Retrieve multiple plugin instances without color definition
-    Given a list of hosts exist
-    When I visit "memory" on the first available host
-    Then the request should succeed
-    Then I should receive valid JSON
-    And each plugin instance should have a different color
-
-  Scenario Outline: Return only one colour per metric
-    Given a list of hosts exist
-    When I visit "<path>" on the first available host
-    Then the request should succeed
-    Then I should receive valid JSON
-    And each plugin instance should have a different color
-
-  Examples:
-    | path               |
-    | cpu-0/cpu-user     |
-    | memory/memory-used |
-
-  Scenario: Retrieve single plugin instance with a color definition
-    Given a list of hosts exist
-    When I visit "load/load" on the first available host
-    Then the request should succeed
-    Then I should receive valid JSON
-    And the plugin instance should have a color
-
   Scenario: Retrieve multiple plugins through a glob
     Given a list of hosts exist
     When I visit "disk*/disk_ops" on the first available host

data/features/meta.feature

@@ -0,0 +1,12 @@
+Feature: Metric metadata
+  To view the data
+  In an identifiable way
+  A user
+  Needs meaningful labels
+
+  Scenario: Retreive a list of types
+    When I go to /meta/types
+    Then the request should succeed
+    Then I should receive valid JSON
+    And the JSON should have a list of types
+

data/features/step_definitions/json_steps.rb

@@ -5,6 +5,8 @@ Then /^I should receive valid JSON$/ do
   }.should_not raise_error
 
   case
+  when @response.class == Array
+    next
   when @response.keys.first == "hosts"
     @response["hosts"].should respond_to(:size)
   when @response[@response.keys.first].respond_to?(:size)
@@ -121,3 +123,13 @@ Then /^the JSON should have a list of plugins$/ do
   plugins = @response[host]
   plugins.size.should > 0
 end
+
+Then /^the JSON should have a list of types$/ do
+  @response.size.should > 0
+  @response.each do |type|
+    %w(dataset datasource type min max).each do |attr|
+      type[attr].should_not be_nil
+    end
+  end
+end
+

data/features/step_definitions/site_steps.rb

@@ -6,6 +6,11 @@ When /^I visit the first profile$/ do
 end
 
 Then /^I should see a list of graphs$/ do
+  begin
+    follow_redirect!
+  rescue Rack::Test::Error
+  end
+
   doc = Nokogiri::HTML(response_body)
   doc.search('div#profile div.graph').size.should > 0
 end

data/features/step_definitions/webrat_steps.rb

@@ -14,19 +14,19 @@ When /^I follow "(.*)"$/ do |link|
 end
 
 When /^I fill in "(.*)" with "(.*)"$/ do |field, value|
-  fill_in(field, :with => value) 
+  fill_in(field, :with => value)
 end
 
 When /^I select "(.*)" from "(.*)"$/ do |value, field|
-  select(value, :from => field) 
+  select(value, :from => field)
 end
 
 When /^I check "(.*)"$/ do |field|
-  check(field) 
+  check(field)
 end
 
 When /^I uncheck "(.*)"$/ do |field|
-  uncheck(field) 
+  uncheck(field)
 end
 
 When /^I choose "(.*)"$/ do |field|

data/features/support/env.rb

@@ -32,6 +32,7 @@ class SinatraWorld
       use Visage::Profiles
       use Visage::Builder
       use Visage::JSON
+      use Visage::Meta
       run Sinatra::Application
     end
   end

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

@@ -14,6 +14,7 @@ class CollectdJSON
 
   def initialize(opts={})
     @rrddir = opts[:rrddir] || CollectdJSON.rrddir
+    @types  = opts[:types]  || CollectdJSON.types
   end
 
   # Entry point.
@@ -22,24 +23,40 @@ class CollectdJSON
     plugin           = opts[:plugin]
     plugin_instances = opts[:plugin_instances][/\w.*/]
     instances        = plugin_instances.blank? ? '*' : '{' + plugin_instances.split('/').join(',') + '}'
-    @plugin_names = []
+    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
 
-    rrdglob = "#{@rrddir}/#{host}/#{plugin}/#{instances}.rrd"
-    plugin_offset = @rrddir.size + 1 + host.size + 1
+    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          = parts[0]
+      host_name     = parts[0]
       plugin_name   = parts[1]
-      instance_name = parts[2].split('.').first
+      instance_name = File.basename(parts[2], '.rrd')
       rrd = Errand.new(:filename => rrdname)
 
+
       data << {  :plugin => plugin_name, :instance => instance_name,
-                 :host   => host,
-                 :start  => opts[:start]  || (Time.now - 3600).to_i,
-                 :finish => opts[:finish] || Time.now.to_i,
+                 :host   => host_name,
+                 :start  => start,
+                 :finish => finish,
                  :rrd    => rrd }
     end
 
@@ -105,6 +122,10 @@ class CollectdJSON
       @rrddir ||= Visage::Config.rrddir
     end
 
+    def types
+      @types  ||= Visage::Config.types
+    end
+
     def hosts
       if @rrddir
         Dir.glob("#{@rrddir}/*").map {|e| e.split('/').last }.sort

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

@@ -31,7 +31,6 @@ module Visage
           when opts[:metrics].blank?
             glob = "*/*"
           when opts[:metrics] =~ /,/
-            puts "\n" * 4
             glob = "{" + opts[:metrics].split(/\s*,\s*/).map { |m|
               m =~ /\// ? m : ["*/#{m}", "#{m}/*"]
             }.join(',').gsub(/,$/, '') + "}"

data/lib/visage-app/config/file.rb

@@ -19,7 +19,7 @@ module Visage
       end
 
       def self.load(filename, opts={})
-        unless path = self.find(filename, opts)
+        if not path = self.find(filename, opts)
           if opts[:create]
             path = @@config_directories.first.join(filename)
             begin
@@ -41,7 +41,7 @@ module Visage
       end
 
       def initialize(filename, opts={})
-        unless ::File.exists?(filename)
+        if not ::File.exists?(filename)
           path = @@config_directories.first.join(filename)
           FileUtils.touch(path)
         end

data/lib/visage-app/config.ru

@@ -10,4 +10,5 @@ require 'lib/visage-app'
 use Visage::Profiles
 use Visage::Builder
 use Visage::JSON
+use Visage::Meta
 run Sinatra::Base

data/lib/visage-app/patches.rb

@@ -1,10 +1,10 @@
-# extracted from Extlib. 
+# extracted from Extlib.
 # FIXME: what's the licensing here?
 class String
-  def camel_case                                                                                                                                    
-    return self if self !~ /_/ && self =~ /[A-Z]+.*/                                                                                                
-    split('_').map{|e| e.capitalize}.join                                                                                                           
-  end   
+  def camel_case
+    return self if self !~ /_/ && self =~ /[A-Z]+.*/
+    split('_').map{|e| e.capitalize}.join
+  end
 
   def blank?
     strip.empty?

data/lib/visage-app/profile.rb

@@ -24,7 +24,7 @@ module Visage
     def self.all(opts={})
       sort = opts[:sort]
       profiles = self.load
-      profiles = sort == "name" ? profiles.sort.map {|i| i.last } : profiles.values
+      profiles = sort == "name" ? profiles.sort_by {|k,v| v[:profile_name]}.map {|i| i.last } : profiles.values
       profiles.map { |prof| self.new(prof) }
     end
 

data/lib/visage-app/public/javascripts/graph.js

@@ -185,10 +185,10 @@ var visageBase = new Class({
     },
     getData: function() {
         this.request = new Request.JSONP({
-            url: this.dataURL(),
-            data: this.requestData,
-            secure: this.options.secureJSON,
-            method: this.options.httpMethod,
+            url:        this.dataURL(),
+            data:       this.requestData,
+            secure:     this.options.secureJSON,
+            method:     this.options.httpMethod,
             onComplete: function(json) {
                 this.graphData(json);
             }.bind(this),
@@ -228,13 +228,33 @@ var visageGraph = new Class({
     graphData: function(data) {
         this.response = data
         this.buildDataStructures()
+        this.lastStart  = this.series[0].data[0][0]
+        this.lastFinish = this.series[0].data.getLast()[0]
+
+        switch(true) {
+            case $defined(this.chart) && this.requestData['live']:
+                this.series.each(function(series, index) {
+                    var point = series.data[1];
+                    this.chart.series[index].addPoint(point, false);
+                }, this);
+                this.chart.redraw();
+                break;
+            case $defined(this.chart):
+                this.series.each(function(series, index) {
+                    this.chart.series[index].setData(series.data, false);
+                }, this);
+
+                /* Reset the zoom */
+                this.chart.toolbar.remove('zoom');
+                this.chart.xAxis.concat(this.chart.yAxis).each(function(axis) {
+                    axis.setExtremes(null,null,false);
+                });
 
-        if ( $defined(this.chart) ) {
-            this.series.each(function(series, index) {
-                this.chart.series[index].setData(series.data, true)
-            }, this);
-        } else {
-            this.drawChart()
+                this.chart.redraw();
+                break;
+            default:
+                this.drawChart()
+                break;
         }
     },
     buildDataStructures: function (data) {
@@ -294,6 +314,10 @@ var visageGraph = new Class({
                     load: function(e) {
                         setInterval(function() {
                             if (this.options.live) {
+                                var data = { 'start':  this.lastFinish,
+                                             'finish': this.lastFinish + 10,
+                                             'live':   true };
+                                this.requestData = data;
                                 this.getData()
                             }
                         }.bind(this), 10000);
@@ -411,11 +435,10 @@ var visageGraph = new Class({
                 'submit': function(e, foo) {
                     e.stop();
                     e.target.getElement('select').getSelected().each(function(option) {
-                        data = new Hash()
-                        split = option.value.split('=')
-                        data.set(split[0], split[1])
+                        value = parseInt(option.value.split('=')[1])
+                        data = { 'start': value }
                     });
-                    this.requestData = data
+                    this.requestData = data;
 
                    /* Draw everything again. */
                     this.getData();
@@ -446,6 +469,7 @@ var visageGraph = new Class({
             'type': 'checkbox',
             'id':   this.parentElement + '-live',
             'name': 'live',
+            'checked': this.options.live,
             'events': {
                 'click': function() {
                     this.options.live = !this.options.live
@@ -478,12 +502,15 @@ var visageGraph = new Class({
             },
             'events': {
                 'mouseover': function(e) {
-                    var url     = e.target.get('href')
-                    var options = this.requestData.toQueryString()
-
-                    if ( options != '' && ! url.contains('?') ) {
-                        url += '?' + options
-                    }
+                    e.stop();
+                    var url      = e.target.get('href'),
+                        extremes = this.chart.xAxis[0].getExtremes(),
+                        options  = { 'start':  extremes.dataMin,
+                                     'finish': parseInt(extremes.dataMax) };
+
+                    var options = new Hash(options).toQueryString(),
+                        baseurl = this.dataURL(),
+                        url     = baseurl += '?' + options;
 
                     e.target.set('href', url)
                 }.bind(this)

data/lib/visage-app/types.rb

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+
+module Visage
+  class Types
+    attr_reader :types
+
+    def initialize(opts={})
+      @filename = opts[:filename] || "/usr/share/collectd/types.db"
+      @types    = []
+      build
+    end
+
+    def to_json
+      @types.to_json
+    end
+
+    private
+    def build
+      file = File.new(@filename)
+      file.each_line do |line|
+        next if line =~ /^#/
+        next if line =~ /^\s*$/
+        attrs   = {}
+        spec    = line.strip.split(/\t+|,\s+/)
+        dataset = spec.shift
+        spec.each do |source|
+          parts = source.split(':')
+          @types << { "dataset"    => dataset,
+                      "datasource" => parts[0],
+                      "type"       => parts[1],
+                      "min"        => parts[2],
+                      "max"        => parts[3] }
+        end
+      end
+    end
+  end
+end

data/lib/visage-app/views/profile.haml

@@ -16,6 +16,7 @@
             pluginInstance: '#{instance}',
             start:          '#{@start}',
             finish:         '#{@finish}',
+            live:           #{@live},
             #{ "baseurl: '" + ENV['BASE_URL'].gsub(/^\//, '') if ENV['BASE_URL'] }
           });
         });

data/lib/visage-app.rb

@@ -12,6 +12,7 @@ require 'lib/visage-app/config'
 require 'lib/visage-app/config/file'
 require 'lib/visage-app/collectd/rrds'
 require 'lib/visage-app/collectd/json'
+require 'lib/visage-app/types'
 require 'yajl/json_gem'
 
 module Visage
@@ -27,7 +28,11 @@ module Visage
       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
       end
+
+      # Load up the profile.yaml. Creates it if it doesn't already exist.
+      Visage::Profile.load
     end
   end
 
@@ -41,6 +46,7 @@ module Visage
       raise Sinatra::NotFound unless @profile
       @start  = params[:start]
       @finish = params[:finish]
+      @live   = params[:live] ? true : false
       haml :profile
     end
 
@@ -83,19 +89,27 @@ module Visage
   class JSON < Application
 
     # JSON data backend
+    mime_type :json,  "application/json"
+    mime_type :jsonp, "text/javascript"
+
+    before do
+      content_type :jsonp
+    end
 
     # /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,
+      json = collectd.json(:host             => host,
+                           :plugin           => plugin,
                            :plugin_instances => plugin_instances,
-                           :start => params[:start],
-                           :finish => params[:finish])
+                           :start            => start,
+                           :finish           => finish)
       # if the request is cross-domain, we need to serve JSONP
       maybe_wrap_with_callback(json)
     end
@@ -120,4 +134,10 @@ module Visage
     end
 
   end
+
+  class Meta < Application
+    get '/meta/types' do
+      Visage::Config.types.to_json
+    end
+  end
 end

data/visage-app.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{visage-app}
-  s.version = "0.9.3"
+  s.version = "0.9.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lindsay Holmwood"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-03 00:00:00 +11:00
+date: 2011-05-08 00:00:00 +10:00
 default_executable: visage-app
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -230,6 +230,7 @@ extra_rdoc_files:
 files: 
 - AUTHORS
 - Gemfile
+- Gemfile.lock
 - LICENCE
 - README.md
 - Rakefile
@@ -239,6 +240,7 @@ files:
 - features/cli.feature
 - features/data/config/with_no_profiles/.stub
 - features/json.feature
+- features/meta.feature
 - features/profiles.feature
 - features/step_definitions/form_steps.rb
 - features/step_definitions/json_steps.rb
@@ -272,6 +274,7 @@ files:
 - lib/visage-app/public/javascripts/mootools-1.2.3-core.js
 - lib/visage-app/public/javascripts/mootools-1.2.5.1-more.js
 - lib/visage-app/public/stylesheets/screen.css
+- lib/visage-app/types.rb
 - lib/visage-app/views/builder.haml
 - lib/visage-app/views/layout.haml
 - lib/visage-app/views/profile.haml