newrelic_f5_plugin 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b7cc8b0330af44b1a00392f0d9dc7a048c0ce79
-  data.tar.gz: 0aab0890155622be2e12ab0ba2263cb7593f1ba7
+  metadata.gz: 279793e5c1936f90db19c0ffd8842a0f7dc99760
+  data.tar.gz: ebbbd91dac4e565184e5d45562ff23ad428bdbea
 SHA512:
-  metadata.gz: dd8e326a708d65cf0f2f799328fe2802e059154d531e10317385234b67c1b4abfa495cf6e7010fbe891e044903565268e3d7f5d52d3b03de4113c1e227fd53c5
-  data.tar.gz: aa3406c4791ab4ffe72ef4a7b15eedd04d7f0797c636938fd06aa0e148222daf3bf121264db28f79b0af3533aa3ba87681389ed368152f3c134efa25cefc5db5
+  metadata.gz: e3af625664d8d7c549203c1a03cc7ece47178f0900b0085c8df3c6fff98e9d88e982a6029d987c9388d53f3454becc449d918ad18b90e16a945dfeed1f7f5f46
+  data.tar.gz: 390c1550dce277a0bc2f46458a5fb67215f1c801de7a85a19313a0e727073026ceca796d71e3df4e47955f3c606f597a2b4c045b3074aa32e0d5a329ed065da1

data/lib/newrelic_f5_plugin.rb

@@ -4,6 +4,7 @@ require 'newrelic_f5_plugin/client_ssl'
 require 'newrelic_f5_plugin/device'
 require 'newrelic_f5_plugin/interfaces'
 require 'newrelic_f5_plugin/nodes'
+require 'newrelic_f5_plugin/platform'
 require 'newrelic_f5_plugin/pools'
 require 'newrelic_f5_plugin/rules'
 require 'newrelic_f5_plugin/snatpools'

data/lib/newrelic_f5_plugin/agent.rb

@@ -4,7 +4,7 @@ require 'newrelic_plugin'
 require 'snmp'
 
 module NewRelic::F5Plugin
-  VERSION = '1.0.16'
+  VERSION = '1.0.17'
 
   # Register and run the agent
   def self.run
@@ -72,6 +72,11 @@ module NewRelic::F5Plugin
       end
 
 
+      # Platform metrics
+      NewRelic::PlatformLogger.debug("Collecting Platform stats")
+      @platform ||= NewRelic::F5Plugin::Platform.new
+      @platform.poll(self, snmp)
+
       # Device wide metrics
       NewRelic::PlatformLogger.debug("Collecting System stats")
       @system ||= NewRelic::F5Plugin::Device.new

data/lib/newrelic_f5_plugin/device.rb

@@ -13,16 +13,6 @@ module NewRelic
       OID_SYS_CLIENTSSL_STAT_CUR_CONNS                       = "1.3.6.1.4.1.3375.2.1.1.2.9.2.0"
       OID_SYS_CLIENTSSL_STAT_TOT_COMPAT_CONNS                = "1.3.6.1.4.1.3375.2.1.1.2.9.9.0"
       OID_SYS_CLIENTSSL_STAT_TOT_NATIVE_CONNS                = "1.3.6.1.4.1.3375.2.1.1.2.9.6.0"
-      OID_SYS_GLOBAL_HOST                                    = "1.3.6.1.4.1.3375.2.1.1.2.20"
-      OID_SYS_GLOBAL_HOST_CPU_COUNT                          = "#{OID_SYS_GLOBAL_HOST}.4.0"
-      OID_SYS_GLOBAL_HOST_CPU_IDLE_1M                        = "#{OID_SYS_GLOBAL_HOST}.25.0"
-      OID_SYS_GLOBAL_HOST_CPU_IOWAIT_1M                      = "#{OID_SYS_GLOBAL_HOST}.28.0"
-      OID_SYS_GLOBAL_HOST_CPU_IRQ_1M                         = "#{OID_SYS_GLOBAL_HOST}.26.0"
-      OID_SYS_GLOBAL_HOST_CPU_NICE_1M                        = "#{OID_SYS_GLOBAL_HOST}.23.0"
-      OID_SYS_GLOBAL_HOST_CPU_SOFTIRQ_1M                     = "#{OID_SYS_GLOBAL_HOST}.27.0"
-      OID_SYS_GLOBAL_HOST_CPU_SYSTEM_1M                      = "#{OID_SYS_GLOBAL_HOST}.24.0"
-      OID_SYS_GLOBAL_HOST_CPU_USER_1M                        = "#{OID_SYS_GLOBAL_HOST}.22.0"
-      OID_SYS_HOST_MEMORY_USED                               = "1.3.6.1.4.1.3375.2.1.7.1.2.0"
       OID_SYS_HTTP_COMPRESSION_STAT                          = "1.3.6.1.4.1.3375.2.1.1.2.22"
       OID_SYS_HTTP_COMPRESSION_STAT_AUDIO_POSTCOMPRESS_BYTES = "#{OID_SYS_HTTP_COMPRESSION_STAT}.24.0"
       OID_SYS_HTTP_COMPRESSION_STAT_AUDIO_PRECOMPRESS_BYTES  = "#{OID_SYS_HTTP_COMPRESSION_STAT}.23.0"
