riemann-dash 0.1.1 → 0.2.0

data/lib/riemann/dash.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-require 'riemann/client'
 require 'sinatra/base'
 
 module Riemann
@@ -13,24 +12,11 @@ module Riemann
 
     def self.config
       @config ||= {
-        :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')
       }
     end
 
-    def self.client
-      @client ||= Riemann::Client.new(config[:client])
-    end
-
     def self.load(filename)
       unless load_config(filename || 'config.rb')
         # Configuration failed; load a default view.
@@ -38,7 +24,6 @@ module Riemann
       end
 
       config[:controllers].each { |d| load_controllers d }
-      config[:helpers].each { |d| load_helpers d }
       set :views, File.expand_path(config[:views])
 
       # Fallback pub dir
@@ -55,12 +40,13 @@ module Riemann
       end
     end
 
-    # Load controllers.
-    # Controllers can be regular old one-file-per-class, but if you prefer a little
-    # more modularity, this method will allow you to define all controller methods
-    # in their own files.  For example, get "/posts/*/edit" can live in
-    # controller/posts/_/edit.rb. The sorting system provided here requires
-    # files in the correct order to handle wildcards appropriately.
+    # Load controllers. 
+    # Controllers can be regular old one-file-per-class, but
+    # if you prefer a little more modularity, this method will allow you to
+    # define all controller methods in their own files.  For example, get
+    # "/posts/*/edit" can live in controller/posts/_/edit.rb. The sorting
+    # system provided here requires files in the correct order to handle
+    # wildcards appropriately.
     def self.load_controllers(dir)
       rbs = []
       Find.find(
@@ -104,27 +90,10 @@ module Riemann
       end 
     end 
 
-    # Load helpers
-    def self.load_helpers(dir)
-      Find.find(
-        File.expand_path(dir)
-      ) do |path|
-        require path if path =~ /\.rb$/
-      end
-    end
-
     # Add an additional public directory.
     def self.public_dir(dir)
       require 'riemann/dash/rack/static'
       use Riemann::Dash::Static, :root => dir
     end
-
-    def client
-      self.class.client
-    end
-
-    def query(*a)
-      self.class.client.query(*a).events || []
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riemann-dash
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-18 00:00:00.000000000 Z
+date: 2013-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: riemann-client
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11919920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,15 +21,10 @@ dependencies:
         version: 0.0.7
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.0.7
+  version_requirements: *11919920
 - !ruby/object:Gem::Dependency
   name: erubis
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11918520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.7.0
+  version_requirements: *11918520
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11917660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +43,10 @@ dependencies:
         version: 1.3.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.2
+  version_requirements: *11917660
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11916360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: 3.1.14
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.1.14
+  version_requirements: *11916360
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11914740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,28 +65,18 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.3.1
+  version_requirements: *11914740
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &11540560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 1.3.6
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.6
+  version_requirements: *11540560
 description: 
 email: aphyr@aphyr.com
 executables:
@@ -115,38 +85,37 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/riemann/dash.rb
-- lib/riemann/dash/version.rb
-- lib/riemann/dash/public/keys.js
-- lib/riemann/dash/public/jquery-ui-1.9.0.custom.min.js
-- lib/riemann/dash/public/toolbar.js
-- lib/riemann/dash/public/subs.js
-- lib/riemann/dash/public/underscore-min.js
+- lib/riemann/dash/rack/static.rb
+- lib/riemann/dash/public/format.js
+- lib/riemann/dash/public/view.js
 - lib/riemann/dash/public/jquery-1.7.2.min.js
+- lib/riemann/dash/public/mustache.js
 - lib/riemann/dash/public/x.png
-- lib/riemann/dash/public/jquery.quickfit.js
-- lib/riemann/dash/public/view.js
+- lib/riemann/dash/public/util.js
+- lib/riemann/dash/public/jquery-ui-1.9.0.custom.min.js
+- lib/riemann/dash/public/underscore-min.js
+- lib/riemann/dash/public/persistence.js
+- lib/riemann/dash/public/subs.js
+- lib/riemann/dash/public/jquery.simplemodal.1.4.3.min.js
 - lib/riemann/dash/public/views/help.js
-- lib/riemann/dash/public/views/title.js
 - lib/riemann/dash/public/views/grid.js
+- lib/riemann/dash/public/views/title.js
 - lib/riemann/dash/public/views/gauge.js
-- lib/riemann/dash/public/jquery.simplemodal.1.4.3.min.js
+- lib/riemann/dash/public/jquery.quickfit.js
+- lib/riemann/dash/public/toastr.js
+- lib/riemann/dash/public/toolbar.js
+- lib/riemann/dash/public/toastr.css
 - lib/riemann/dash/public/dash.js
-- lib/riemann/dash/public/format.js
 - lib/riemann/dash/public/profile.js
-- lib/riemann/dash/public/mustache.js
-- lib/riemann/dash/public/persistence.js
-- lib/riemann/dash/public/util.js
 - lib/riemann/dash/public/clock.js
 - lib/riemann/dash/public/jquery.json-2.2.min.js
-- lib/riemann/dash/controller/css.rb
+- lib/riemann/dash/public/keys.js
+- lib/riemann/dash/version.rb
 - lib/riemann/dash/controller/index.rb
-- lib/riemann/dash/controller/websockets.rb
+- lib/riemann/dash/controller/css.rb
+- lib/riemann/dash/views/css.scss
 - lib/riemann/dash/views/layout.erubis
 - lib/riemann/dash/views/index.erubis
-- lib/riemann/dash/views/css.scss
-- lib/riemann/dash/views/websockets.erubis
-- lib/riemann/dash/helper/renderer.rb
-- lib/riemann/dash/rack/static.rb
 - bin/riemann-dash
 - LICENSE
 - README.markdown
@@ -170,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: riemann-dash
-rubygems_version: 1.8.22
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: HTTP dashboard for the distributed event system Riemann.

data/lib/riemann/dash/controller/websockets.rb

@@ -1,50 +0,0 @@
-class Riemann::Dash
-  require 'multi_json'
-  require 'fileutils'
-  require 'set'
-
-  WS_CONFIG_FILE = "ws/config.json"
-
-  get '/ws' do
-    erb :websockets, :layout => false
-  end
-
-  get '/ws/config', :provides => 'json' do
-    if File.exists? WS_CONFIG_FILE
-      send_file WS_CONFIG_FILE, :type => :json
-    else
-      MultiJson.encode({})
-    end
-  end
-
-  post '/ws/config' do
-    # Read update
-    request.body.rewind
-    update = MultiJson.decode(request.body.read)
-
-    # Read old config
-    if File.exists? WS_CONFIG_FILE
-      old = MultiJson.decode File.read WS_CONFIG_FILE
-    else
-      old = {}
-    end
-
-    new = {}
-
-    # Server
-    new['server'] = update['server'] or old['server']
-
-    p update['workspaces']
-    new['workspaces'] = update['workspaces'] or old['workspaces']
-
-    # Save new config
-    FileUtils.mkdir_p 'ws'
-    File.open(WS_CONFIG_FILE, 'w') do |f|
-      f.write(MultiJson.encode(new))
-    end
-
-    # Return current config
-    content_type "application/json"
-    MultiJson.encode(new)
-  end
-end

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

@@ -1,266 +0,0 @@
-module Riemann
-  class Dash
-    helpers do
-      include ::Rack::Utils
-
-      alias_method :h, :escape_html
-
-      # Returns a scalar factor from 0.2 to 1, where 0.2 is "on the order of
-      # age_scale ago", and 1 is "very recent"
-      def age_fraction(time)
-        return 1 if time.nil?
-
-        x = 1 - ((Time.now.to_f - time) / Dash.config[:age_scale])
-        if x < 0.2
-          0.2
-        elsif x > 1
-          1
-        else
-          x
-        end
-      end
-
-      # Finds the longest common prefix of a list of strings.
-      # i.e. 'abc, 'ab', 'abdf' => 'ab'
-      def longest_common_prefix(strings, prefix = '')
-        return strings.first if strings.size <= 1
-
-        first = strings[0][0,1] or return prefix
-        tails = strings[1..-1].inject([strings[0][1..-1]]) do |tails, string|
-          if string[0,1] != first
-            return prefix
-          else
-            tails << string[1..-1]
-          end
-        end
-
-        longest_common_prefix(tails, prefix + first)
-      end
-
-      # An overview of states
-      def state_list(states)
-        ul(states.map { |s| state_short s })
-      end
-
-      def state_grid(states = Dash.client.query)
-        h2('States by Host') +
-        table(
-          *Event.partition(states, :host).map do |host, states|
-            tr(
-              th(host, :class => 'host'),
-              *Event.sort(states, :service).map do |state|
-                state_short state
-              end
-            )
-          end
-        )
-      end
-
-      # 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
-
-        return '' unless s
-        x = s.metric
-
-        # Text
-        text = case x
-        when Float
-          '%.2f' % x
-        when Integer
-          x.to_s
-        else
-          s.state || '?'
-        end
-
-        # Size
-        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.state}\n#{s.description}\n\n(at #{time})"
-      end
-
-      # Renders a set of states in a chart. Each row is a given host, each
-      # service is a column. Each state is shown as a bar with an inferred
-      # maximum for the entire service, so you can readily compare multiple
-      # hosts.
-      #
-      # Takes a a set of states and options:
-      #   title: the title of the chart. Inferred to be the longest common
-      #          prefix of all services.
-      #   maxima: maps each service to the maximum value used to display its
-      #           bar.
-      #   service_names: maps each service to a friendly name. Default service
-      #                  names have common prefixes removed.
-      #   hosts: an array of hosts for rows. Default is every host present in
-      #          states, sorted.
-      #   transpose: Hosts go across, services go down. Enables :global_maxima.
-      #   global_maximum: Compute default maxima for services globally,
-      #                  instead of a different maximum for each service.
-      def state_chart(states, opts = {})
-        o = {
-          :maxima => {},
-          :service_names => {}
-        }.merge opts
-        if o[:transpose] and not o.include?(:global_maximum)
-          o[:global_maximum] = true
-        end
-
-        # Get all services
-        services = states.map { |s| s.service }.compact.uniq.sort
-
-        # Figure out what name to use for each service.
-        prefix = longest_common_prefix services
-        service_names = services.inject({}) do |names, service|
-          names[service] = service[prefix.length..-1]
-          names
-        end.merge o[:service_names]
-
-        # Compute maximum for each service
-        maxima = if o[:global_maximum]
-          max = states.map(&:metric).compact.max
-          services.inject({}) do |m, s|
-            m[s] = max
-            m
-          end.merge o[:maxima]
-        else
-          states.inject(Hash.new(0)) do |m, s|
-            if s.metric && !(s.metric.nan?)
-              m[s.service] = [s.metric, m[s.service]].max
-            end
-            m
-          end.merge o[:maxima]
-        end
-
-        # Compute union of all hosts for these states, if no
-        # list of hosts explicitly given.
-        hosts = o[:hosts] || states.map do |state|
-          state.host
-        end
-        hosts = hosts.uniq.sort { |a, b|
-          if !a
-            -1
-          elsif !b
-            1
-          else
-            a <=> b
-          end
-        }
-
-        # Construct index
-        by = states.inject({}) do |index, s|
-          index[[s.host, s.service]] = s
-          index
-        end
-
-        # Title
-        title = o[:title] || prefix.capitalize rescue 'Unknown'
-
-        if o[:transpose]
-          h2(title) +
-          table(
-            tr(
-              th,
-              *hosts.map do |host|
-                th host
-              end
-            ),
-            *services.map do |service|
-              tr(
-                th(service_names[service]),
-                *hosts.map do |host|
-                  s = by[[host, service]]
-                  td(
-                    s ? state_bar(s, :max => maxima[service]) : nil
-                  )
-                end
-              )
-            end << {:class => 'chart'} # ruby 1.8.7 this is your fault
-          )
-        else
-          h2(title) +
-          table(
-            tr(
-              th,
-              *services.map do |service|
-                th service_names[service]
-              end
-            ),
-            *hosts.map do |host|
-              tr(
-                th(host),
-                *services.map do |service|
-                  s = by[[host, service]]
-                  td(
-                    s ? state_bar(s, :max => maxima[service]) : nil
-                  )
-                end
-              )
-            end <<
-            {:class => 'chart'}
-          )
-        end
-      end
-
-      # Renders a state as a short tag.
-      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
-          "<#{opts[:tag]} class=\"service\"></#{opts[:tag]}>"
-        end
-      end
-      
-      # Renders a time to an HTML tag.
-      def time(unix)
-        t = Time.at(unix)
-        "<time datetime=\"#{t.iso8601}\">#{t.strftime(Dash.config[:strftime])}</time>"
-      end
-
-      # Renders an HTML tag
-      def tag(tag, *a)
-        if Hash === a.last
-          opts = a.pop
-        else
-          opts = {}
-        end
-
-        attrs = opts.map do |k,v|
-          "#{k}=\"#{h v}\""
-        end.join ' '
-
-        content = if block_given?
-          a << yield
-        else
-          a
-        end.flatten.join("\n")
-
-        s = "<#{tag} #{attrs}>#{content}</#{tag}>"
-      end
-      
-      # Specific tag aliases
-      %w(div span h1 h2 h3 h4 h5 h6 ul ol li table th tr td u i b).each do |tag|
-        class_eval "def #{tag}(*a, &block)
-          tag #{tag.inspect}, *a, &block
-        end"
-      end
-    end 
-  end
-end