pulse-meter-rails 0.1.1 → 0.1.2

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/.idea

data/README.md

@@ -86,6 +86,10 @@ Default layout can be easily exteneded in initializer by standart pulse-meter [D
       end
     end
 
+## Data isolation
+
+To avoid collisions between multiple rails applications with monitoring enabled use separate Redis DB for each of them
+
 ## Contributing
 
 1. Fork it

data/lib/pulse-meter-rails.rb

@@ -36,9 +36,9 @@ module PulseToolbox
       PulseMeter.redis = redis
       @@pid = Process.pid
       @@redis_config = {
-        :host => redis.client.host,
-        :port => redis.client.port,
-        :db => redis.client.db
+        host: redis.client.host,
+        port: redis.client.port,
+        db: redis.client.db
       }
     end
 
@@ -49,9 +49,9 @@ module PulseToolbox
 
     def reconnect
       PulseMeter.redis = Redis.new(
-        :host => @@redis_config[:host],
-        :port => @@redis_config[:port],
-        :db => @@redis_config[:db]
+        host: @@redis_config[:host],
+        port: @@redis_config[:port],
+        db: @@redis_config[:db]
       )
     end
 

data/lib/pulse_toolbox/sensor/initializer.rb

@@ -5,13 +5,11 @@ module PulseToolbox
     # Registeres an initializer which creates sensors and subscribes to
     # process_action.action_controller notification
     class Initializer < ::Rails::Railtie
-      initializer "register_request_sensors", :after => :load_config_initializers do
+      initializer "register_request_sensors", after: :load_config_initializers do
         if PulseToolbox.redis
           ActiveSupport::Notifications.subscribe "process_action.action_controller" do |name, start, finish, id, payload|
             total_time = (finish - start) * 1000
-            view_time = payload[:view_runtime]
-            db_time = payload[:db_runtime]
-            PulseToolbox::Sensor::Manager.log_request(total_time, view_time, db_time)
+            PulseToolbox::Sensor::Manager.log_request(total_time, payload)
           end
         else
           Rails.logger.error("PulseToolbox.redis is not defined. Sensors cannot be created")

data/lib/pulse_toolbox/sensor/manager.rb

@@ -28,64 +28,129 @@ module PulseToolbox
       self.monitoring_layout = PulseMeter::Visualize::DSL::Layout.new
 
       self.default_options = {
-        :ttl => 1.day,
-        :interval => 1.minute,
-        :raw_data_ttl => 1.hour,
-        :reduce_delay => 2.minutes
+        ttl: 7.days,
+        interval: 1.minute,
+        raw_data_ttl: 1.hour,
+        reduce_delay: 2.minutes
       }.freeze
 
       self.sensors_config = {
-        :max => {
-          :title => "Max times",
-          :sensors => {
-            :db_time => {
-              :sensor_type => 'timelined/max',
-              :color => '#0000FF',
-              :args => {
-                :annotation => "DB"
+        max: {
+          title: "Max times",
+          values: "Time, ms",
+          sensors: {
+            db_time: {
+              sensor_type: 'timelined/max',
+              color: '#0000FF',
+              args: {
+                annotation: "DB"
               }
             },
-            :view_time => {
-              :sensor_type => 'timelined/max',
-              :color => '#00FF00',
-              :args => {
-                :annotation => "View"
+            view_time: {
+              sensor_type: 'timelined/max',
+              color: '#00FF00',
+              args: {
+                annotation: "View"
               }
             },
-            :total_time => {
-              :sensor_type => 'timelined/max',
-              :color => '#FF0000',
-              :args => {
-                :annotation => "Total"
+            total_time: {
+              sensor_type: 'timelined/max',
+              color: '#FF0000',
+              args: {
+                annotation: "Total"
               }
             }
           }
         },
-        :p95 => {
-          :title => "95% percentile times",
-          :sensors => {
-            :db_time => {
-              :sensor_type => 'timelined/percentile',
-              :color => '#0000FF',
-              :args => {
-                :annotation => "DB",
-                :p => 0.95
+        p95: {
+          title: "95% percentile times",
+          values: "Time, ms",
+          sensors: {
+            db_time: {
+              sensor_type: 'timelined/percentile',
+              color: '#0000FF',
+              args: {
+                annotation: "DB",
+                p: 0.95
               }
             },
-            :view_time => {
-              :sensor_type => 'timelined/percentile',
-              :color => '#00FF00',
-              :args => {
-                :annotation => "View",
-                :p => 0.95
+            view_time: {
+              sensor_type: 'timelined/percentile',
+              color: '#00FF00',
+              args: {
+                annotation: "View",
+                p: 0.95
               }
             },
-            :total_time => {
-              :sensor_type => 'timelined/percentile',
-              :color => '#FF0000',
-              :args => {
-                :annotation => "Total",
-                :p => 0.95
+            total_time: {
+              sensor_type: 'timelined/percentile',
+              color: '#FF0000',
+              args: {
+                annotation: "Total",
+                p: 0.95
+              }
+            }
+          }
+        },
+        p99: {
+          title: "99% percentile times",
+          values: "Time, ms",
+          sensors: {
+            db_time: {
+              sensor_type: 'timelined/percentile',
+              color: '#0000FF',
+              args: {
+                annotation: "DB",
+                p: 0.99
+              }
+            },
+            view_time: {
+              sensor_type: 'timelined/percentile',
+              color: '#00FF00',
+              args: {
+                annotation: "View",
+                p: 0.99
+              }
+            },
+            total_time: {
+              sensor_type: 'timelined/percentile',
+              color: '#FF0000',
+              args: {
+                annotation: "Total",
+                p: 0.99
+              }
+            }
+          }
+        },
+        status: {
+          title: 'Request count',
+          values: "Count",
+          sensors: {
+            total: {
+              sensor_type: 'timelined/counter',
+              color: '#FF0000',
+              args: {
+                annotation: "Total",
+              }
+            },
+            count: {
+              sensor_type: 'timelined/hashed_counter',
+              color: '#008800',
+              args: {
+                annotation: "Status"
+              }
+            }
+          }
+        },
+        action: {
+          title: 'Request count by action',
+          values: "Count",
+          sensors: {
+            count: {
+              sensor_type: 'timelined/hashed_counter',
+              color: '#008800',
+              args: {
+                annotation: "Action"
               }
             }
           }
@@ -107,22 +172,38 @@ module PulseToolbox
         # @param total_time [Float] total request time
         # @param view_time [Float] view time of request
         # @param db_time [Float] db time of request
-        def log_request(total_time, view_time, db_time)
-          [
-            [:max_db_time, db_time],
-            [:p95_db_time, db_time],
-            [:max_view_time, view_time],
-            [:p95_view_time, view_time],
-            [:max_total_time, total_time],
-            [:p95_total_time, total_time]
-          ].each {|name, value = e| event(name, value)}
+        def log_request(total_time, payload)
+          view_time = payload[:view_runtime]
+          db_time = payload[:db_runtime]
+
+          lazy_configurator
+          PulseToolbox.redis.multi do
+            {
+              max_db_time: db_time,
+              max_view_time: view_time,
+              max_total_time: total_time,
+
+              p95_db_time: db_time,
+              p95_view_time: view_time,
+              p95_total_time: total_time,
+
+              p99_db_time: db_time,
+              p99_view_time: view_time,
+              p99_total_time: total_time,
+
+              status_count: {payload[:status].to_s => 1},
+              status_total: 1,
+
+              action_count: {"#{payload[:controller]}##{payload[:action]}" => 1}
+            }.each_pair {|name, value| event(name, value)}
+          end
         end
         
         # Sends value to sensor by name
         # @param sensor [Symbol] sensor name
         # @param value [Float] event value
         def event(sensor, value)
-          lazy_configurator.sensor(sensor).event(value.to_i)
+          lazy_configurator.sensor(sensor).event(value)
         end
 
         # Adds group to config

data/lib/pulse_toolbox/sensor/mixins/iterators.rb

@@ -14,9 +14,11 @@ module PulseToolbox
         # Executes block for each group
         # @yieldparam group [Symbol] group name
         # @yieldparam title [String] group title
+        # @yieldparam value_title [String] group sensor value meaning
         def each_group_with_title
-          sensors_config.each_key do |group|
-            yield(group, sensors_config[group][:title] || group)
+          sensors_config.each_key do |group_name|
+            group = sensors_config[group_name]
+            yield(group_name, group[:title] || group_name,  group[:values] || '')
           end
         end
 

data/lib/pulse_toolbox/server/monitoring.rb

@@ -20,8 +20,14 @@ module PulseToolbox::Server
         })
 
         l.page "Requests" do |p|
+
+          p.highchart_options({
+            chart: {
+              height: 300
+            }
+          })
           
-          PulseToolbox::Sensor::Manager.each_group_with_title do |group, title|
+          PulseToolbox::Sensor::Manager.each_group_with_title do |group, title, values_label|
             p.spline title do |w|
               PulseToolbox::Sensor::Manager.each_sensor_in_group(group) do |s|
                 w.sensor s.name, :color => s.color
@@ -31,8 +37,8 @@ module PulseToolbox::Server
               w.redraw_interval 10
 
               w.show_last_point true
-              w.values_label "Time"
-              w.width 10
+              w.values_label values_label
+              w.width 5
             end
           end
 

data/lib/pulse_toolbox/version.rb

@@ -1,3 +1,3 @@
 module PulseToolbox
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/dummy/config/initializers/pulse.rb

@@ -1,16 +1,16 @@
 PulseToolbox.redis = Redis.new
 
 PulseMeter::Sensor::Timelined::Counter.new(:custom_sensor,
-  :ttl => 1.hour,
-  :interval => 1.minute,
-  :raw_data_ttl => 10.minutes,
-  :reduce_delay => 2.minutes
+  ttl: 1.hour,
+  interval: 1.minute,
+  raw_data_ttl: 10.minutes,
+  reduce_delay: 2.minutes
 )
 
 PulseToolbox::Sensor::Manager.layout do |l|
   l.page "Custom" do |p|
     p.spline "Custom sensor" do |w|
-      w.sensor :custom_sensor, :color => "#0000FF"
+      w.sensor :custom_sensor, color: "#0000FF"
 
       w.timespan 60 * 60 * 3
       w.redraw_interval 10

data/spec/pulse_meter_rails_spec.rb

@@ -47,7 +47,7 @@ describe PulseToolbox do
 
   describe ".reconnect" do
     before do
-      described_class.redis = Redis.new :db => 2
+      described_class.redis = Redis.new(db: 2)
     end
 
     it "recreates redis client" do

data/spec/pulse_toolbox/sensor/manager_spec.rb

@@ -29,7 +29,13 @@ describe PulseToolbox::Sensor::Manager do
     it "sends event to all created sensors" do
       described_class.create_sensors
       described_class.each_sensor {|s| s.should_receive(:event)}
-      described_class.log_request(3, 2, 1)
+      described_class.log_request(3, {
+        view_runtime: 2,
+        db_runtime: 1,
+        action: "foo",
+        controller: 'BarController',
+        status: 200
+      })
     end
   end
 
@@ -83,14 +89,14 @@ describe PulseToolbox::Sensor::Manager do
     let(:name) {:new_sensor}
     let(:options) {
       {
-        :sensor_type => 'timelined/max',
-        :color => '#0000FF',
-        :args => {
-          :ttl => 10.days,
-          :interval => 10.minutes,
-          :raw_data_ttl => 10.hours,
-          :reduce_delay => 20.minutes,
-          :annotation => "Annotation"
+        sensor_type: 'timelined/max',
+        color: '#0000FF',
+        args: {
+          ttl: 10.days,
+          interval: 10.minutes,
+          raw_data_ttl: 10.hours,
+          reduce_delay: 20.minutes,
+          annotation: "Annotation"
         }
       }
     }

data/spec/pulse_toolbox/sensor/mixins/iterators_spec.rb

@@ -5,18 +5,18 @@ describe PulseToolbox::Sensor::Mixins::Iterators do
     extend PulseToolbox::Sensor::Mixins::Iterators
     class_attribute :sensors_config
     self.sensors_config = {
-      :g1 => {
-        :title => "G1",
-        :sensors => {
-          :s11 => "sensor11",
-          :s12 => "sensor12"
+      g1: {
+        title: "G1",
+        sensors: {
+          s11: "sensor11",
+          s12: "sensor12"
         }
       },
-      :g2 => {
-        :title => "G2",
-        :sensors => {
-          :s21 => "sensor21",
-          :s22 => "sensor22"
+      g2: {
+        title: "G2",
+        sensors: {
+          s21: "sensor21",
+          s22: "sensor22"
         }
       }
     }

data/spec/requests/monitoring_spec.rb

@@ -10,22 +10,26 @@ end
 describe "/monitoring/pages/:id/widgets" do
   let(:custom_tab) {1}
   let(:monitoring_tab) {2}
-  def visit_tab(tab_id)
+
+  before(:each) do
     PulseToolbox::Sensor::Manager.create_sensors
-    custom = PulseMeter::Sensor::Timelined::Counter.new(:custom_sensor,
-      :ttl => 1.hour,
-      :interval => 1.minute,
-      :raw_data_ttl => 10.minutes,
-      :reduce_delay => 2.minutes,
-      :annotation => "custom_sensor"
+    PulseMeter::Sensor::Timelined::Counter.new(:custom_sensor,
+      ttl: 1.hour,
+      interval: 1.minute,
+      raw_data_ttl: 10.minutes,
+      reduce_delay: 2.minutes,
+      annotation: "custom_sensor"
     )
+  end
+
+  def widgets_on_tab(tab_id)
     visit "/monitoring/pages/#{tab_id}/widgets"
-    @widgets = JSON.parse(page.source)
+    JSON.parse(page.source)
   end
 
-  def all_annotations
+  def sensor_names_on_tab(tab_id)
     found_annotations = []
-    @widgets.each do |w|
+    widgets_on_tab(tab_id).each do |w|
       w["series"].each do |s|
         found_annotations << s["name"]
       end
@@ -34,21 +38,31 @@ describe "/monitoring/pages/:id/widgets" do
   end
 
   it "returns some groups of widgets" do
-    visit_tab(monitoring_tab)
     groups = []
     PulseToolbox::Sensor::Manager.each_group {|g| groups << g}
-    @widgets.count.should == groups.count
+    widgets_on_tab(monitoring_tab).count.should == groups.count
   end
 
   it "contains all sensors from PulseToolbox::Sensor::Manager config" do
-    visit_tab(monitoring_tab)
-    annotations = PulseToolbox::Sensor::Manager.sensors.map(&:annotation) 
+    PulseToolbox::Sensor::Manager.log_request(3, {
+      view_runtime: 2,
+      db_runtime: 1,
+      action: "foo",
+      controller: 'BarController',
+      status: 200,
+    })
+
+    annotations = PulseToolbox::Sensor::Manager.sensors.reject{|s|
+      s.is_a?(PulseMeter::Sensor::Timelined::HashedCounter)
+    }.map(&:annotation)
+
+    annotations << "Status: 200"
+    annotations << "Action: BarController#foo"
 
-    annotations.sort.should == all_annotations.sort
+    sensor_names_on_tab(monitoring_tab).sort.should == annotations.sort
   end
 
   it "returns widgets of custom page created in initializer" do
-    visit_tab(custom_tab)
-    all_annotations.should == ["custom_sensor"]
+    sensor_names_on_tab(custom_tab).should == ["custom_sensor"]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pulse-meter-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000Z
+date: 2012-06-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pulse-meter
-  requirement: &70196296895280 !ruby/object:Gem::Requirement
+  requirement: &70183084727520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196296895280
+  version_requirements: *70183084727520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70196296894160 !ruby/object:Gem::Requirement
+  requirement: &70183084726780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196296894160
+  version_requirements: *70183084726780
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70196296893420 !ruby/object:Gem::Requirement
+  requirement: &70183084726260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70196296893420
+  version_requirements: *70183084726260
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70196296892580 !ruby/object:Gem::Requirement
+  requirement: &70183084725720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196296892580
+  version_requirements: *70183084725720
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70196296891800 !ruby/object:Gem::Requirement
+  requirement: &70183084725240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196296891800
+  version_requirements: *70183084725240
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70196296891120 !ruby/object:Gem::Requirement
+  requirement: &70183084724800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196296891120
+  version_requirements: *70183084724800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70196296890200 !ruby/object:Gem::Requirement
+  requirement: &70183084724360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196296890200
+  version_requirements: *70183084724360
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70196296888840 !ruby/object:Gem::Requirement
+  requirement: &70183084723940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196296888840
+  version_requirements: *70183084723940
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70196296886980 !ruby/object:Gem::Requirement
+  requirement: &70183084723500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196296886980
+  version_requirements: *70183084723500
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70196296886100 !ruby/object:Gem::Requirement
+  requirement: &70183084723080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196296886100
+  version_requirements: *70183084723080
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70196296884560 !ruby/object:Gem::Requirement
+  requirement: &70183084722560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196296884560
+  version_requirements: *70183084722560
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70196296882960 !ruby/object:Gem::Requirement
+  requirement: &70183084721940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70196296882960
+  version_requirements: *70183084721940
 description: Pulse meter toolbox
 email:
 - averyanov@gmail.com
@@ -208,7 +208,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1441616513903231314
+      hash: 39999977172173136
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1441616513903231314
+      hash: 39999977172173136
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10