pulse-meter 0.2.1 → 0.2.2

data/.travis.yml

@@ -2,3 +2,7 @@ language: ruby
 rvm:
   - 1.9.2
   - 1.9.3
+branches:
+  only:
+    - master
+    - develop

data/examples/basic.ru

@@ -39,11 +39,11 @@ layout = PulseMeter::Visualizer.draw do |l|
       c.sensor :goose_count
     end
 
-    p.table "Rhino & Lama & Goose count comparison" do |c|
+    p.pie "Rhino & Lama & Gooze count comparison" do |c|
       c.redraw_interval 5
       c.values_label 'Count'
       c.width 5
-      c.show_last_point true
+      c.show_last_point false
       c.timespan 1200
 
       c.sensor :rhino_count, color: '#AAAAAA'
@@ -51,11 +51,28 @@ layout = PulseMeter::Visualizer.draw do |l|
       c.sensor :goose_count
     end
 
-    p.pie "Rhino & Lama & Gooze count comparison" do |c|
+    p.gauge "CPU Usage" do |g|
+      g.redraw_interval 5
+      g.values_label '%'
+      g.width 5
+
+      g.red_from 90
+      g.red_to 100
+      g.yellow_from 75
+      g.yellow_to 90
+      g.minor_ticks 5
+      g.height 200
+
+      g.sensor :cpu
+      g.sensor :memory
+      g.sensor :temperature
+    end
+
+    p.table "Rhino & Lama & Goose count comparison" do |c|
       c.redraw_interval 5
       c.values_label 'Count'
-      c.width 5
-      c.show_last_point false
+      c.width 10
+      c.show_last_point true
       c.timespan 1200
 
       c.sensor :rhino_count, color: '#AAAAAA'
@@ -63,6 +80,7 @@ layout = PulseMeter::Visualizer.draw do |l|
       c.sensor :goose_count
     end
 
+
   end
 
   l.page "Ages" do |p|

data/examples/basic_sensor_data.rb

@@ -48,6 +48,15 @@ cfg = PulseMeter::Sensor::Configuration.new(
       interval: 20,
       ttl: 3600
     }
+  },
+
+  cpu: {sensor_type: 'indicator'},
+  memory: {sensor_type: 'indicator'},
+  temperature: {
+    sensor_type: 'hashed_indicator',
+    args: {
+      annotation: 'T'
+    }
   }
 )
 
@@ -61,6 +70,10 @@ while true
 
   10.times do
     goose_n = Random.rand(4)
-    cfg.goose_count("goose_#{goose_n}" => 1)
+    cfg.goose_count("g_#{goose_n}" => 1)
+    cfg.temperature("g_#{goose_n}" => Random.rand(50))
   end
-end
+
+  cfg.cpu(Random.rand(100))
+  cfg.memory(Random.rand(100))
+end

data/examples/full/server.ru

@@ -14,7 +14,7 @@ layout = PulseMeter::Visualizer.draw do |l|
 
   # Transfer some global parameters to Google Charts
   l.gchart_options({
-    backgroundColor: '#CCC'
+    background_color: '#CCC'
   })
 
   # Add some pages
@@ -87,7 +87,6 @@ layout = PulseMeter::Visualizer.draw do |l|
         w.sensor sensor
       end
 
-      w.timespan 24 * 60 * 60
       w.redraw_interval 10
       w.show_last_point true
       w.values_label "Request count"
@@ -102,4 +101,4 @@ layout = PulseMeter::Visualizer.draw do |l|
 
 end
 
-run layout.to_app
+run layout.to_app

data/examples/minimal/server.ru

@@ -12,9 +12,10 @@ layout = PulseMeter::Visualizer.draw do |l|
     p.area "Live Counter",
       sensor: :simple_sample_counter,
       timespan: 5 * 60,
-      redraw_interval: 1
+      redraw_interval: 1,
+      width: 10
   end
 
 end
 
-run layout.to_app
+run layout.to_app

data/lib/pulse-meter/sensor.rb

@@ -1,7 +1,8 @@
 require 'pulse-meter/sensor/base'
 require 'pulse-meter/sensor/counter'
-require 'pulse-meter/sensor/hashed_counter'
 require 'pulse-meter/sensor/indicator'
