visage-app 0.1.7 → 0.1.8

data/Rakefile

@@ -31,3 +31,17 @@ begin
 rescue LoadError
   puts "Jeweler not available. Install it with: gem install jeweler"
 end
+
+desc "push gem"
+task :push do
+  filenames = Dir.glob("pkg/*.gem")
+  filenames_with_times = filenames.map do |filename|
+    [filename, File.mtime(filename)]
+  end
+
+  newest = filenames_with_times.sort_by { |tuple| tuple.last }.last
+  newest_filename = newest.first
+
+  command = "gem push #{newest_filename}"
+  system(command)
+end

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/visage/collectd/json.rb

@@ -72,6 +72,9 @@ class CollectdJSON
           (!datapoint || datapoint.nan?) ? 0.0 : datapoint
         end
 
+        # Sometimes the last value from the RRD is ridiculously large.
+        metric[-1] = 0
+
         color = color_for(:host => data[:host],
                           :plugin => data[:plugin],
                           :instance => data[:instance],
@@ -103,6 +106,7 @@ class CollectdJSON
 
     return fallback_color unless plugin
     return color_for(opts.merge(:plugin => plugin[/(.+)-.+$/, 1])) unless @colors[plugin]
+    return fallback_color unless instance
     return color_for(opts.merge(:instance => instance[/(.+)-.+$/, 1])) unless @colors[plugin][instance]
     return @colors[plugin][instance][metric] if @colors[plugin][instance]
     return fallback_color

data/lib/visage/config.ru

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 
+require 'pathname'
 @root = Pathname.new(File.dirname(__FILE__)).parent.parent.expand_path
 $: << @root.to_s
 

data/lib/visage/config/plugin-colors.yaml

@@ -1,45 +1,49 @@
---- 
-plugin_colors: 
-  memory: 
-    memory-used: 
+---
+plugin_colors:
+  memory:
+    memory-used:
       value: "#cc0000"
-    memory-buffered: 
+    memory-buffered:
       value: "#edd400"
-    memory-cached: 
+    memory-cached:
       value: "#3465a4"
-    memory-free: 
+    memory-free:
       value: "#73d216"
-  cpu: 
-    cpu-idle: 
+  cpu:
+    cpu-idle:
       value: "#eeeeec"
-    cpu-wait: 
+    cpu-wait:
       value: "#edd400"
-    cpu-user: 
+    cpu-user:
       value: "#3465a4"
-    cpu-system: 
+    cpu-system:
       value: "#cc0000"
     cpu-nice:
       value: "#73d216"
-    cpu-softirq: 
+    cpu-softirq:
       value: "#ad7fa8"
     cpu-interrupt:
       value: "#5c3566"
     cpu-steal:
       value: "#2e3436"
-  swap: 
-    swap-used: 
+  swap:
+    swap-used:
       value: "#cc0000"
-    swap-free: 
+    swap-free:
       value: "#73d216"
-    swap-cached: 
+    swap-cached:
       value: "#3465a4"
-  load: 
-    load: 
+    swap_io-in:
+      value: "#edd400"
+    swap_io-out:
+      value: "#5c3566"
+  load:
+    load:
       longterm: "#ef2929"
       shortterm: "#73d216"
       midterm: "#3465a4"
   df:
-    df: 
+    df:
       used: "#cc0000"
       free: "#73d216"
   disk:

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Lindsay Holmwood