@@ -66,11 +56,6 @@ module NewRelic
       OID_SYS_HTTP_STAT_V11_RESP                             = "#{OID_SYS_HTTP_STAT}.15.0"
       OID_SYS_HTTP_STAT_V9_REQS                              = "#{OID_SYS_HTTP_STAT}.10.0"
       OID_SYS_HTTP_STAT_V9_RESP                              = "#{OID_SYS_HTTP_STAT}.13.0"
-      OID_SYS_PRODUCT                                        = "1.3.6.1.4.1.3375.2.1.4"
-      OID_SYS_PRODUCT_NAME                                   = "#{OID_SYS_PRODUCT}.1.0"
-      OID_SYS_PRODUCT_VERSION                                = "#{OID_SYS_PRODUCT}.2.0"
-      OID_SYS_PRODUCT_BUILD                                  = "#{OID_SYS_PRODUCT}.3.0"
-      OID_SYS_PRODUCT_EDITION                                = "#{OID_SYS_PRODUCT}.4.0"
       OID_SYS_SERVERSSL_STAT_CUR_CONNS                       = "1.3.6.1.4.1.3375.2.1.1.2.10.2.0"
       OID_SYS_SERVERSSL_STAT_TOT_COMPAT_CONNS                = "1.3.6.1.4.1.3375.2.1.1.2.10.9.0"
       OID_SYS_SERVERSSL_STAT_TOT_NATIVE_CONNS                = "1.3.6.1.4.1.3375.2.1.1.2.10.6.0"
@@ -126,12 +111,6 @@ module NewRelic
       def poll(agent, snmp)
         @snmp_manager = snmp
 
-        system_version = get_version
-        NewRelic::PlatformLogger.debug("Found F5 device with version: #{system_version}")
-
-        system_cpu = get_cpu
-        system_cpu.each_key { |m| agent.report_metric m, "%", system_cpu[m] } unless system_cpu.nil?
-
         system_memory = get_memory
         system_memory.each_key { |m| agent.report_metric m, "bytes", system_memory[m] } unless system_memory.nil?
 
@@ -174,59 +153,6 @@ module NewRelic
 
 
 
-      #
-      # Gather Version information
-      #
-      def get_version(snmp = nil)
-        version = "Unknown!"
-        snmp    = snmp_manager unless snmp
-
-        if snmp
-          res = gather_snmp_metrics_array([OID_SYS_PRODUCT_VERSION, OID_SYS_PRODUCT_BUILD], snmp)
-
-          version = "#{res[0]}.#{res[1]}" unless res.empty?
-        end
-
-        return version
-      end
-
-
-      #
-      # Gather CPU Related metrics and report them in %
-      #
-      def get_cpu(snmp = nil)
-        metrics = { }
-        snmp    = snmp_manager unless snmp
-
-        if snmp
-          res = gather_snmp_metrics_array([OID_SYS_GLOBAL_HOST_CPU_COUNT, OID_SYS_GLOBAL_HOST_CPU_USER_1M, OID_SYS_GLOBAL_HOST_CPU_NICE_1M,
-                                           OID_SYS_GLOBAL_HOST_CPU_SYSTEM_1M, OID_SYS_GLOBAL_HOST_CPU_IRQ_1M, OID_SYS_GLOBAL_HOST_CPU_SOFTIRQ_1M,
-                                           OID_SYS_GLOBAL_HOST_CPU_IOWAIT_1M],
-                                           snmp)
-
-          # Bail out if we didn't get anything
-          return metrics if res.empty?
-
-          # In order to show the CPU usage as a total percentage, we divide by the number of cpus
-          cpu_count = res[0].to_i
-          vals = res[1..6].map { |i| i.to_f / cpu_count }
-
-          metrics["CPU/Global/User"]     = vals[0]
-          metrics["CPU/Global/Nice"]     = vals[1]
-          metrics["CPU/Global/System"]   = vals[2]
-          metrics["CPU/Global/IRQ"]      = vals[3]
-          metrics["CPU/Global/Soft IRQ"] = vals[4]
-          metrics["CPU/Global/IO Wait"]  = vals[5]
-
-          # Add it all up, and send a summary metric
-          metrics["CPU/Total/Global"] = vals.inject(0.0){ |a,b| a + b }
-
-        end
-
-        return metrics
-      end
-
-
       #
       # Gather Memory related metrics and report them in bytes
       #
