newrelic_f5_plugin 1.0.12 → 1.0.15

data/lib/newrelic_f5_plugin/virtuals.rb

@@ -42,10 +42,10 @@ 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"
+      attr_accessor :names, :snmp_manager
 
+      MAX_RESULTS                                 = 150
+      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"
@@ -64,7 +64,8 @@ module NewRelic
       # Init
       #
       def initialize(snmp = nil)
-        @vs_names = [ ]
+        @names    = [ ]
+        @f5_agent = nil
 
         if snmp
           @snmp_manager = snmp
@@ -75,27 +76,48 @@ module NewRelic
 
 
 
+      #
+      # Perform polling and reportings of metrics
+      #
+      def poll(agent, snmp)
+        @snmp_manager = snmp
+        @f5_agent     = agent
+
+        unless get_names.empty?
+          get_requests
+          get_conns_current
+          get_conns_total
+          get_packets_in
+          get_packets_out
+          get_throughput_in
+          get_throughput_out
+          get_cpu_usage_1m
+        end
+      end
+
+
+
       #
       # Get the list of Virtual Server names
       #
       def get_names(snmp = nil)
-        snmp = snmp_manager unless snmp
+        snmp = @snmp_manager unless snmp
 
         if snmp
-          @vs_names.clear
+          @names.clear
 
           begin
             snmp.walk([OID_LTM_VIRTUAL_SERV_STAT_NAME]) do |row|
               row.each do |vb|
-                @vs_names.push(vb.value)
+                @names.push(vb.value)
               end
             end
           rescue Exception => e
             NewRelic::PlatformLogger.error("Unable to gather Virtual Server names with error: #{e}")
           end
 
-          NewRelic::PlatformLogger.debug("Virtual Servers: Found #{@vs_names.size} virtual servers")
-          return @vs_names
+          NewRelic::PlatformLogger.debug("Virtual Servers: Found #{@names.size} virtual servers, reporting the top #{MAX_RESULTS} (max)")
+          return @names
         end
       end
 
@@ -105,12 +127,26 @@ module NewRelic
       # Gather VS Total Requests
       #
       def get_requests(snmp = nil)
-        snmp = snmp_manager unless snmp
+        @req_rate ||= { }
+        report      = { }
+        snmp        = @snmp_manager unless snmp
+
+        get_names(snmp) if @names.empty?
+        res = gather_snmp_metrics_by_name("Virtual Servers/Requests", @names, OID_LTM_VIRTUAL_SERV_STAT_TOT_REQUESTS, snmp)
+        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@names.size} Request metrics")
+
+        unless res.nil?
+          res.each_key do |metric|
+            @req_rate[metric] ||= NewRelic::Processor::EpochCounter.new
+            report[metric] = @req_rate[metric].process(res[metric])
+          end
 
-        get_names(snmp) if @vs_names.empty?
-        res = gather_snmp_metrics_by_name("Virtual Servers/Requests", @vs_names, OID_LTM_VIRTUAL_SERV_STAT_TOT_REQUESTS, snmp)
-        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@vs_names.size} Request metrics")
-        return res
+          sorted_report = report.sort_by { |k,v| v }.reverse
+          sorted_report.each_with_index do |row, index|
+            @f5_agent.report_metric row[0], "req/sec", row[1]
+            break if index >= (MAX_RESULTS - 1)
+          end
+        end
       end
 
 
@@ -119,12 +155,19 @@ module NewRelic
       # Gather VS Connection count
       #
       def get_conns_current(snmp = nil)
-        snmp = snmp_manager unless snmp
+        snmp = @snmp_manager unless snmp
+
+        get_names(snmp) if @names.empty?
+        res = gather_snmp_metrics_by_name("Virtual Servers/Current Connections", @names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_CUR_CONNS, snmp)
+        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@names.size} Current Connection metrics")
 
-        get_names(snmp) if @vs_names.empty?
-        res = gather_snmp_metrics_by_name("Virtual Servers/Current Connections", @vs_names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_CUR_CONNS, snmp)
-        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@vs_names.size} Current Connection metrics")
-        return res
+        unless res.nil?
+          sorted_report = res.sort_by { |k,v| v }.reverse
+          sorted_report.each_with_index do |row, index|
+            @f5_agent.report_metric row[0], "conns", row[1]
+            break if index >= (MAX_RESULTS - 1)
+          end
+        end
       end
 
 
@@ -133,12 +176,26 @@ module NewRelic
       # Gather VS Connection rate
       #
       def get_conns_total(snmp = nil)
-        snmp = snmp_manager unless snmp
+        @conn_rate ||= { }
+        report       = { }
+        snmp         = @snmp_manager unless snmp
+
+        get_names(snmp) if @names.empty?
+        res = gather_snmp_metrics_by_name("Virtual Servers/Connection Rate", @names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_TOT_CONNS, snmp)
+        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@names.size} Connection Rate metrics")
+
+        unless res.nil?
+          res.each_key do |metric|
+            @conn_rate[metric] ||= NewRelic::Processor::EpochCounter.new
+            report[metric] = @conn_rate[metric].process(res[metric])
+          end
 
