collectd-interface 0.3.0 → 0.3.1

data/views/graphs/disk-traffic-srv.erb.disabled

@@ -1,6 +1,6 @@
 <% name = '/srv' %>
 <% device = `df -l #{name} | grep '/dev/'`.split[0].split('/')[-1] %>
---title='Disk Traffic "<%= name %>"' \ 
+--title='Disk Traffic "<%= name %>"' \
 --vertical-label="Bytes" \
 --alt-autoscale-max --base 1024 \
 DEF:read_av=<%= @rrd_path %>disk-<%= device %>/disk_octets.rrd:read:AVERAGE \

data/views/graphs/disk-traffic-var.erb.disabled

@@ -1,6 +1,6 @@
 <% name = '/var'%>
 <% device = `df -l #{name} | grep '/dev/'`.split[0].split('/')[-1] %>
---title='Disk Traffic "<%= name %>"' \ 
+--title='Disk Traffic "<%= name %>"' \
 --vertical-label="Bytes" \
 --alt-autoscale-max --base 1024 \
 DEF:read_av=<%= @rrd_path %>disk-<%= device %>/disk_octets.rrd:read:AVERAGE \

data/views/graphs/irq.erb.disabled

@@ -0,0 +1,35 @@
+<% def i_num(file) %>
+<%   File.basename(file,'.rrd').gsub(/^irq\-/,'') %>
+<% end %>
+--title="Interrupts" \
+--vertical-label="IRQs\s" \
+--lower-limit=0 \
+--alt-autoscale-max \
+<% files = Dir["#{@rrd_path}/irq/irq-*.rrd"].sort do |a,b| %>
+<%   i_num(a).to_i <=> i_num(b).to_i %>
+<% end %>
+<% files.each do |file| %>
+<%   i = i_num(file) %>
+DEF:irq_<%= i %>_max=<%= file %>:value:MAX \
+DEF:irq_<%= i %>_avg=<%= file %>:value:AVERAGE \
+DEF:irq_<%= i %>_min=<%= file %>:value:MIN \
+<% end %>
+<% tail = Array.new %>
+<% (files.length - 1 ).times { tail << '+' } %>
+<%# (files.length - 2 ).times { tail << 'UNKN,IF' }%>
+CDEF:irqs_max=<%= (files.map { |f| "irq_" + i_num(f) + "_max,UN,0,"  "irq_" + i_num(f) + "_max,IF"  }).join(',') %>,<%= tail.join(',') %> \
+CDEF:irqs_avg=<%= (files.map { |f| "irq_" + i_num(f) + "_avg,UN,0,"  "irq_" + i_num(f) + "_avg,IF"  }).join(',') %>,<%= tail.join(',') %> \
+CDEF:irqs_min=<%= (files.map { |f| "irq_" + i_num(f) + "_min,UN,0,"  "irq_" + i_num(f) + "_min,IF"  }).join(',') %>,<%= tail.join(',') %> \
+AREA:irqs_max<%= @color[:blue_light] %> \
+AREA:irqs_min#ffffff \
+LINE1:irqs_avg<%= @color[:blue_dark] %>:"Sum    \t\t\t\t\t\t\t\t\t\t\t\t\t" \
+GPRINT:irqs_max:MIN:"Min. %3.0lf" \
+GPRINT:irqs_avg:AVERAGE:"Avg. %3.0lf" \
+GPRINT:irqs_max:MAX:"Max. %3.0lf" \
+<% files.each do |file| %>
+<%   i = i_num(file) %>
+LINE1:irq_<%= i %>_max#ffffff00:"IRQ <%= i %> \t\t\t\t\t\t\t\t\t\t\t\t\t" \
+GPRINT:irq_<%= i %>_min:MIN:"Min. %3.0lf" \
+GPRINT:irq_<%= i %>_avg:AVERAGE:"Avg. %3.0lf" \
+GPRINT:irq_<%= i %>_max:MAX:"Max. %3.0lf" \
+<% end %>

data/views/graphs/users.erb.disabled

@@ -0,0 +1,11 @@
+--title="Users" \
+--vertical-label="Number" \
+--lower-limit=0 \
+--alt-autoscale-max \
+DEF:users_max=<%= @rrd_path %>/users/users.rrd:users:MAX \
+DEF:users_min=<%= @rrd_path %>/users/users.rrd:users:MIN \
+AREA:users_max<%= @color[:blue_light] %> \
+AREA:users_min#ffffff \
+LINE1:users_max<%= @color[:blue_dark] %>:"Users" \
+GPRINT:users_min:MIN:"Min %3.0lf" \
+GPRINT:users_max:MAX:"Max %3.0lf"

data/views/reports/processes-cpu-usage.erb

@@ -29,9 +29,11 @@
   <tbody>
 <% content.split("\n")[1..-1].reverse.each do |process| %>
 <%   process = process.split %>
+<%   command = process[6..-1].join(' ') %>
+<%   next if command =~ /^\[.*/%>
     <tr>
       <td><%= process[0..5].join('</td><td>') %></td>
-      <td><span style="font-size:80%"><%= process[6..-1].join(' ')%></span></td>
+      <td><span style="font-size:80%"><%= command %></span></td>
     </tr>
 <% end %>
   </tbody>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: collectd-interface
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 +01:00
+date: 2012-02-27 00:00:00.000000000 +01:00
 default_executable: collectd-interface-daemon
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &9266720 !ruby/object:Gem::Requirement
+  requirement: &22714700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,18 +22,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *9266720
-- !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: &9266240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: *9266240
+  version_requirements: *22714700
 description: ''
 email: vic.penso@gmail.com
 executables:
@@ -54,6 +43,7 @@ files:
 - public/images/processes.png
 - public/images/cpus.svg
 - public/images/disk-traffic-root.png
+- public/images/users.png
 - public/images/processes.svg
 - public/images/disk-traffic-tmp.png
 - public/images/network-eth0.svg
@@ -62,6 +52,7 @@ files:
 - public/images/memory.svg
 - public/images/network-lo.svg
 - public/images/network-lo.png
+- public/images/irq.png
 - public/readme/user-interface.png
 - views/report.erb
 - views/data.erb
@@ -75,9 +66,11 @@ files:
 - views/graphs/memory.erb
 - views/graphs/network-lo.erb
 - views/graphs/processes.erb
+- views/graphs/users.erb.disabled
 - views/graphs/disk-traffic-var.erb.disabled
 - views/graphs/gridengine-jobs.erb.disabled
 - views/graphs/network-eth0.erb
+- views/graphs/irq.erb.disabled
 - views/graphs/load.erb
 - views/graphs/disk-traffic-tmp.erb.disabled
 - views/graphs/cpus.erb