@@ -235,13 +161,12 @@ module NewRelic
         snmp    = snmp_manager unless snmp
 
         if snmp
-          res = gather_snmp_metrics_array([OID_SYS_STAT_MEMORY_USED, OID_SYS_HOST_MEMORY_USED], snmp)
+          res = gather_snmp_metrics_array([OID_SYS_STAT_MEMORY_USED], snmp)
 
           # Bail out if we didn't get anything
           return metrics if res.empty?
 
           metrics["Memory/TMM"]  = res[0]
-          metrics["Memory/Host"] = res[1]
         end
 
         return metrics

data/lib/newrelic_f5_plugin/platform.rb

@@ -0,0 +1,169 @@
+#!/usr/bin/env ruby
+
+require 'newrelic_plugin'
+require 'snmp'
+
+module NewRelic
+  module F5Plugin
+
+    class Platform
+      attr_accessor :snmp_manager
+
+      # Create the OIDs if they do not exist
+      OID_SYS_GLOBAL_HOST                                    = "1.3.6.1.4.1.3375.2.1.1.2.20"
+      OID_SYS_GLOBAL_HOST_CPU_COUNT                          = "#{OID_SYS_GLOBAL_HOST}.4.0"
+      OID_SYS_GLOBAL_HOST_CPU_IDLE_1M                        = "#{OID_SYS_GLOBAL_HOST}.25.0"
+      OID_SYS_GLOBAL_HOST_CPU_IOWAIT_1M                      = "#{OID_SYS_GLOBAL_HOST}.28.0"
+      OID_SYS_GLOBAL_HOST_CPU_IRQ_1M                         = "#{OID_SYS_GLOBAL_HOST}.26.0"
+      OID_SYS_GLOBAL_HOST_CPU_NICE_1M                        = "#{OID_SYS_GLOBAL_HOST}.23.0"
+      OID_SYS_GLOBAL_HOST_CPU_SOFTIRQ_1M                     = "#{OID_SYS_GLOBAL_HOST}.27.0"
+      OID_SYS_GLOBAL_HOST_CPU_SYSTEM_1M                      = "#{OID_SYS_GLOBAL_HOST}.24.0"
+      OID_SYS_GLOBAL_HOST_CPU_USER_1M                        = "#{OID_SYS_GLOBAL_HOST}.22.0"
+      OID_SYS_HOST_MEMORY_USED                               = "1.3.6.1.4.1.3375.2.1.7.1.2.0"
+
+      OID_SYS_PLATFORM                                       = "1.3.6.1.4.1.3375.2.1.3"
+      OID_SYS_PLATFORM_INFO                                  = "#{OID_SYS_PLATFORM}.5"
+      OID_SYS_PLATFORM_INFO_NAME                             = "#{OID_SYS_PLATFORM_INFO}.1.0"
+      OID_SYS_PLATFORM_INFO_MARKETING_NAME                   = "#{OID_SYS_PLATFORM_INFO}.2.0"
+
+      OID_SYS_PRODUCT                                        = "1.3.6.1.4.1.3375.2.1.4"
+      OID_SYS_PRODUCT_NAME                                   = "#{OID_SYS_PRODUCT}.1.0"
+      OID_SYS_PRODUCT_VERSION                                = "#{OID_SYS_PRODUCT}.2.0"
+      OID_SYS_PRODUCT_BUILD                                  = "#{OID_SYS_PRODUCT}.3.0"
+      OID_SYS_PRODUCT_EDITION                                = "#{OID_SYS_PRODUCT}.4.0"
+
+      #
+      # Init
+      #
+      def initialize(snmp = nil)
+        @version = 'Unknown!'
+
+        if snmp
+          @snmp_manager = snmp
+        else
+          @snmp_manager = nil
+        end
+      end
+
+
+
+      #
+      # Perform polling and reportings of metrics
+      #
+      def poll(agent, snmp)
+        @snmp_manager = snmp
+
+        system_platform = get_platform_info
+        @version        = get_version
+        NewRelic::PlatformLogger.debug("Found a #{system_platform} running version #{@version}")
+
+
+        system_cpu = get_cpu
+        system_cpu.each_key { |m| agent.report_metric m, "%", system_cpu[m] } unless system_cpu.nil?
+
+        system_memory = get_memory
+        system_memory.each_key { |m| agent.report_metric m, "bytes", system_memory[m] } unless system_memory.nil?
+
+      end
+
+
+
+      #
+      # Gather Version information
+      #
+      def get_version(snmp = nil)
+        version = "Unknown!"
+        snmp    = snmp_manager unless snmp
+
+        if snmp
+          res = gather_snmp_metrics_array([OID_SYS_PRODUCT_VERSION, OID_SYS_PRODUCT_BUILD], snmp)
+
+          version = "#{res[0]}.#{res[1]}" unless res.empty?
+        end
+
+        return version
+      end
+
+
+
+      def get_platform_info(snmp = nil)
+        platform = "Unknown!"
+        snmp     = snmp_manager unless snmp
+
+        if snmp
+          res = gather_snmp_metrics_array([OID_SYS_PLATFORM_INFO_MARKETING_NAME, OID_SYS_PLATFORM_INFO_NAME], snmp)
+
+          platform = "#{res[0]} (#{res[1]})"
+        end
+
+        return platform
+      end
+
+
+
+      #
+      # Gather CPU Related metrics and report them in %
+      #
+      def get_cpu(snmp = nil)
+        metrics = { }
+        snmp    = snmp_manager unless snmp
+
+        if snmp
+          res = gather_snmp_metrics_array([OID_SYS_GLOBAL_HOST_CPU_COUNT, OID_SYS_GLOBAL_HOST_CPU_USER_1M, OID_SYS_GLOBAL_HOST_CPU_NICE_1M,
+                                           OID_SYS_GLOBAL_HOST_CPU_SYSTEM_1M, OID_SYS_GLOBAL_HOST_CPU_IRQ_1M, OID_SYS_GLOBAL_HOST_CPU_SOFTIRQ_1M,
+                                           OID_SYS_GLOBAL_HOST_CPU_IOWAIT_1M],
+                                           snmp)
+
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
+          # In order to show the CPU usage as a total percentage, we divide by the number of cpus for older versions
+          case @version
+          when /^11\.4\.1/
+            # 11.4.1 HF3 reports average CPU not total, so don't divide by CPU count
+            cpu_count = 1
+          else
+            cpu_count = res[0].to_i
+          end
+
+          vals = res[1..6].map { |i| i.to_f / cpu_count }
+
+          metrics["CPU/Global/User"]     = vals[0]
+          metrics["CPU/Global/Nice"]     = vals[1]
+          metrics["CPU/Global/System"]   = vals[2]
+          metrics["CPU/Global/IRQ"]      = vals[3]
+          metrics["CPU/Global/Soft IRQ"] = vals[4]
+          metrics["CPU/Global/IO Wait"]  = vals[5]
+
+          # Add it all up, and send a summary metric
+          metrics["CPU/Total/Global"] = vals.inject(0.0){ |a,b| a + b }
+
+        end
+
+        return metrics
+      end
+
+
+      #
+      # Gather Memory related metrics and report them in bytes
+      #
+      def get_memory(snmp = nil)
+        metrics = { }
+        snmp    = snmp_manager unless snmp
+
+        if snmp
+          res = gather_snmp_metrics_array([OID_SYS_HOST_MEMORY_USED], snmp)
+
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
+          metrics["Memory/Host"] = res[0]
+        end
+
+        return metrics
+      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.16'
-  s.date              = '2014-08-18'
+  s.version           = '1.0.17'
+  s.date              = '2014-10-08'
   s.rubyforge_project = 'newrelic_f5_plugin'
   s.licenses          = ['MIT']
 
@@ -80,6 +80,7 @@ to find out how to install and run the plugin agent.
     lib/newrelic_f5_plugin/device.rb
     lib/newrelic_f5_plugin/interfaces.rb
     lib/newrelic_f5_plugin/nodes.rb
+    lib/newrelic_f5_plugin/platform.rb
     lib/newrelic_f5_plugin/pools.rb
     lib/newrelic_f5_plugin/rules.rb
     lib/newrelic_f5_plugin/snatpools.rb

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_f5_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Jonathan Thurman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-18 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_plugin
@@ -75,6 +75,7 @@ files:
 - lib/newrelic_f5_plugin/device.rb
 - lib/newrelic_f5_plugin/interfaces.rb
 - lib/newrelic_f5_plugin/nodes.rb
+- lib/newrelic_f5_plugin/platform.rb
 - lib/newrelic_f5_plugin/pools.rb
 - lib/newrelic_f5_plugin/rules.rb
 - lib/newrelic_f5_plugin/snatpools.rb