+require 'pulse-meter/sensor/hashed_counter'
+require 'pulse-meter/sensor/hashed_indicator'
 require 'pulse-meter/sensor/remote'
 require 'pulse-meter/sensor/uniq_counter'
 require 'pulse-meter/sensor/timeline'

data/lib/pulse-meter/sensor/configuration.rb

@@ -27,6 +27,8 @@ module PulseMeter
         name = name.to_s
         if @sensors.has_key?(name)
           @sensors[name].event(*args)
+        elsif (name =~ /^(.*)_at$/) && @sensors.has_key?($1) 
+          @sensors[$1].event_at(*args)
         else
           raise ArgumentError, "Unknown sensor: `#{name}'"
         end
@@ -44,4 +46,4 @@ module PulseMeter
 
     end
   end
-end
+end

data/lib/pulse-meter/sensor/hashed_indicator.rb

@@ -0,0 +1,22 @@
+module PulseMeter
+  module Sensor
+    # Static hashed indicator. In fact is is just a named hash with float value
+    class HashedIndicator < Indicator
+
+      # Sets indicator values
+      # @param value [Hash] new indicator values
+      def event(events)
+        events.each_pair {|name, value| redis.hset(value_key, name, value.to_f)}
+      end
+
+      # Get indicator values
+      # @return [Fixnum] indicator value or zero unless it was initialized
+      def value
+        redis.
+          hgetall(value_key).
+          inject(Hash.new(0)) {|h, (k, v)| h[k] = v.to_f; h}
+      end
+
+    end
+  end
+end

data/lib/pulse-meter/sensor/timeline.rb

@@ -49,6 +49,7 @@ module PulseMeter
       end
 
       # Processes event
+      # @param value event value
       def event(value = nil)
         multi do
           current_key = current_raw_data_key
@@ -57,7 +58,18 @@ module PulseMeter
         end
       end
 
-      
+      # Processes event from the past
+      # @param time [Time] event time
+      # @param value event value
+      def event_at(time, value = nil)
+        multi do
+          interval_id = get_interval_id(time)
+          key = raw_data_key(interval_id)
+          aggregate_event(key, value)
+          redis.expire(key, raw_data_ttl)
+        end
+      end
+
       # Reduces data in given interval. 
       # @note Interval id is
       #   just unixtime of its lower bound. Ruduction is a process

data/lib/pulse-meter/version.rb

@@ -1,3 +1,3 @@
 module PulseMeter
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/pulse-meter/visualize/app.rb

@@ -1,12 +1,16 @@
-require 'sinatra/base'
-require 'haml'
 require 'gon-sinatra'
+require 'haml'
+require 'sinatra/base'
+require 'sinatra/partial'
 
 module PulseMeter
   module Visualize
     class App < Sinatra::Base
       include PulseMeter::Mixins::Utils
       register Gon::Sinatra
+      register Sinatra::Partial
+
+      set :partial_template_engine, :haml
 
       def initialize(layout)
         @layout = layout

data/lib/pulse-meter/visualize/base.rb

@@ -0,0 +1,15 @@
+module PulseMeter
+  module Visualize
+    class Base
+      def initialize(opts)
+        @opts = opts
+      end
+
+      def method_missing(name, *args)
+        @opts[name.to_sym]
+      end
+    end
+  end
+end
+
+

data/lib/pulse-meter/visualize/dsl/base.rb

