visage-app 0.9.0.pre2 → 0.9.0

data/Gemfile

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+source :rubygems
+
+gem "haml"
+gem "tilt"
+gem "sinatra"
+gem "errand"
+gem "yajl-ruby"
+
+group :development do
+  gem "shotgun"
+  gem "rack-test"
+  gem "rspec"
+  gem "cucumber"
+  gem "webrat"
+  gem "jeweler"
+end

data/LICENCE

@@ -19,7 +19,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
 Visage is distributed with Highcharts. Torstein Hønsi has kindly granted
-permission to distribute Highcharts under the GPL as part of Visage.
+permission to distribute Highcharts under the GPLv2 as part of Visage.
 
 If you ever need an excellent JavaScript charting library, please consider
 purchasing a [commercial license](http://highcharts.com/license) for

data/README.md

@@ -33,7 +33,7 @@ On Ubuntu, to install dependencies run:
 
 On CentOS, to install dependencies run:
 
-    $ sudo yum install -y ruby-rrdtool ruby rubygems collectd
+    $ sudo yum install -y ruby-RRDtool ruby rubygems collectd
 
 Then install the app with:
 
@@ -136,21 +136,22 @@ Check out the code with:
 
     $ git clone git://github.com/auxesis/visage.git
 
-Install the development dependencies with
+Install the development dependencies with:
 
-    $ gem install shotgun rack-test rspec cucumber webrat
+    $ gem install bundler
+    $ bundle install
 
-And run the app with:
+Run all cucumber features:
 
-    $ shotgun visage.rb
+    $ rake cucumber
 
-Create and install a new gem from the current source tree:
+And run the app with:
 
-    $ rake install
+    $ shotgun lib/visage-app/config.ru
 
-Run all cucumber features:
+To create and install a new gem from the current source tree:
 
-    $ rake cucumber
+    $ rake install
 
 Licencing
 ---------
@@ -158,7 +159,7 @@ Licencing
 Visage is MIT licensed.
 
 Visage is distributed with Highcharts. Torstein Hønsi has kindly granted
-permission to distribute Highcharts under the GPL as part of Visage.
+permission to distribute Highcharts under the GPLv2 as part of Visage.
 
 If you ever need an excellent JavaScript charting library, please consider
 purchasing a [commercial license](http://highcharts.com/license) for

data/VERSION

@@ -1 +1 @@
-0.9.0.pre2
+0.9.0

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

@@ -36,9 +36,9 @@ class CollectdJSON
       instance_name = parts[2].split('.').first
       rrd = Errand.new(:filename => rrdname)
 
-      data << { :plugin  => plugin_name, :instance => instance_name,
+      data << {  :plugin => plugin_name, :instance => instance_name,
                  :host   => host,
-                 :start  => opts[:start] || (Time.now - 3600).to_i,
+                 :start  => opts[:start]  || (Time.now - 3600).to_i,
                  :finish => opts[:finish] || Time.now.to_i,
                  :rrd    => rrd }
     end
@@ -54,8 +54,8 @@ class CollectdJSON
     structure = {}
     datas.each do |data|
       fetch = data[:rrd].fetch(:function => "AVERAGE",
-                                  :start => data[:start],
-                                  :finish => data[:finish])
+                               :start => data[:start],
+                               :finish => data[:finish])
       rrd_data = fetch[:data]
 
       # A single rrd can have multiple data sets (multiple metrics within
@@ -75,15 +75,22 @@ class CollectdJSON
           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
 
-        structure[data[:host]] ||= {}
-        structure[data[:host]][data[:plugin]] ||= {}
-        structure[data[:host]][data[:plugin]][data[:instance]] ||= {}
-        structure[data[:host]][data[:plugin]][data[:instance]][source] ||= {}
-        structure[data[:host]][data[:plugin]][data[:instance]][source][:start]  ||= data[:start]
-        structure[data[:host]][data[:plugin]][data[:instance]][source][:finish] ||= data[:finish]
-        structure[data[:host]][data[:plugin]][data[:instance]][source][:data]   ||= metric
       end
     end
 

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

@@ -5,78 +5,86 @@ function formatSeriesLabel(labels) {
         metric   = labels[3],
         name;
 
-    // Generic label building
-    name = instance
-    name = name.replace(plugin, '')
-    name = name.replace(plugin.split('-')[0], '')
-    name = name.replace('tcp_connections', '')
-    name = name.replace('ps_state', '')
-    name += metric == "value" ? "" : " (" + metric + ")"
-    name = name.replace(/^[-|_]*/, '')
-    name = name.trim().replace(/^\((.*)\)$/, '$1')
-    name = plugin == "irq" ? name.replace(/^/, 'irq ') : ''
 
+    if (plugin == "irq") {
+        name = name.replace(/^/, 'irq ')
+    }
     // Plugin specific labeling
-    if (plugin == "interface") {
-        name += instance.replace(/^if_(.*)-(.*)/, '$2 $1') + ' (' + metric + ')'
+    else if (plugin == "interface") {
+        name = instance.replace(/^if_(.*)-(.*)/, '$2 $1') + ' (' + metric + ')'
     }
-    if (["processes", "memory"].contains(plugin) || plugin.test(/^cpu-\d+/) ) {
-        name += instance.split('-')[1]
+    else if (["processes", "memory"].contains(plugin) || plugin.test(/^cpu-\d+/) ) {
+        name = instance.split('-')[1]
     }
-    if (plugin == "swap") {
+    else if (plugin == "swap") {
         if (instance.test(/^swap_io/)) {
-            name += instance.replace(/^swap_(\w*)-(.*)$/, '$1 $2')
+            name = instance.replace(/^swap_(\w*)-(.*)$/, '$1 $2')
         }
         if (instance.test(/^swap-/)) {
-            name += instance.split('-')[1]
+            name = instance.split('-')[1]
         }
     }
-    if (plugin == "load") {
-        name += metric.replace(/^\((.*)\)$/, '$1')
+    else if (plugin == "load") {
+        name = metric.replace(/^\((.*)\)$/, '$1')
     }
-    if (plugin.test(/^disk/)) {
-        name += instance.replace(/^disk_/, '') + ' (' + metric + ')'
+    else if (plugin.test(/^disk/)) {
+        name = instance.replace(/^disk_/, '') + ' (' + metric + ')'
     }
-    if (["entropy","users"].contains(plugin)) {
-        name += metric
+    else if (["entropy","users"].contains(plugin)) {
+        name = metric
     }
-    if (plugin == "uptime") {
-        name += instance
+    else if (plugin == "uptime") {
+        name = instance
     }
-    if (plugin == "ping") {
+    else if (plugin == "ping") {
         if (instance.test(/^ping_/)) {
-            name += instance.replace(/^ping_(.*)-(.*)$/, '$1 $2')
+            name = instance.replace(/^ping_(.*)-(.*)$/, '$1 $2')
         } else {
-            name += metric + ' ' + instance.split('-')[1]
+            name = metric + ' ' + instance.split('-')[1]
         }
     }
-    if (plugin == "vmem") {
+    else if (plugin.test(/^vmem/)) {
         if (instance.test(/^vmpage_number-/)) {
-            name += instance.replace(/^vmpage_number-(.*)$/, '$1').replace('_', ' ')
+            name = instance.replace(/^vmpage_number-(.*)$/, '$1').replace('_', ' ')
         }
         if (instance.test(/^vmpage_io/)) {
-            name += instance.replace(/^vmpage_io-(.*)$/, '$1 ') + metric
+            name = instance.replace(/^vmpage_io-(.*)$/, '$1 ') + metric
         }
         if (instance.test(/^vmpage_faults/)) {
-            name += metric.trim() == "minflt" ? 'minor' : 'major'
+            name = metric.trim() == "minflt" ? 'minor' : 'major'
             name += ' faults'
         }
+        if (instance.test(/^vmpage_action-/)) {
+            name = instance.replace(/^vmpage_action-(.*)$/, '$1').replace('_', ' ')
+        }
     }
-    if (plugin.test(/^tcpconns/)) {
-        name += instance.split('-')[1].replace('_', ' ')
+    else if (plugin.test(/^tcpconns/)) {
+        name = instance.split('-')[1].replace('_', ' ')
     }
-    if (plugin.test(/^tail/)) {
-        name += plugin.split('-').slice(1).join('-') + ' '
-        name += instance.split('-').slice(1).join('-')
+    else if (plugin.test(/^tail/)) {
+        name = plugin.split('-').slice(1).join('-') + ' '
+        name = instance.split('-').slice(1).join('-')
     }
-    if (plugin == "apache") {
+    else if (plugin == "apache") {
         var stash = instance.split('_')[1]
         if (stash.test(/^scoreboard/)) {
-          name += 'connections: ' + stash.split('-')[1]
+          name = 'connections: ' + stash.split('-')[1]
         } else {
-          name += stash
+          name = stash
         }
-
+    }
+    else if ( plugin.test(/^curl_json/) ) {
+        var stash = instance.split('-')[2];
+        var stash = stash.replace(/[-|_]/, ' ');
+        name = stash
+    }
+    else {
+        // Generic label building
+        name = instance
+        name = name.replace(plugin.split('-')[0], '')
+        name += metric == "value" ? "" : " (" + metric + ")"
+        name = name.replace(/^[-|_]*/, '')
+        name = name.trim().replace(/^\((.*)\)$/, '$1')
     }
     return name.trim()
 }
@@ -120,6 +128,12 @@ function formatDate(d) {
   return datetime.format("%Y-%m-%d %H:%M:%S UTC%T")
 }
 
+function formatPluginName(name) {
+    if (name.test(/^curl_json/)) {
+        name = name.split('-')[1].replace(/(-|_)/, ' ');
+    }
+    return name
+}
 
 
 /*
@@ -130,24 +144,26 @@ function formatDate(d) {
  *
  */
 var visageBase = new Class({
-    Implements: [Options, Events],
+    Implements: [ Options, Events ],
     options: {
         secureJSON: false,
         httpMethod: 'get',
         live: false
     },
     initialize: function(element, host, plugin, options) {
-        this.parentElement = element
-        this.setOptions(options)
-        this.options.host = host
+        this.parentElement  = element
+        this.options.host   = host
         this.options.plugin = plugin
-        data = new Hash()
+        this.setOptions(options)
+
+        var data = new Hash()
         if($chk(this.options.start)) {
             data.set('start', this.options.start)
         }
         if($chk(this.options.finish)) {
             data.set('finish', this.options.finish)
         }
+
         this.requestData = data;
         this.getData(); // calls graphData
     },
@@ -184,7 +200,13 @@ var visageBase = new Class({
         this.request.send();
     },
     graphName: function() {
-        name = $chk(this.options.name) ? this.options.name : this.options.plugin
+        if ($chk(this.options.name)) {
+            var name = this.options.name
+        } else {
+            var name = [ formatPluginName(this.options.plugin),
+                         'on',
+                         this.options.host ].join(' ')
+        }
         return name
     },
 });
@@ -209,7 +231,7 @@ var visageGraph = new Class({
 
         if ( $defined(this.chart) ) {
             this.series.each(function(series, index) {
-                this.chart.series[index].setData(series.data)
+                this.chart.series[index].setData(series.data, true)
             }, this);
         } else {
             this.drawChart()
@@ -223,11 +245,19 @@ var visageGraph = new Class({
 
         $each(data[host][plugin], function(instance, iname) {
             $each(instance, function(metric, mname) {
+                var start    = metric.start,
+                    finish   = metric.finish,
+                    interval = (finish - start) / metric.data.length;
+
+                var data     = metric.data.map(function(value, index) {
+                    var x = start + index * interval,
+                        y = value;
+                    return [ x, y ];
+                });
+
                 var set = {
-                    name:          [ host, plugin, iname, mname ],
-                    data:          metric.data,
-                    pointStart:    metric.start,
-                    pointInterval: (metric.finish - metric.start) / metric.data.length
+                    name: [ host, plugin, iname, mname ],
+                    data: data,
                 };
 
                 series.push(set)
@@ -240,7 +270,7 @@ var visageGraph = new Class({
         var series  = this.series,
             title   = this.graphName(),
             element = this.parentElement,
-            ytitle  = this.options.plugin
+            ytitle  = formatPluginName(this.options.plugin),
             max     = 0
 
         /* Get the maximum value across all sets.
@@ -406,7 +436,6 @@ var visageGraph = new Class({
                 html: html,
                 value: value,
                 selected: (current ? 'selected' : '')
-
             });
             select.grab(option)
         });

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

@@ -3,7 +3,7 @@
 
  (c) 2009-2010 Torstein H�nsi
 
- License: www.highcharts.com/license
+ License: GPLv2, as part of Visage
 */
 (function(){function R(a,b){a||(a={});for(var c in b)a[c]=b[c];return a}function T(a){return a!==Na&&a!==null}function oa(a,b,c){var d,e="setAttribute",f;if(typeof b=="string")if(T(c))a[e](b,c);else{if(a&&a.getAttribute)f=a.getAttribute(b)}else if(T(b)&&typeof b=="object")for(d in b)a[e](d,b[d]);return f}function pc(a){if(!a||a.constructor!=Array)a=[a];return a}function z(){var a=arguments,b,c;for(b=0;b<a.length;b++){c=a[b];if(T(c))return c}}function qc(a){var b="",c;for(c in a)b+=rc(c)+":"+a[c]+
 ";";return b}function Oa(a,b){if(Zb)if(b&&b.opacity!==Na)b.filter="alpha(opacity="+b.opacity*100+")";R(a.style,b)}function Ea(a,b,c,d,e){a=ka.createElement(a);b&&R(a,b);e&&Oa(a,{padding:0,border:fb,margin:0});c&&Oa(a,c);d&&d.appendChild(a);return a}function Pc(){var a=va.global.useUTC;$b=a?Date.UTC:function(b,c,d,e,f,g){return(new Date(b,c,z(d,1),z(e,0),z(f,0),z(g,0))).getTime()};sc=a?"getUTCMinutes":"getMinutes";tc=a?"getUTCHours":"getHours";uc=a?"getUTCDay":"getDay";Qb=a?"getUTCDate":"getDate";

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

@@ -10,10 +10,10 @@
         window.addEvent('domready', function() {
           var graph = new visageGraph('#{graph.id}', '#{graph.host}', '#{graph.plugin}', {
             pluginInstance: '#{graph.instances.join(',')}',
-            name: '#{graph.plugin} on #{graph.host}',
-            start: '#{@start}',
-            #{ "baseurl: '" + ENV['VISAGE_APP_BASE_URL_PATH'].gsub(/^\//, '') + "'," if ENV['VISAGE_APP_BASE_URL_PATH'] }
-            finish: '#{@finish}'
+            //name:           '#{graph.plugin} on #{graph.host}',
+            start:          '#{@start}',
+            finish:         '#{@finish}',
+            #{ "baseurl: '" + ENV['BASE_URL'].gsub(/^\//, '') if ENV['BASE_URL'] }
           });
         });
   - if @profile.graphs.size == 0

data/visage-app.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{visage-app}
-  s.version = "0.9.0.pre2"
+  s.version = "0.9.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lindsay Holmwood"]
-  s.date = %q{2011-01-24}
+  s.date = %q{2011-02-04}
   s.default_executable = %q{visage-app}
   s.description = %q{Visage is a web interface for viewing collectd statistics. It also provides a JSON interface onto collectd's RRD data, giving you an easy way to mash up the data.}
   s.email = %q{lindsay@holmwood.id.au}
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
   s.files = [
     ".gitignore",
      "AUTHORS",
+     "Gemfile",
      "LICENCE",
      "README.md",
      "Rakefile",
@@ -73,14 +74,14 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://visage-app.com/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{a web (interface | service) for viewing collectd statistics}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, ["= 1.0"])
       s.add_runtime_dependency(%q<tilt>, ["= 1.0.1"])
       s.add_runtime_dependency(%q<haml>, ["= 3.0.13"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: visage-app
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 59
+  prerelease: false
   segments: 
   - 0
   - 9
   - 0
-  - pre2
-  version: 0.9.0.pre2
+  version: 0.9.0
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -15,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-24 00:00:00 +11:00
+date: 2011-02-04 00:00:00 +11:00
 default_executable: visage-app
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 1
         - 0
@@ -35,9 +37,11 @@ dependencies:
   name: tilt
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 0
@@ -49,9 +53,11 @@ dependencies:
   name: haml
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 3
         - 0
@@ -63,9 +69,11 @@ dependencies:
   name: errand
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 0
         - 7
@@ -77,9 +85,11 @@ dependencies:
   name: yajl-ruby
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 0
         - 7
@@ -98,6 +108,7 @@ extra_rdoc_files:
 files: 
 - .gitignore
 - AUTHORS
+- Gemfile
 - LICENCE
 - README.md
 - Rakefile
@@ -157,25 +168,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: a web (interface | service) for viewing collectd statistics