newrelic_f5_plugin 1.0.0 → 1.0.1

data/CHANGES

@@ -1,3 +1,10 @@
+* 1.0.1
+  - Added Virtual Server statistics:
+    - Requests per second
+    - Current Connections
+    - Connections per second
+    - Throughput (In/Out)
+
 * 1.0.0
   - Updated version for release!
 

data/Gemfile

@@ -2,11 +2,11 @@ source 'https://rubygems.org'
 
 # This gemfile is used in the context of development on this plugin agent.
 
-gem 'newrelic_plugin', :git => 'git@github.com:newrelic-platform/newrelic_plugin.git', :branch => 'release'
-gem "snmp"
-gem "rake", ">0.9.2"
+gem 'newrelic_plugin', '>= 0.2.11'
+gem 'snmp'
+gem 'rake', '>0.9.2'
 gem 'test-unit'
-gem "shoulda"
-gem "mocha"
-gem "rdoc", ">2.4.2"
+gem 'shoulda'
+gem 'mocha'
+gem 'rdoc', '>2.4.2'
 

data/README.rdoc

@@ -30,24 +30,29 @@ A *read-only* SNMP community is required for each device to be monitored. Curren
 SNMP verison 2c is supported.
 
 
-== Instructions for running the F5 plugin agent
+== Installation and Running
 
-1. Install the +newrelic_plugin+ gem.
-2. Install this gem.
-3. Create an installation directory (like /opt/newrelic/f5 ).
-4. In the installation directory, execute
+1. Install this gem from RubyGems:
+
+      gem install newrelic_f5_plugin
+
+2. Create an installation directory (like /opt/newrelic/f5 ).
+3. In the installation directory, execute
 
       f5_monitor install -l LICENSE_KEY
 
    using the license key from your New Relic account.
-5. Edit the +config/newrelic_plugin.yml+ file generated in step 4.  Setup name/hostname/port/snmp_community for each F5 you wish to monitor.
-6. Execute
+4. Edit the +config/newrelic_plugin.yml+ file generated in step 4.  Setup name/hostname/port/snmp_community for each F5 you wish to monitor.
+5. Execute
 
       f5_monitor run
 
 == Developer Instructions
 
 1. Fork/Clone the repository
-2. Install bundler and do +bundle install+
-3. Do <b><tt>rake -T</tt></b> to see rake options, including tests.
+2. Install bundler and run:
+
+      bundle install
+
+3. Run <b><tt>rake -T</tt></b> to see rake options, including tests.
 

data/lib/newrelic_f5_plugin.rb

@@ -1,8 +1,9 @@
 require 'rubygems'
 require 'newrelic_f5_plugin/nodes'
+require 'newrelic_f5_plugin/virtuals'
 require 'newrelic_f5_plugin/agent'
 
 module NewRelic::F5Plugin
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end
 

data/lib/newrelic_f5_plugin/agent.rb

@@ -28,7 +28,7 @@ module NewRelic::F5Plugin
   #     Build: 1.3.6.1.4.1.3375.2.1.4.3.0
   class Agent < NewRelic::Plugin::Agent::Base
     agent_guid    'com.newrelic.f5'
-    agent_version '1.0.0'
+    agent_version '1.0.1'  # FIXME This should come from NewRelic::F5Plugin VERSION constant
     agent_config_options :hostname, :port, :snmp_community
     agent_human_labels('F5') { "#{hostname}" }
 
@@ -60,6 +60,37 @@ module NewRelic::F5Plugin
         report_metric m, node_status[m][:label], node_status[m][:count]
       }
 
