riemann-dash 0.0.3 → 0.0.4

data/lib/riemann/dash.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'riemann/client'
 require 'sinatra/base'
 
@@ -12,17 +13,17 @@ module Riemann
     
     def self.config
       @config ||= {
-        client: {},
-        age_scale: 60 * 30,
-        state_order: {
+        :client =>  {},
+        :age_scale => 60 * 30,
+        :state_order => {
           'critical' => 3,
           'warning' => 2,
           'ok' => 1
         },
-        strftime: '%H:%M:%S',
-        controllers: [File.join(File.dirname(__FILE__), 'dash', 'controller')],
-        helpers: [File.join(File.dirname(__FILE__), 'dash', 'helper')],
-        views: File.join(File.dirname(__FILE__), 'dash', 'views')
+        :strftime => '%H:%M:%S',
+        :controllers => [File.join(File.dirname(__FILE__), 'dash', 'controller')],
+        :helpers => [File.join(File.dirname(__FILE__), 'dash', 'helper')],
+        :views => File.join(File.dirname(__FILE__), 'dash', 'views')
       }
     end
 

data/lib/riemann/dash/helper/renderer.rb

@@ -47,7 +47,7 @@ module Riemann
         table(
           *Event.partition(states, :host).map do |host, states|
             tr(
-              th(host, class: 'host'),
+              th(host, :class => 'host'),
               *Event.sort(states, :service).map do |state|
                 state_short state
               end
@@ -59,7 +59,7 @@ module Riemann
       # Renders a state as the given HTML tag with a % width corresponding to
       # metric / max.
       def state_bar(s, opts = {})
-        opts = {tag: 'div', max: 1}.merge opts
+        opts = {:tag => 'div', :max => 1}.merge opts
 
         return '' unless s
         x = s.metric
@@ -71,21 +71,30 @@ module Riemann
         when Integer
           x.to_s
         else
-          '?'
+          s.state || '?'
         end
 
         # Size
-        size = begin
-          (x || 0) * 100 / opts[:max]
-        rescue ZeroDivisionError
-          0
-        end
+        size = case x
+               when 0
+                 0
+               when nil
+                 100
+               else
+                 begin
+                   x * 100 / opts[:max]
+                 rescue ZeroDivisionError
+                   0
+                 end
+               end
         size = "%.2f" % size
 
+        time = Time.at(s.time).strftime(Dash.config[:strftime])
+
         tag opts[:tag], h(text), 
           :class => "state #{s.state}", 
-          style: "opacity: #{age_fraction s.time}; width: #{size}%", 
-          title: s.description
+          :style => "opacity: #{age_fraction s.time}; width: #{size}%", 
+          :title => "#{s.state}\n#{s.description}\n\n(at #{time})"
       end
 
       # Renders a set of states in a chart. Each row is a given host, each
@@ -179,12 +188,11 @@ module Riemann
                 *hosts.map do |host|
                   s = by[[host, service]]
                   td(
-                    s ? state_bar(s, max: maxima[service]) : nil
+                    s ? state_bar(s, :max => maxima[service]) : nil
                   )
                 end
               )
-            end,
-            :class => 'chart'
+            end << {:class => 'chart'} # ruby 1.8.7 this is your fault
           )
         else
           h2(title) +
@@ -201,18 +209,18 @@ module Riemann
                 *services.map do |service|
                   s = by[[host, service]]
                   td(
-                    s ? state_bar(s, max: maxima[service]) : nil
+                    s ? state_bar(s, :max => maxima[service]) : nil
                   )
                 end
               )
-            end,
-            :class => 'chart'
+            end <<
+            {:class => 'chart'}
           )
         end
       end
 
       # Renders a state as a short tag.
-      def state_short(s, opts={tag: 'li'})
+      def state_short(s, opts={:tag => 'li'})
         if s
           "<#{opts[:tag]} class=\"state #{s.state}\" style=\"opacity: #{age_fraction s.time}\" title=\"#{h s.description}\">#{h s.host} #{h s.service}</#{opts[:tag]}>"
         else

data/lib/riemann/dash/version.rb

@@ -1,4 +1,4 @@
 module Riemann; end
 class Riemann::Dash
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/riemann/dash/views/index.erubis

@@ -2,7 +2,7 @@
 <div class="box"><%= state_list query('state != "ok"') %></div>
 
 <div class="box">
-<%= state_chart query('service = "cpu" or service = "memory" or service =~ "disk%" or service = "load"'), title: "Health" %>
+<%= state_chart query('service = "cpu" or service = "memory" or service =~ "disk%" or service = "load"'), :title => "Health" %>
 </div>
 
-<div class="box"><%= state_chart query('true'), title: "Everything" %></div>
+<div class="box"><%= state_chart query('true'), :title => "Everything" %></div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-dash
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
-  requirement: &9900960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: 0.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *9900960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: &9900240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *9900240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &9899640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *9899640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &9898820 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: 3.1.14
   type: :runtime
   prerelease: false
-  version_requirements: *9898820
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.14
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &9898320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *9898320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.1
 description: 
 email: aphyr@aphyr.com
 executables:
@@ -75,13 +100,13 @@ extra_rdoc_files: []
 files:
 - lib/riemann/dash.rb
 - lib/riemann/dash/version.rb
-- lib/riemann/dash/rack/static.rb
-- lib/riemann/dash/views/index.erubis
+- lib/riemann/dash/controller/css.rb
+- lib/riemann/dash/controller/index.rb
 - lib/riemann/dash/views/layout.erubis
+- lib/riemann/dash/views/index.erubis
 - lib/riemann/dash/views/css.scss
-- lib/riemann/dash/controller/index.rb
-- lib/riemann/dash/controller/css.rb
 - lib/riemann/dash/helper/renderer.rb
+- lib/riemann/dash/rack/static.rb
 - bin/riemann-dash
 - LICENSE
 - README.markdown
@@ -105,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riemann-dash
-rubygems_version: 1.8.10
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: HTTP dashboard for the distributed event system Riemann.