collectd-interface 0.2.1 → 0.3.0

data/README.md

@@ -73,13 +73,24 @@ the graph is generated the caller will be redirected to `/image/`.
 **Parameters**
 
 It is possible to limit the time-frame of the graph using the option
-`last=10h`(us (m)inutes,(d)ays or (w)eeks). 
+_start_ and _end_. They are available in the drop-down menu, and can
+be defined using the input fields or by appending them as URL 
+parameters.
 
-This simple example:
+Following URLs demonstrate the selection of a specific graph with 
+parameters to define a time-frame:
 
-    http://.../memory?last=1w&image=svg
+    http://.../load?start=end-1d&end=now-2h
+    http://.../cpus?start=20120217&end=20120220
+    http://.../memory?start=end-48h&end=20120218
+    http://.../network-eth0?start=20120217&end=now&image=svg
 
-Requests an SVG image with the memory graph for the last week.
+**Plugins**
+
+Each graph is generated from a plugin in `views/graphs/`. This 
+directory is scanned when the Collectd-Interface daemon is started, 
+and each ERB-template (`*.erb`) is registered. Enable/disable 
+certain plugins using the command `collectd-interface-plugins`. 
 
 Data
 ----

data/bin/collectd-interface-daemon

@@ -271,8 +271,11 @@ class CollectdInterface < Sinatra::Base
       end
     # By default the web-interface will be displayed 
     else
-      # default parameters
-      params['last'] = '12h' unless params.has_key?('last')
+      # by default each graph presents the last 12 hours
+      unless params.has_key? 'start' and params.has_key? 'end'
+        params['start'] = 'end-12h'
+        params['end'] = 'now' 
+      end
       params['image'] = 'png' unless params.has_key?('image')
       # display only a subset of the graphs by default
       unless params.has_key?('display')
@@ -309,12 +312,19 @@ class CollectdInterface < Sinatra::Base
         :purple_light => '#FF00FF22', :purple_dark => '#FF00FFAA'
       }
       @type = params.has_key?('image') ? params['image'] : 'png'
-      @last = params.has_key?('last') ? params['last'] : '10800s'
+      if params.has_key? 'start' and params.has_key? 'end'
+        @start = params['start']
+        @end = params['end']
+      else
+        @start = 'end-24h'
+        @end = 'now'
+      end
       @target = %Q[#{settings.public_folder}/images/#{path}.#{@type}]
       @rrd_path = settings.rrd_path
       command = erb "graphs/#{path}".to_sym, :layout => :graph_header
-      puts command if $DEBUG
-      system("#{command} > /dev/null 2>&1")
+      puts command.chomp if $DEBUG
+      output = `#{command} > /dev/null 2>&1`
+      puts output.chomp if $DEBUG and not output.empty?
       redirect %Q[/images/#{path}.#{@type}]
     end
   end

data/views/README.md

@@ -73,13 +73,24 @@ the graph is generated the caller will be redirected to `/image/`.
 **Parameters**
 
 It is possible to limit the time-frame of the graph using the option
-`last=10h`(us (m)inutes,(d)ays or (w)eeks). 
+_start_ and _end_. They are available in the drop-down menu, and can
+be defined using the input fields or by appending them as URL 
+parameters.
 
-This simple example:
+Following URLs demonstrate the selection of a specific graph with 
+parameters to define a time-frame:
 
-    http://.../memory?last=1w&image=svg
+    http://.../load?start=end-1d&end=now-2h
+    http://.../cpus?start=20120217&end=20120220
+    http://.../memory?start=end-48h&end=20120218
+    http://.../network-eth0?start=20120217&end=now&image=svg
 
-Requests an SVG image with the memory graph for the last week.
+**Plugins**
+
+Each graph is generated from a plugin in `views/graphs/`. This 
+directory is scanned when the Collectd-Interface daemon is started, 
+and each ERB-template (`*.erb`) is registered. Enable/disable 
+certain plugins using the command `collectd-interface-plugins`. 
 
 Data
 ----

data/views/graph_header.erb

@@ -1,6 +1,6 @@
 rrdtool graph <%= @target %> \
 -a <%= @type.upcase %> \
---end now --start=end-<%= @last %> \
+--end <%= @end %> --start=<%= @start %> \
 --grid-dash 1:1 --width=400 --height=100 \
 --tabwidth=10 --border=0 --color=BACK#FFFFFF \
 <%= yield %>

data/views/graphs/processes.erb

@@ -1,4 +1,4 @@
---title='Process State' \ 
+--title='Process State' \
 --vertical-label='Count' \
 --lower-limit=0 \
 DEF:sleep_av=<%= @rrd_path %>/processes/ps_state-sleeping.rrd:value:AVERAGE \

data/views/template/options/graph.erb

@@ -9,9 +9,11 @@
     </select>
   </li>
   <li>
-    <div class="label">Values of the last:</div>
-    <input type="text" name="last" value="12h"/>
-    <div class="explain">(s)econds (h)ours (d)ays (w)eeks</div>
+    <div class="label">Start:</div>
+    <input type="text" name="start" value="end-12h"/>
+    <div class="label">End:</div>
+    <input type="text" name="end" value="now"/>
+    <div class="explain">Read Help for more details.</div>
   </li>
   <li>
     <div class="label">Image type for graphs:</div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collectd-interface
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000 +01:00
+date: 2012-02-22 00:00:00.000000000 +01:00
 default_executable: collectd-interface-daemon
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &15161540 !ruby/object:Gem::Requirement
+  requirement: &9266720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *15161540
+  version_requirements: *9266720
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &15203860 !ruby/object:Gem::Requirement
+  requirement: &9266240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +33,7 @@ dependencies:
         version: '0.6'
   type: :runtime
   prerelease: false
-  version_requirements: *15203860
+  version_requirements: *9266240
 description: ''
 email: vic.penso@gmail.com
 executables: