visage-app 2.0.5 → 2.1.0

data/lib/visage-app/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Visage
-  VERSION = "2.0.5"
+  VERSION = "2.1.0"
 end

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

@@ -5,37 +5,7 @@
       new ChartBuilder('chart-builder');
   });
 
-%div#chart-builder
-  %div#hosts.builder
-    %h2 Hosts
-    %img{:src => link_to("/images/hosts.png"), :class => "icon hosts"}
-    %div.search
-
-  %div#metrics.builder
-    %h2 Metrics
-    %img{:src => link_to("/images/metrics.png"), :class => "icon metrics"}
-    %div.search
-
-  %input#show{:value => "Show graphs", :type => "button", :class => "button"}
-
-  %div{:style => "text-align: left; margin-left: 24px;"}
-    %strong{:style => "font-family: sans-serif; font-size: 12px;"}
-      Global Time Period:
-    <select id="timescale" class="date timescale" style="margin-bottom: 3px; border-top-width: 1px; border-right-width: 1px; border-bottom-width: 1px; border-left-width: 1px; border-top-style: solid; border-right-style: solid; border-bottom-style: solid; border-left-style: solid; border-top-color: rgb(170, 170, 170); border-right-color: rgb(170, 170, 170); border-bottom-color: rgb(170, 170, 170); border-left-color: rgb(170, 170, 170); "><option value="start=1321692809">last 1 hour</option><option value="start=1321689209">last 2 hours</option><option value="start=1321674809">last 6 hours</option><option value="start=1321653209">last 12 hours</option><option value="start=1321610009">last 1 day</option><option value="start=1321523609">last 2 days</option><option value="start=1321437209">last 3 days</option><option value="start=1321091609">last 1 week</option><option value="start=1320486809">last 2 weeks</option><option value="start=1318910009">last 1 month</option><option value="start=1290160409">last 1 year</option><option value="start=1258624409">last 2 years</option></select>
-    :javascript
-      window.addEvent('domready', function() {
-        var timescale = $('timescale');
-        timescale.addEvent('change', function(e) {
-          e.stop();
-          window.Graphs.each(function(graph) {
-            var selected = timescale.getSelected()[0]
-
-            graph.setTimePeriodTo(selected);
-          });
-
-        });
-      });
-
-  %div#graphs
+= haml :builder_form
 
+%div#graphs
 

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

@@ -9,6 +9,13 @@
     %img{:src => link_to("/images/metrics.png"), :class => "icon metrics"}
     %div.search
 
+  %div#profile-options.builder
+    %h2 Profile Options
+    %div.percentiles
+      /%strong{:style => "font-family: sans-serif; font-size: 12px;"}
+      95th Percentile:
+
   %input#show{:value => "Show graphs", :type => "button", :class => "button"}
 
   %div#graph
+

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

@@ -7,6 +7,7 @@
     %link{:rel => 'stylesheet', :href => '/stylesheets/message.css', :type => 'text/css'}
     %script{:type => "text/javascript", :src => link_to("/javascripts/mootools-core-1.4.0-full-compat.js")}
     %script{:type => "text/javascript", :src => link_to("/javascripts/mootools-more-1.4.0.1.js")}
+    %script{:type => "text/javascript", :src => link_to("/javascripts/highcharts-mootools-adapter.js")}
     %script{:type => "text/javascript", :src => link_to("/javascripts/highcharts.js")}
     %script{:type => "text/javascript", :src => link_to("/javascripts/graph.js")}
     %script{:type => "text/javascript", :src => link_to("/javascripts/keyboard.js")}

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

@@ -6,11 +6,23 @@
 %div#chart-builder-slider
   = haml :builder_form
 
