newrelic_f5_plugin 1.0.6 → 1.0.7

data/CHANGES

@@ -1,3 +1,7 @@
+* 1.0.7
+  - Better handling of older versions of BIG-IP (pre 11.3.0)
+  - Print F5 version in debug logs
+
 * 1.0.6
   - Fix throughput reporting issue caused by the refactor.
 

data/lib/newrelic_f5_plugin/agent.rb

@@ -4,7 +4,7 @@ require 'newrelic_plugin'
 require 'snmp'
 
 module NewRelic::F5Plugin
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 
   # Register and run the agent
   def self.run
@@ -49,6 +49,10 @@ module NewRelic::F5Plugin
       # Device wide metrics
       #
       system = NewRelic::F5Plugin::Device.new snmp
+
+      system_version = system.get_version
+      NewRelic::PlatformLogger.debug("Found F5 device with version: #{system_version}")
+
       system_cpu = system.get_cpu
       system_cpu.each_key { |m| report_metric m, "%", system_cpu[m] } unless system_cpu.nil?
 

data/lib/newrelic_f5_plugin/device.rb

@@ -66,6 +66,11 @@ 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"
@@ -113,6 +118,21 @@ module NewRelic
         end
       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
 
 
       #
@@ -128,6 +148,9 @@ module NewRelic
                                            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 }
@@ -158,6 +181,9 @@ module NewRelic
         if snmp
           res = gather_snmp_metrics_array([OID_SYS_STAT_MEMORY_USED, OID_SYS_HOST_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
@@ -178,6 +204,9 @@ module NewRelic
                                            OID_SYS_CLIENTSSL_STAT_CUR_CONNS, OID_SYS_SERVERSSL_STAT_CUR_CONNS],
                                          snmp)
 
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
           metrics["Connections/Current/Client"]     = res[0]
           metrics["Connections/Current/Server"]     = res[1]
           metrics["Connections/Current/Client SSL"] = res[2]
@@ -198,6 +227,9 @@ module NewRelic
         if snmp
           res = gather_snmp_metrics_array([OID_SYS_STAT_CLIENT_TOT_CONNS, OID_SYS_STAT_SERVER_TOT_CONNS], snmp)
 
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
           metrics["Connections/Rate/Client"] = res[0]
           metrics["Connections/Rate/Server"] = res[1]
         end
@@ -218,6 +250,9 @@ module NewRelic
                                            OID_SYS_STAT_SERVER_BYTES_IN, OID_SYS_STAT_SERVER_BYTES_OUT],
                                            snmp)
 
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
           metrics["Throughput/Client/In"]  = (res[0].to_f * 8)
           metrics["Throughput/Client/Out"] = (res[1].to_f * 8)
           metrics["Throughput/Server/In"]  = (res[2].to_f * 8)
@@ -243,6 +278,9 @@ module NewRelic
                                            OID_SYS_HTTP_STAT_V9_REQS,     OID_SYS_HTTP_STAT_V10_REQS, OID_SYS_HTTP_STAT_V11_REQS],
                                          snmp)
 
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
           metrics["HTTP/Method/All"]           = res[0]
           metrics["HTTP/Method/Get"]           = res[1]
           metrics["HTTP/Method/Post"]          = res[2]
@@ -269,6 +307,9 @@ module NewRelic
                                            OID_SYS_HTTP_STAT_RESP_BUCKET_16K, OID_SYS_HTTP_STAT_RESP_BUCKET_32K],
                                          snmp)
 
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
           metrics["HTTP/Response Code/2xx"]        = res[0]
           metrics["HTTP/Response Code/3xx"]        = res[1]
           metrics["HTTP/Response Code/4xx"]        = res[2]
@@ -308,7 +349,11 @@ module NewRelic
                                            OID_SYS_HTTP_COMPRESSION_STAT_OTHER_PRECOMPRESS_BYTES, OID_SYS_HTTP_COMPRESSION_STAT_OTHER_POSTCOMPRESS_BYTES],
                                          snmp)
 
-          vals = res.map { |i| i.to_f * 8 } # Convert to bits
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
+          vals = bytes_to_bits(res)
+
           metrics["HTTP/Compression/Total/Pre"]       = vals[0]
           metrics["HTTP/Compression/Total/Post"]      = vals[1]
           metrics["HTTP/Compression/HTML/Pre"]        = vals[2]
@@ -352,6 +397,9 @@ module NewRelic
                                            OID_SYS_SERVERSSL_STAT_TOT_NATIVE_CONNS, OID_SYS_SERVERSSL_STAT_TOT_COMPAT_CONNS],
                                            snmp)
 
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
           vals = res.map { |i| i.to_i }
 
           metrics["SSL/Global/Client/Native"] = vals[0]
@@ -379,6 +427,9 @@ module NewRelic
                                            OID_SYS_TCP_STAT_TIME_WAIT],
                                          snmp)
 
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
           metrics["TCP/Connection State/Open"]       = res[0]
           metrics["TCP/Connection State/Wait/Close"] = res[1]
           metrics["TCP/Connection State/Wait/FIN"]   = res[2]
@@ -399,6 +450,9 @@ module NewRelic
         if snmp
           res = gather_snmp_metrics_array([OID_SYS_TCP_STAT_ACCEPTS], snmp)
 
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
           metrics["TCP/Accepts"] = res[0]
         end
 

data/lib/newrelic_f5_plugin/util.rb

@@ -65,13 +65,43 @@ def gather_snmp_metrics_array(oids, snmp)
 
   if snmp
     begin
-      metrics = snmp.get_value(oids)
+      metrics = snmp.get_value(oids).map do |val|
+        # If an OID is missing, just return zero for that metric
+        if val.to_s == 'noSuchObject'
+          0
+        else
+          val
+        end
+      end
     rescue Exception => e
       NewRelic::PlatformLogger.error("Unable to gather SNMP metrics with error: #{e}")
-      return
     end
   end
 
   return metrics
 end
 
+
+#
+# Convert bytes to bits
+#
+def bytes_to_bits(vals)
+  ret = nil
+
+  if vals.class == Array
+    ret = vals.map { |i| i.to_f * 8 }
+  elsif vals.class == Hash
+    ret = { }
+    vals.keys.each do |k,v|
+      if v.nil?
+        ret[k] = v
+      else
+        ret[k] = v.to_f * 8
+      end
+    end
+  end
+
+  return ret
+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.6'
-  s.date              = '2013-10-23'
+  s.version           = '1.0.7'
+  s.date              = '2013-10-28'
   s.rubyforge_project = 'newrelic_f5_plugin'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newrelic_f5_plugin
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_plugin