-        get_names(snmp) if @vs_names.empty?
-        res = gather_snmp_metrics_by_name("Virtual Servers/Connection Rate", @vs_names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_TOT_CONNS, snmp)
-        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@vs_names.size} Connection Rate metrics")
-        return res
+          sorted_report = report.sort_by { |k,v| v }.reverse
+          sorted_report.each_with_index do |row, index|
+            @f5_agent.report_metric row[0], "conn/sec", row[1]
+            break if index >= (MAX_RESULTS - 1)
+          end
+        end
       end
 
 
@@ -147,13 +204,26 @@ module NewRelic
       # Gather VS Packets Inbound
       #
       def get_packets_in (snmp = nil)
-        snmp = snmp_manager unless snmp
+        @packet_in_rate ||= { }
+        report            = { }
+        snmp              = @snmp_manager unless snmp
+
+        get_names(snmp) if @names.empty?
+        res = gather_snmp_metrics_by_name("Virtual Servers/Packets/In", @names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_PKTS_IN, snmp)
+        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@names.size} Inbound Packet metrics")
+
+        unless res.nil?
+          res.each_key do |metric|
+            @packet_in_rate[metric] ||= NewRelic::Processor::EpochCounter.new
+            report[metric] = @packet_in_rate[metric].process(res[metric] * 8)
+          end
 
-        get_names(snmp) if @vs_names.empty?
-        res = gather_snmp_metrics_by_name("Virtual Servers/Packets/In", @vs_names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_PKTS_IN, snmp)
-        res = res.each_key { |n| res[n] *= 8 }
-        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@vs_names.size} Inbound Packet metrics")
-        return res
+          sorted_report = report.sort_by { |k,v| v }.reverse
+          sorted_report.each_with_index do |row, index|
+            @f5_agent.report_metric row[0], "packets/sec", row[1]
+            break if index >= (MAX_RESULTS - 1)
+          end
+        end
       end
 
 
@@ -162,13 +232,26 @@ module NewRelic
       # Gather VS Packets Outbound
       #
       def get_packets_out(snmp = nil)
-        snmp = snmp_manager unless snmp
+        @packet_out_rate ||= { }
+        report             = { }
+        snmp               = @snmp_manager unless snmp
+
+        get_names(snmp) if @names.empty?
+        res = gather_snmp_metrics_by_name("Virtual Servers/Packets/Out", @names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_PKTS_OUT, snmp)
+        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@names.size} Outbound Packet metrics")
+
+        unless res.nil?
+          res.each_key do |metric|
+            @packet_out_rate[metric] ||= NewRelic::Processor::EpochCounter.new
+            report[metric] = @packet_out_rate[metric].process(res[metric] * 8)
+          end
 
-        get_names(snmp) if @vs_names.empty?
-        res = gather_snmp_metrics_by_name("Virtual Servers/Packets/Out", @vs_names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_PKTS_OUT, snmp)
-        res = res.each_key { |n| res[n] *= 8 }
-        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@vs_names.size} Outbound Packet metrics")
-        return res
+          sorted_report = report.sort_by { |k,v| v }.reverse
+          sorted_report.each_with_index do |row, index|
+            @f5_agent.report_metric row[0], "packets/sec", row[1]
+            break if index >= (MAX_RESULTS - 1)
+          end
+        end
       end
 
 
@@ -177,13 +260,26 @@ module NewRelic
       # Gather VS Throughput Inbound (returns in bits)
       #
       def get_throughput_in(snmp = nil)
-        snmp = snmp_manager unless snmp
+        @throughput_in_rate ||= { }
+        report                = { }
+        snmp                  = @snmp_manager unless snmp
+
+        get_names(snmp) if @names.empty?
+        res = gather_snmp_metrics_by_name("Virtual Servers/Throughput/In", @names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_BYTES_IN, snmp)
+        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@names.size} Inbound Throughput metrics")
+
+        unless res.nil?
+          res.each_key do |metric|
+            @throughput_in_rate[metric] ||= NewRelic::Processor::EpochCounter.new
+            report[metric] = @throughput_in_rate[metric].process(res[metric] * 8)
+          end
 
-        get_names(snmp) if @vs_names.empty?
-        res = gather_snmp_metrics_by_name("Virtual Servers/Throughput/In", @vs_names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_BYTES_IN, snmp)
-        res = res.each_key { |n| res[n] *= 8 }
-        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@vs_names.size} Inbound Throughput metrics")
-        return res
+          sorted_report = report.sort_by { |k,v| v }.reverse
+          sorted_report.each_with_index do |row, index|
+            @f5_agent.report_metric row[0], "bits/sec", row[1]
+            break if index >= (MAX_RESULTS - 1)
+          end
+        end
       end
 
 
