pulse-meter 0.2.2 → 0.2.3

data/README.md

@@ -344,6 +344,12 @@ at project root and visit
           ttl: 60 * 60 * 24,
           p: 0.9
         }
+      },
+      cpu: {
+        sensor_type: 'indicator',
+        args: {
+          annotation: 'CPU%'
+        }
       }
     )
 
@@ -377,6 +383,8 @@ at project root and visit
       agent_counter = sensors.sensor(agent_names.shuffle.first)
       agent_counter.event(1)
 
+      sensors.cpu(Random.rand(100))
+
       sleep(Random.rand / 10)
     end
 
@@ -396,7 +404,7 @@ A more complicated visualization
 
       # Transfer some global parameters to Google Charts
       l.gchart_options({
-        backgroundColor: '#CCC'
+        background_color: '#CCC'
       })
 
       # Add some pages
@@ -428,7 +436,7 @@ A more complicated visualization
 
           # Transfer page-wide (and page-specific) options to Google Charts
           p.gchart_options({
-            height: 400
+            height: 500
           })
         end
 
@@ -469,7 +477,6 @@ A more complicated visualization
             w.sensor sensor
           end
 
-          w.timespan 24 * 60 * 60
           w.redraw_interval 10
           w.show_last_point true
           w.values_label "Request count"
@@ -477,11 +484,30 @@ A more complicated visualization
 
         end
 
-        p.ghchart_options({
+        p.gchart_options({
           height: 500
         })
       end
 
+      l.page "Gauge" do |p|
+
+        p.gauge "CPU Load" 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
+        end
+
+      end
+
     end
 
     run layout.to_app

data/examples/basic.ru

@@ -19,6 +19,15 @@ layout = PulseMeter::Visualizer.draw do |l|
       c.timespan 1200
     end
 
+    p.line "Lama count 1 min" do |c|
+      c.sensor :lama_count_1min, color: '#FA295C'
+      c.redraw_interval 5
+      c.values_label 'Count'
+      c.width 5
+      c.show_last_point true
+      c.timespan 1200
+    end
+
     p.area "Rhino count", sensor: :rhino_count do |c|
       c.redraw_interval 5
       c.values_label 'Count'

data/examples/basic_sensor_data.rb

@@ -14,6 +14,15 @@ cfg = PulseMeter::Sensor::Configuration.new(
     }
   },
 
+  lama_count_1min: {
+    sensor_type:'timelined/counter',
+    args: {
+      annotation: 'Lama Count (1 min)',
+      interval: 60,
+      ttl: 3600
+    }
+  },
+
   lama_average_age: {
     sensor_type:'timelined/average',
     args: {

data/examples/full/client.rb

@@ -64,6 +64,12 @@ sensors = PulseMeter::Sensor::Configuration.new(
       ttl: 60 * 60 * 24,
       p: 0.9
     }
+  },
+  cpu: {
+    sensor_type: 'indicator',
+    args: {
+      annotation: 'CPU%'
+    }
   }
 )
 
@@ -97,5 +103,7 @@ while true
   agent_counter = sensors.sensor(agent_names.shuffle.first)
   agent_counter.event(1)
 
+  sensors.cpu(Random.rand(100))
+
   sleep(Random.rand / 10)
 end

data/examples/full/server.ru

@@ -99,6 +99,25 @@ layout = PulseMeter::Visualizer.draw do |l|
     })
   end
 
+  l.page "Gauge" do |p|
+
+    p.gauge "CPU Load" 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
+    end
+
+  end
+
 end
 
 run layout.to_app

data/lib/pulse-meter/version.rb

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

data/lib/pulse-meter/visualize/public/js/application.coffee

@@ -153,10 +153,11 @@ document.startApp = ->
 
 	class SeriesPresenter extends TimelinePresenter
 		options: ->
+			secondPart = if @get('interval') % 60 == 0 then '' else ':ss'
 			format = if @model.timespan() > 24 * 60 * 60
-				'yyyy.MM.dd HH:mm:ss'
+				"yyyy.MM.dd HH:mm#{secondPart}"
 			else
-				'HH:mm:ss'
+				"HH:mm#{secondPart}"
 
 			$.extend true, super(), {
 				lineWidth: 1

data/lib/pulse-meter/visualize/public/js/application.js

@@ -214,8 +214,9 @@
       }
 
       SeriesPresenter.prototype.options = function() {
-        var format;
-        format = this.model.timespan() > 24 * 60 * 60 ? 'yyyy.MM.dd HH:mm:ss' : 'HH:mm:ss';
+        var format, secondPart;
+        secondPart = this.get('interval') % 60 === 0 ? '' : ':ss';
+        format = this.model.timespan() > 24 * 60 * 60 ? "yyyy.MM.dd HH:mm" + secondPart : "HH:mm" + secondPart;
         return $.extend(true, SeriesPresenter.__super__.options.call(this), {
           lineWidth: 1,
           chartArea: {

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

@@ -31,7 +31,7 @@ module PulseMeter
       end
 
       def annotation
-        real_sensor.annotation || real_sensor.name
+        real_sensor.annotation || ''
       end
 
       def type

data/lib/pulse-meter/visualize/widgets/timeline.rb

@@ -19,7 +19,8 @@ module PulseMeter
           super().merge({
             values_title: values_label,
             series: series_data(real_timespan),
-            timespan: timespan
+            timespan: timespan,
+            interval: interval
           })
         end
 
@@ -72,6 +73,14 @@ module PulseMeter
           end
         end
 
+        def interval
+          if sensors.empty?
+            nil
+          else
+            sensors.first.interval
+          end
+        end
+
       end
 
       class Area < Timeline; end

data/spec/pulse_meter/visualize/widgets/area_spec.rb

@@ -36,6 +36,7 @@ describe PulseMeter::Visualize::Widgets::Area do
       wdata[:width].should == width
       wdata[:gchart_options].should == {a: 1}
       wdata[:timespan].should == timespan
+      wdata[:interval].should == interval
     end
 
     describe "series attribute" do

data/spec/pulse_meter/visualize/widgets/line_spec.rb

@@ -36,6 +36,7 @@ describe PulseMeter::Visualize::Widgets::Line do
       wdata[:width].should == width
       wdata[:gchart_options].should == {a: 1}
       wdata[:timespan].should == timespan
+      wdata[:interval].should == interval
     end
 
     describe "series attribute" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gon-sinatra
@@ -482,7 +482,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3972958232601263142
+      hash: -1244879308775683986
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24