@@ -0,0 +1,131 @@
+module PulseMeter
+  module Visualize
+    module DSL
+      class DArray < Array; end 
+      class BadDataClass < PulseMeter::Visualize::DSL::Error; end
+      class Base
+        include PulseMeter::Mixins::Utils
+
+        def initialize
+          @opts = {}
+        end
+
+        def process_args(args)
+          args.each_pair do |k, v|
+            send(k, v)
+          end
+        end
+
+        class << self
+          
+          def deprecated_setter(name)
+            define_method(name) do |*args|
+              STDERR.puts "DEPRECATION: #{name} DSL helper does not take any effect anymore."
+            end
+          end
+          
+          def setter(name, &block)
+            define_method(name) do |val|
+              block.call(val) if block
+              @opts[name] = val
+            end
+          end
+
+          def bool_setter(name)
+            define_method(name) do |val|
+              @opts[name] = !!val
+            end
+          end
+
+          def string_setter(name, &block)
+            define_method(name) do |val|
+              val = val.to_s
+              block.call(val) if block
+              @opts[name] = val
+            end
+          end
+
+          def int_setter(name, &block)
+            define_method(name) do |val|
+              val = val.to_i
+              block.call(val) if block
+              @opts[name] = val
+            end
+          end
+
+          def hash_extender(name, &block)
+            define_method(name) do |val|
+              @opts[name] ||= {}
+              @opts[name].merge!(val)
+            end
+          end
+
+          def array_extender(name, &block)
+            define_method(name) do |val|
+              @opts[name] ||=[]
+              block.call(val) if block
+              @opts[name] << val
+            end
+          end
+          
+          def dsl_setter(name, klass)
+            define_method(name) do |*args, &block|
+              @opts[name] = create_dsl_obj(args, klass, block)
+            end
+          end
+
+          def dsl_array_extender(collection_name, name, klass)
+            define_method(name) do |*args, &block|
+              @opts[collection_name] ||= DArray.new
+              @opts[collection_name] << create_dsl_obj(args, klass, block)
+            end
+          end
+
+          def data_class
+            @data_class || PulseMeter::Visualize::Base
+          end
+
+          def data_class=(klass)
+            raise BadDataClass unless klass.is_a?(Class) && klass <= PulseMeter::Visualize::Base
+            @data_class = klass
+          end
+
+        end
+
+        def create_dsl_obj(args, klass, block)
+          params, options = extract_params(args)
+          dsl_obj = klass.new(*params)
+          dsl_obj.process_args(options)
+          block.call(dsl_obj) if block
+          dsl_obj
+        end
+
+        def extract_params(args)
+          opts = if args.last.is_a?(Hash)
+            args.pop
+          else
+            {}
+          end
+          [args, opts]
+        end
+
+        def to_data
+          klass = self.class.data_class
+          args = @opts.each_with_object({}) do |(k, v), acc|
+            acc[k] = case v
+              when PulseMeter::Visualize::DSL::Base
+                v.to_data
+              when DArray
+                v.map(&:to_data)
+              else
+                v
+            end
+          end
+          klass.new(args)
+        end
+
+      end
+    end
+  end
+end
+

data/lib/pulse-meter/visualize/dsl/errors.rb

@@ -17,12 +17,6 @@ module PulseMeter
         end
       end
 
-      class BadWidgetType < Error
-        def initialize(type)
-          super("Bad widget type: `#{type}'")
-        end
-      end
-
       class BadWidgetWidth < Error
         def initialize(width)
           super("Bad widget width: `#{width}'")

data/lib/pulse-meter/visualize/dsl/layout.rb

@@ -1,54 +1,25 @@
 module PulseMeter
   module Visualize
     module DSL
-      class Layout
+      class Layout < Base
         DEFAULT_TITLE = "Pulse Meter"
-        DEFAULT_GCHART_OPTIONS = {}
 
-        def initialize
-          @pages = []
-          @title = DEFAULT_TITLE
-          @use_utc = true
-          @gchart_options = DEFAULT_GCHART_OPTIONS.dup
-        end
-
-        def title(title)
-          @title = title
-        end
+        self.data_class = PulseMeter::Visualize::Layout
 
-        def use_utc(use = true)
-          @use_utc = use
-        end
-
-        def outlier_color(_)
-          STDERR.puts "DEPRECATION: outlier_color DSL helper does not take effect anymore"
-        end
-
-        def highchart_options(_)
-          STDERR.puts "DEPRECATION: highchart_options DSL helper does not take effect anymore, use gchart_options instead"
-        end
-
-        def gchart_options(options = {})
-          @gchart_options.merge!(options)
+        def initialize
+          super()
+          self.title(DEFAULT_TITLE)
+          self.use_utc(false)
         end
 
-        def page(title, &block)
-          page = PulseMeter::Visualize::DSL::Page.new(title)
-          yield(page)
-          @pages << page
-        end
+        string_setter :title
+        bool_setter :use_utc
+        hash_extender :gchart_options
 
-        def to_layout
-          pages = @pages.map(&:to_page)
-          title = @title || ''
-          PulseMeter::Visualize::Layout.new( {
-            pages: pages,
-            title: title,
-            use_utc: @use_utc,
-            gchart_options: @gchart_options
-          } )
-        end
+        deprecated_setter :outlier_color
+        deprecated_setter :highchart_options
 
+        dsl_array_extender :pages, :page, PulseMeter::Visualize::DSL::Page
       end
     end
   end