@@ -192,13 +288,26 @@ module NewRelic
       # Gather VS Throughput Outbound (returns in bits)
       #
       def get_throughput_out(snmp = nil)
-        snmp = snmp_manager unless snmp
+        @throughput_out_rate ||= { }
+        report                 = { }
+        snmp                   = @snmp_manager unless snmp
+
+        get_names(snmp) if @names.empty?
+        res = gather_snmp_metrics_by_name("Virtual Servers/Throughput/Out", @names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_BYTES_OUT, snmp)
+        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@names.size} Outbound Throughput metrics")
+
+        unless res.nil?
+          res.each_key do |metric|
+            @throughput_out_rate[metric] ||= NewRelic::Processor::EpochCounter.new
+            report[metric] = @throughput_out_rate[metric].process(res[metric] * 8)
+          end
 
-        get_names(snmp) if @vs_names.empty?
-        res = gather_snmp_metrics_by_name("Virtual Servers/Throughput/Out", @vs_names, OID_LTM_VIRTUAL_SERV_STAT_CLIENT_BYTES_OUT, snmp)
-        res = res.each_key { |n| res[n] *= 8 }
-        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@vs_names.size} Outbound Throughput metrics")
-        return res
+          sorted_report = report.sort_by { |k,v| v }.reverse
+          sorted_report.each_with_index do |row, index|
+            @f5_agent.report_metric row[0], "bits/sec", row[1]
+            break if index >= (MAX_RESULTS - 1)
+          end
+        end
       end
 
 
@@ -207,12 +316,19 @@ module NewRelic
       # Gather VS Connection rate
       #
       def get_cpu_usage_1m(snmp = nil)
-        snmp = snmp_manager unless snmp
+        snmp = @snmp_manager unless snmp
+
+        get_names(snmp) if @names.empty?
+        res = gather_snmp_metrics_by_name("Virtual Servers/CPU Usage/1m", @names, OID_LTM_VIRTUAL_SERV_STAT_VS_USAGE_RATIO_1M, snmp)
+        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@names.size} CPU metrics")
 
-        get_names(snmp) if @vs_names.empty?
-        res = gather_snmp_metrics_by_name("Virtual Servers/CPU Usage/1m", @vs_names, OID_LTM_VIRTUAL_SERV_STAT_VS_USAGE_RATIO_1M, snmp)
-        NewRelic::PlatformLogger.debug("Virtual Servers: Got #{res.size}/#{@vs_names.size} CPU metrics")
-        return res
+        unless res.nil?
+          sorted_report = res.sort_by { |k,v| v }.reverse
+          sorted_report.each_with_index do |row, index|
+            @f5_agent.report_metric row[0], "%", row[1]
+            break if index >= (MAX_RESULTS - 1)
+          end
+        end
       end
 
     end

data/newrelic_f5_plugin.gemspec

@@ -13,9 +13,10 @@ 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.12'
-  s.date              = '2014-02-19'
+  s.version           = '1.0.15'
+  s.date              = '2014-07-07'
   s.rubyforge_project = 'newrelic_f5_plugin'
+  s.licenses          = ['MIT']
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -51,8 +52,8 @@ This is the New Relic plugin for monitoring F5 devices developed by New Relic, I
   ## The newrelic_plugin needs to be installed.  Prior to public release, the
   # gem needs to be downloaded from git@github.com:newrelic-platform/newrelic_plugin.git
   # and built using the "rake build" command
-  s.add_dependency('newrelic_plugin', "~> 1.3.0")
-  s.add_dependency('snmp', ">= 1.1.0")
+  s.add_runtime_dependency('newrelic_plugin', '~> 1.3', '>= 1.3.0')
+  s.add_runtime_dependency('snmp', '~> 1.1', '>= 1.1.0')
 
   s.post_install_message = <<-EOF
 To get started with this plugin, create a working directory and do 

metadata

@@ -1,52 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_f5_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.12
-  prerelease: 
+  version: 1.0.15
 platform: ruby
 authors:
 - Jonathan Thurman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-19 00:00:00.000000000 Z
+date: 2014-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_plugin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: snmp
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
-description: ! 'This is the New Relic plugin for monitoring F5 devices developed by
-  New Relic, Inc.
-
-'
+description: |
+  This is the New Relic plugin for monitoring F5 devices developed by New Relic, Inc.
 email: support@newrelic.com
 executables:
 - f5_monitor
@@ -80,33 +85,30 @@ files:
 - test/plugin_test.rb
 - test/test_helper.rb
 homepage: http://newrelic.com
-licenses: []
-post_install_message: ! "To get started with this plugin, create a working directory
+licenses:
+- MIT
+metadata: {}
+post_install_message: "To get started with this plugin, create a working directory
   and do \n  f5_monitor -h\nto find out how to install and run the plugin agent.\n"
 rdoc_options:
-- --charset=UTF-8
-- --main
+- "--charset=UTF-8"
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1376077939883300417
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: newrelic_f5_plugin
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 2
 summary: New Relic F5 plugin