+      #
+      # Collect virtual server statistics
+      #
+      vs = NewRelic::F5Plugin::Virtuals.new snmp
+      virtual_requests = vs.get_requests
+      virtual_requests.each_key { |m|
+        report_counter_metric m, "req/sec", virtual_requests[m]
+      }
+
+      virtual_conns_current = vs.get_conns_current
+      virtual_conns_current.each_key { |m|
+        report_metric m, "conns", virtual_conns_current[m]
+      }
+
+      virtual_conns_total = vs.get_conns_total
+      virtual_conns_total.each_key { |m|
+        report_counter_metric m, "conn/sec", virtual_conns_total[m]
+      }
+
+      virtual_throughput_in = vs.get_throughput_in
+      virtual_throughput_in.each_key { |m|
+        report_counter_metric m, "bits/sec", virtual_throughput_in[m]
+      }
+
+      virtual_throughput_out = vs.get_throughput_out
+      virtual_throughput_out.each_key { |m|
+        report_counter_metric m, "bits/sec", virtual_throughput_out[m]
+      }
+
+
+
       snmp.close
     rescue => e
       $stderr.puts "#{e}: #{e.backtrace.join("\n  ")}"

data/lib/newrelic_f5_plugin/virtuals.rb

@@ -0,0 +1,187 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'bundler/setup'
+require 'newrelic_plugin'
+require 'snmp'
+
+
+module NewRelic
+  module F5Plugin
+
+    class Virtuals
+      attr_accessor :vs_names, :snmp_manager
+
+      OID_LTM_VIRTUAL_SERVERS     = "1.3.6.1.4.1.3375.2.2.10"
+
+      OID_LTM_VIRTUAL_SERV_STAT                  = "#{OID_LTM_VIRTUAL_SERVERS}.2"
+      OID_LTM_VIRTUAL_SERV_ENTRY                 = "#{OID_LTM_VIRTUAL_SERV_STAT}.3.1"
+      OID_LTM_VIRTUAL_SERV_STAT_NAME             = "#{OID_LTM_VIRTUAL_SERV_ENTRY}.1"
+      OID_LTM_VIRTUAL_SERV_STAT_CLIENT_BYTES_IN  = "#{OID_LTM_VIRTUAL_SERV_ENTRY}.7"
+      OID_LTM_VIRTUAL_SERV_STAT_CLIENT_BYTES_OUT = "#{OID_LTM_VIRTUAL_SERV_ENTRY}.9"
+      OID_LTM_VIRTUAL_SERV_STAT_CLIENT_TOT_CONNS = "#{OID_LTM_VIRTUAL_SERV_ENTRY}.11"
+      OID_LTM_VIRTUAL_SERV_STAT_CLIENT_CUR_CONNS = "#{OID_LTM_VIRTUAL_SERV_ENTRY}.12"
+      OID_LTM_VIRTUAL_SERV_STAT_TOT_REQUESTS     = "#{OID_LTM_VIRTUAL_SERV_ENTRY}.27"
+
+
+
+      #
+      # Init
+      #
+      def initialize(snmp = nil)
+        @vs_names = [ ]
+
+        if snmp
+          @snmp_manager = snmp
+        else
+          @snmp_manager = nil
+        end
+      end
+
+
+
+      #
+      # Get the list of Virtual Server names
+      #
+      def get_names(snmp = nil)
+        snmp = snmp_manager unless snmp
+
+        if snmp
+          @vs_names.clear
+
+          snmp.walk([OID_LTM_VIRTUAL_SERV_STAT_NAME]) do |row|
+            row.each do |vb|
+              @vs_names.push(vb.value)
+            end
+          end
+
+          return @vs_names
+        end
+      end
+
+
+
+      #
+      # Gather VS Total Requests
+      #
+      def get_requests(snmp = nil)
+        metrics = { }
+        index   = 0
+        snmp    = snmp_manager unless snmp
+
+        if snmp
+          get_names(snmp) if @vs_names.empty?
+
+          snmp.walk([OID_LTM_VIRTUAL_SERV_STAT_TOT_REQUESTS]) do |row|
+            row.each do |vb|
+              metrics["Virtual Servers/Requests/#{@vs_names[index]}"] = vb.value.to_i
+              index += 1
+            end
+          end
+
+          return metrics
+        end
+      end
+
+
+
+      #
+      # Gather VS Connection count
+      #
+      def get_conns_current(snmp = nil)
+        metrics = { }
+        index   = 0
+        snmp    = snmp_manager unless snmp
+
+        if snmp
+          get_names(snmp) if @vs_names.empty?
+
+          snmp.walk([OID_LTM_VIRTUAL_SERV_STAT_CLIENT_CUR_CONNS]) do |row|
+            row.each do |vb|
+              metrics["Virtual Servers/Current Connections/#{@vs_names[index]}"] = vb.value.to_i
+              index += 1
+            end
+          end
+
+          return metrics
+        end
+      end
+
+
+
+      #
+      # Gather VS Connection rate
+      #
+      def get_conns_total(snmp = nil)
+        metrics = { }
+        index   = 0
+        snmp    = snmp_manager unless snmp
+
+        if snmp
+          get_names(snmp) if @vs_names.empty?
+
+          snmp.walk([OID_LTM_VIRTUAL_SERV_STAT_CLIENT_TOT_CONNS]) do |row|
+            row.each do |vb|
+              metrics["Virtual Servers/Connection Rate/#{@vs_names[index]}"] = vb.value.to_i
+              index += 1
+            end
+          end
+
+          return metrics
+        end
+      end
+
+
+
+      #
+      # Gather VS Throughput Inbound (returns in bits)
+      #
+      def get_throughput_in(snmp = nil)
+        metrics = { }
+        index   = 0
+        snmp    = snmp_manager unless snmp
+
+        if snmp
+          get_names(snmp) if @vs_names.empty?
+
+          snmp.walk([OID_LTM_VIRTUAL_SERV_STAT_CLIENT_BYTES_IN]) do |row|
+            row.each do |vb|
+              metrics["Virtual Servers/Throughput/In/#{@vs_names[index]}"] = (vb.value.to_f * 8)
+              index += 1
+            end
+          end
+
+          return metrics
+        end
+      end
+
+
+
+      #
+      # Gather VS Throughput Inbound (returns in bits)
+      #
+      def get_throughput_out(snmp = nil)
+        metrics = { }
+        index   = 0
+        snmp    = snmp_manager unless snmp
+
+        if snmp
+          get_names(snmp) if @vs_names.empty?
+
+          snmp.walk([OID_LTM_VIRTUAL_SERV_STAT_CLIENT_BYTES_OUT]) do |row|
+            row.each do |vb|
+              metrics["Virtual Servers/Throughput/Out/#{@vs_names[index]}"] = (vb.value.to_f * 8)
+              index += 1
+            end
+          end
+
+          return metrics
+        end
+      end
+
+
+
+    end
+  end
+end
+

data/newrelic_f5_plugin.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'newrelic_f5_plugin'
-  s.version           = '1.0.0'
-  s.date              = '2013-06-18'
+  s.version           = '1.0.1'
+  s.date              = '2013-06-21'
   s.rubyforge_project = 'newrelic_f5_plugin'
 
   ## Make sure your summary is short. The description may be as long
@@ -76,6 +76,7 @@ to find out how to install and run the plugin agent.
     lib/newrelic_f5_plugin.rb
     lib/newrelic_f5_plugin/agent.rb
     lib/newrelic_f5_plugin/nodes.rb
+    lib/newrelic_f5_plugin/virtuals.rb
     newrelic_f5_plugin.gemspec
     test/f5_monitor_test.rb
     test/plugin_test.rb

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_f5_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_plugin
@@ -67,6 +67,7 @@ files:
 - lib/newrelic_f5_plugin.rb
 - lib/newrelic_f5_plugin/agent.rb
 - lib/newrelic_f5_plugin/nodes.rb
+- lib/newrelic_f5_plugin/virtuals.rb
 - newrelic_f5_plugin.gemspec
 - test/f5_monitor_test.rb
 - test/plugin_test.rb