+- if @profile.options[:percentiles]
+  - percentiles = @profile.options[:percentiles]
+- else
+  - percentiles = []
+
+- if percentiles.length > 0
+  - percentiles_js = "'#{percentiles.join(',') }'"
+- else
+  - percentiles_js = ''
+
 :javascript
   window.addEvent('domready', function() {
     var builder = new ChartBuilder('chart-builder', {
-      hosts:   ['#{@profile.options[:hosts].join("','")   }'],
-      metrics: ['#{@profile.options[:metrics].join("','") }']
+      hosts:       ['#{@profile.options[:hosts].join("','")   }'],
+      metrics:     ['#{@profile.options[:metrics].join("','") }'],
+      percentiles: [#{percentiles_js}]
+
     });
 
     $('chart-builder-slider').fade('hide').setStyle('height', '0');
@@ -25,28 +37,6 @@
 %div#profile
   %h2#name= profile_name
   %div#graphs
-    - @profile.graphs.each do |graph|
-      - id       = URI.escape(graph.id)
-      - host     = URI.escape(graph.host)
-      - plugin   = URI.escape(graph.plugin)
-      - instance = URI.escape(graph.instances.join(','))
-      %div{:id => id, :class => 'graph'}
-        %img{:src => link_to("/images/loader.gif")}
-        :javascript
-          window.addEvent('domready', function() {
-            var graph = new VisageGraph('#{id}', '#{host}', '#{plugin}', {
-              pluginInstance: '#{instance}',
-              #{ "baseurl: '" + ENV['BASE_URL'].gsub(/^\//, '') if ENV['BASE_URL'] }
-            });
-          });
-    - if @profile.graphs.size == 0
-      %div.graph
-        %h4.error Oops! Looks like there aren't any graphs matching the specified patterns.
-        %p These are the patterns:
-        %pre
-          :preserve
-            Host:    #{@profile.options[:hosts]}
-            Metrics: #{@profile.options[:metrics]}
 
   %div#bottom_nav
     %a{:href => link_to("/profiles")} ← Back to profiles

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

@@ -2,11 +2,14 @@
 
 %div#profiles
   %h2 Profiles
-  %div#sort
-    Sort by:
-    %a{:href => link_to("/profiles?sort=name")} name
-    |
-    %a{:href => link_to("/profiles?sort=created")} created
+  / FIXME - disabling sort links as default is now sorted by profile name
+  / and there's no ability to sort by created time (until it's saved with
+  / profiles on creation)
+  /%div#sort
+  /  Sort by:
+  /  %a{:href => link_to("/profiles?sort=name")} name
+  /  |
+  /  %a{:href => link_to("/profiles?sort=created")} created
 
   %ul#navigation
     - @profiles.each_with_index do |prof,index|

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 2
+  - 1
   - 0
-  - 5
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -14,14 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-30 00:00:00 +11:00
+date: 2012-04-20 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: haml
-  type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -30,12 +27,12 @@ dependencies:
         - 1
         - 4
         version: 3.1.4
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: tilt
+  name: haml
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -44,12 +41,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: sinatra
+  name: tilt
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -58,12 +55,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: errand
+  name: sinatra
   type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -72,12 +69,12 @@ dependencies:
         - 7
         - 3
         version: 0.7.3
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   prerelease: false
-  name: yajl-ruby
+  name: errand
   type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -86,79 +83,82 @@ dependencies:
         - 1
         - 0
         version: 1.1.0
-  requirement: *id005
+  prerelease: false
+  name: yajl-ruby
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
   name: shotgun
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   prerelease: false
   name: rack-test
   type: :development
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   prerelease: false
   name: rspec
   type: :development
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
   prerelease: false
   name: cucumber
   type: :development
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
   prerelease: false
   name: webrat
   type: :development
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         version: "0"
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
   prerelease: false
   name: colorize
   type: :development
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id011
+  version_requirements: *id011
 description: 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.
 email: 
 - lindsay@holmwood.id.au
@@ -215,6 +215,8 @@ files:
 - lib/visage-app/public/images/search.png
 - lib/visage-app/public/javascripts/builder.js
 - lib/visage-app/public/javascripts/graph.js
+- lib/visage-app/public/javascripts/highcharts-mootools-adapter.js
+- lib/visage-app/public/javascripts/highcharts-mootools-adapter.src.js
 - lib/visage-app/public/javascripts/highcharts.js
 - lib/visage-app/public/javascripts/highcharts.src.js
 - lib/visage-app/public/javascripts/keyboard.js