newrelic_f5_plugin 1.0.12 → 1.0.15

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f4de3101ffe13d4eeb48b77722e6d0ede0d22ad6
+  data.tar.gz: 209080c82f5e16c92bacb4d35c204404d02865cb
+SHA512:
+  metadata.gz: 5796767f4c3461ff54ac392c3e6efde4d744fadf5d3b7f2743ce50345221d49cb40261309d7d10efce038a73e9f98197a346b3fa63c3c3119f13f81ad6daa6f1
+  data.tar.gz: 96db6ecf6410ae9a21a6bccfafb007cd44b6dc22e4e65cf0d9ec3b996d059147a76b9402b4ddd2b7b350e4845aa7b1663c386f532f8ec54673ceb2e6da0a8322

data/CHANGES

@@ -1,3 +1,17 @@
+* 1.0.15
+  - Fix bug in 1.0.14 where pool data collection was multiplied by 8 twice
+
+* 1.0.14
+  - Refactored the agent code so each module is more self contained
+  - Limit data reported for Virtuals and Pools to the top 150
+
+* 1.0.13
+  - Added more global TCP statistics:
+    - Received error rates: Bad Checksums, and Resets
+    - Segments: Retransmitted, RX Out of Order, and RX Malformed
+    - SYN-Cookies: Received, Bad, and Cache overflows
+    - Connections Failed, Expired, and Abandoned
+
 * 1.0.12
   - Added Virtual Servers and Pools statistics:
     - Inbound Packets per second

data/README.rdoc

@@ -68,6 +68,17 @@ SNMP version 2c is supported.
 
       f5_monitor run
 
+== Additional Configuration
+
+To configure proxy settings, add to the newrelic_plugin.yml file:
+
+      newrelic:
+        proxy:
+          address: PROXY_ADDRESS
+          port: PROXY_PORT
+          user: PROXY_USER
+          password: PROXY_PASSWORD
+
 == Installation with Chef/Puppet
 
 The F5 plugin can also be installed with {Chef}[http://www.getchef.com] and {Puppet}[http://puppetlabs.com]. For Chef and Puppet support see the New Relic plugin's {Chef Cookbook}[http://community.opscode.com/cookbooks/newrelic_plugins] and {Puppet Module}[https://forge.puppetlabs.com/newrelic/newrelic_plugins].
@@ -83,3 +94,7 @@ Additional information on using Chef and Puppet with New Relic is available in N
 
 3. Run <b><tt>rake -T</tt></b> to see rake options, including tests.
 
+
+== Contributing
+
+You are welcome to send pull requests to us - however, by doing so you agree that you are granting New Relic a non-exclusive, non-revokable, no-cost license to use the code, algorithms, patents, and ideas in that code in our products if we so choose. You also agree the code is provided as-is and you provide no warranties as to its fitness or correctness for any purpose.

data/lib/newrelic_f5_plugin/agent.rb

@@ -4,7 +4,7 @@ require 'newrelic_plugin'
 require 'snmp'
 
 module NewRelic::F5Plugin
-  VERSION = '1.0.12'
+  VERSION = '1.0.15'
 
   # Register and run the agent
   def self.run
@@ -72,214 +72,42 @@ module NewRelic::F5Plugin
       end
 
 
-      #
       # 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?
-
-      system_memory = system.get_memory
-      system_memory.each_key { |m| report_metric m, "bytes", system_memory[m] } unless system_memory.nil?
-
-      system_connections = system.get_connections
-      system_connections.each_key { |m| report_metric m, "conn", system_connections[m] } unless system_connections.nil?
-
-      system_connection_rates = system.get_connection_rates
-      system_connection_rates.each_key { |m| report_counter_metric m, "conn/sec", system_connection_rates[m] } unless system_connection_rates.nil?
-
-      system_throughput = system.get_throughput
-      system_throughput.each_key { |m| report_counter_metric m, "bits/sec", system_throughput[m] } unless system_throughput.nil?
-
-      system_http_reqs = system.get_http_requests
-      system_http_reqs.each_key { |m| report_counter_metric m, "req/sec", system_http_reqs[m] } unless system_http_reqs.nil?
+      NewRelic::PlatformLogger.debug("Collecting System stats")
+      @system ||= NewRelic::F5Plugin::Device.new
+      @system.poll(self, snmp)
 
-      system_http_resp = system.get_http_responses
-      system_http_resp.each_key { |m| report_counter_metric m, "resp/sec", system_http_resp[m] } unless system_http_resp.nil?
-
-      system_http_compression = system.get_http_compression
-      system_http_compression.each_key { |m| report_counter_metric m, "bits/sec", system_http_compression[m] } unless system_http_compression.nil?
-
-      system_ssl = system.get_ssl
-      system_ssl.each_key { |m| report_counter_metric m, "trans/sec", system_ssl[m] } unless system_ssl.nil?
-
-      system_tcp_conns = system.get_tcp_connections
-      system_tcp_conns.each_key { |m| report_metric m, "conn", system_tcp_conns[m] } unless system_tcp_conns.nil?
-
-      system_tcp_conn_rates = system.get_tcp_connection_rates
-      system_tcp_conn_rates.each_key { |m| report_counter_metric m, "conn/sec", system_tcp_conn_rates[m] } unless system_tcp_conn_rates.nil?
-
-      #
       # Node stats
-      #
       NewRelic::PlatformLogger.debug("Collecting Node stats")
-      nodes = NewRelic::F5Plugin::Nodes.new snmp
-      node_status = nodes.get_status
-      node_status.each_key { |m| report_metric m, node_status[m][:label], node_status[m][:count] } unless node_status.nil?
+      @nodes ||= NewRelic::F5Plugin::Nodes.new
+      @nodes.poll(self, snmp)
 
-      #
       # Collect virtual server statistics
-      #
       NewRelic::PlatformLogger.debug("Collecting Virtual Server stats")
-      vs = NewRelic::F5Plugin::Virtuals.new snmp
+      @virtuals ||= NewRelic::F5Plugin::Virtuals.new
+      @virtuals.poll(self, snmp)
 
-      unless vs.get_names.empty?
-        virtual_requests = vs.get_requests
-        virtual_requests.each_key { |m| report_counter_metric m, "req/sec", virtual_requests[m] } unless virtual_requests.nil?
-
-        virtual_conns_current = vs.get_conns_current
-        virtual_conns_current.each_key { |m| report_metric m, "conns", virtual_conns_current[m] } unless virtual_conns_current.nil?
-
-        virtual_conns_total = vs.get_conns_total
-        virtual_conns_total.each_key { |m| report_counter_metric m, "conn/sec", virtual_conns_total[m] } unless virtual_conns_total.nil?
-
-        virtual_packets_in = vs.get_packets_in
-        virtual_packets_in.each_key { |m| report_counter_metric m, "packets/sec", virtual_packets_in[m] } unless virtual_packets_in.nil?
-
-        virtual_packets_out = vs.get_packets_out
-        virtual_packets_out.each_key { |m| report_counter_metric m, "packets/sec", virtual_packets_out[m] } unless virtual_packets_out.nil?
-
-        virtual_throughput_in = vs.get_throughput_in
-        virtual_throughput_in.each_key { |m| report_counter_metric m, "bits/sec", virtual_throughput_in[m] } unless virtual_throughput_in.nil?
-
-        virtual_throughput_out = vs.get_throughput_out
-        virtual_throughput_out.each_key { |m| report_counter_metric m, "bits/sec", virtual_throughput_out[m] } unless virtual_throughput_out.nil?
-
-        virtual_cpu_usage_1m = vs.get_cpu_usage_1m
-        virtual_cpu_usage_1m.each_key { |m| report_metric m, "%", virtual_cpu_usage_1m[m] } unless virtual_cpu_usage_1m.nil?
-      end
-
-      #
       # Collect pool statistics
-      #
       NewRelic::PlatformLogger.debug("Collecting Pool stats")
-      pool = NewRelic::F5Plugin::Pools.new snmp
-
-      unless pool.get_names.empty?
-        pool_requests = pool.get_requests
-        pool_requests.each_key { |m| report_counter_metric m, "req/sec", pool_requests[m] } unless pool_requests.nil?
-
-        pool_conns_current = pool.get_conns_current
-        pool_conns_current.each_key { |m| report_metric m, "conns", pool_conns_current[m] } unless pool_conns_current.nil?
-
-        pool_conns_total = pool.get_conns_total
-        pool_conns_total.each_key { |m| report_counter_metric m, "conn/sec", pool_conns_total[m] } unless pool_conns_total.nil?
-
-        pool_packets_in = pool.get_packets_in
-        pool_packets_in.each_key { |m| report_counter_metric m, "packets/sec", pool_packets_in[m] } unless pool_packets_in.nil?
-
-        pool_packets_out = pool.get_packets_out
-        pool_packets_out.each_key { |m| report_counter_metric m, "packets/sec", pool_packets_out[m] } unless pool_packets_out.nil?
-
-        pool_throughput_in = pool.get_throughput_in
-        pool_throughput_in.each_key { |m| report_counter_metric m, "bits/sec", pool_throughput_in[m] } unless pool_throughput_in.nil?
+      @pools ||= NewRelic::F5Plugin::Pools.new
+      @pools.poll(self, snmp)
 
-        pool_throughput_out = pool.get_throughput_out
-        pool_throughput_out.each_key { |m| report_counter_metric m, "bits/sec", pool_throughput_out[m] } unless pool_throughput_out.nil?
-      end
-
-
-      #
       # iRule statistics
-      #
       NewRelic::PlatformLogger.debug("Collecting iRule stats")
-      rule = NewRelic::F5Plugin::Rules.new snmp
-
-      unless rule.get_names.empty?
-        rule_execs = rule.get_executions
-        rule_execs.each_key { |m| report_counter_metric m, "execs/sec", rule_execs[m] } unless rule_execs.nil?
-
-        rule_failures = rule.get_failures
-        rule_failures.each_key { |m| report_counter_metric m, "failures/sec", rule_failures[m] } unless rule_failures.nil?
-
-        rule_aborts = rule.get_aborts
-        rule_aborts.each_key { |m| report_counter_metric m, "aborts/sec", rule_aborts[m] } unless rule_aborts.nil?
-
-        rule_cycles = rule.get_average_cycles
-        rule_cycles.each_key { |m| report_metric m, "cycles", rule_cycles[m] } unless rule_cycles.nil?
-      end
-
+      @rules ||= NewRelic::F5Plugin::Rules.new
+      @rules.poll(self, snmp)
 
-      #
       # Collect snat pool statistics
-      #
       NewRelic::PlatformLogger.debug("Collecting SNAT Pool stats")
-      snatpool = NewRelic::F5Plugin::SnatPools.new snmp
-
-      unless snatpool.get_names.empty?
-        snatpool_conns_max = snatpool.get_conns_max
-        snatpool_conns_max.each_key { |m| report_metric m, "conns", snatpool_conns_max[m] } unless snatpool_conns_max.nil?
-
-        snatpool_conns_current = snatpool.get_conns_current
-        snatpool_conns_current.each_key { |m| report_metric m, "conns", snatpool_conns_current[m] } unless snatpool_conns_current.nil?
-
-        snatpool_conns_total = snatpool.get_conns_total
-        snatpool_conns_total.each_key { |m| report_counter_metric m, "conn/sec", snatpool_conns_total[m] } unless snatpool_conns_total.nil?
-
-        snatpool_throughput_in = snatpool.get_throughput_in
-        snatpool_throughput_in.each_key { |m| report_counter_metric m, "bits/sec", snatpool_throughput_in[m] } unless snatpool_throughput_in.nil?
-
-        snatpool_throughput_out = snatpool.get_throughput_out
-        snatpool_throughput_out.each_key { |m| report_counter_metric m, "bits/sec", snatpool_throughput_out[m] } unless snatpool_throughput_out.nil?
+      @snatpools ||= NewRelic::F5Plugin::SnatPools.new
+      @snatpools.poll(self, snmp)
 
-        snatpool_packets_in = snatpool.get_packets_in
-        snatpool_packets_in.each_key { |m| report_counter_metric m, "pkts/sec", snatpool_packets_in[m] } unless snatpool_packets_in.nil?
-
-        snatpool_packets_out = snatpool.get_packets_out
-        snatpool_packets_out.each_key { |m| report_counter_metric m, "pkts/sec", snatpool_packets_out[m] } unless snatpool_packets_out.nil?
-      end
-
-
-      #
       # Collect Client SSL Profile statistics
-      #
       NewRelic::PlatformLogger.debug("Collecting Client SSL Profile stats")
-      clientssl = NewRelic::F5Plugin::ClientSsl.new snmp
-
-      unless clientssl.get_names.empty?
-        clientssl_conns_current = clientssl.get_conns_current
-        clientssl_conns_current.each_key { |m| report_metric m, "conns", clientssl_conns_current[m] } unless clientssl_conns_current.nil?
-
-        clientssl_session_cache_current = clientssl.get_session_cache_current
-        clientssl_session_cache_current.each_key { |m| report_metric m, "entries", clientssl_session_cache_current[m] } unless clientssl_session_cache_current.nil?
-
-        clientssl_session_cache_hits = clientssl.get_session_cache_hits
-        clientssl_session_cache_hits.each_key { |m| report_counter_metric m, "hits/sec", clientssl_session_cache_hits[m] } unless clientssl_session_cache_hits.nil?
+      @clientssl ||= NewRelic::F5Plugin::ClientSsl.new
+      @clientssl.poll(self, snmp)
 
-        clientssl_session_cache_lookups = clientssl.get_session_cache_lookups
-        clientssl_session_cache_lookups.each_key { |m| report_counter_metric m, "lookups/sec", clientssl_session_cache_lookups[m] } unless clientssl_session_cache_lookups.nil?
-
-        NewRelic::PlatformLogger.debug("Calculating Client SSL Profile hit ratios")
-        clientssl_hit_ratio = { }
-        clientssl_session_cache_hits.each_key do |h|
-          key = h.gsub(/^Client SSL Profiles\/Session Cache Hits\//, '')
-          l = "Client SSL Profiles/Session Cache Lookups/#{key}"
-          p = "Client SSL Profiles/Session Cache Hit Ratio/#{key}"
-          unless clientssl_session_cache_lookups[l].nil?
-            if clientssl_session_cache_lookups[l].to_f > 0
-              clientssl_hit_ratio[p] = (clientssl_session_cache_hits[h].to_f / clientssl_session_cache_lookups[l].to_f) * 100
-            else
-              clientssl_hit_ratio[p] = 0.0
-            end
-          end
-        end
-        clientssl_hit_ratio.each_key { |m| report_metric m, "%", clientssl_hit_ratio[m] } unless clientssl_hit_ratio.empty?
-
-        clientssl_session_cache_overflows = clientssl.get_session_cache_overflows
-        clientssl_session_cache_overflows.each_key { |m| report_counter_metric m, "overflows/sec", clientssl_session_cache_overflows[m] } unless clientssl_session_cache_overflows.nil?
-
-        clientssl_session_cache_invalidations = clientssl.get_session_cache_invalidations
-        clientssl_session_cache_invalidations.each_key { |m| report_counter_metric m, "invld/sec", clientssl_session_cache_invalidations[m] } unless clientssl_session_cache_invalidations.nil?
-      end
-
-
-      #
       # Cleanup snmp connection
-      #
       snmp.close
     end
 

data/lib/newrelic_f5_plugin/client_ssl.rb

@@ -105,6 +105,48 @@ module NewRelic
       end
 
 
+      #
+      # Perform polling and reportings of metrics
+      #
+      def poll(agent, snmp)
+        @snmp_manager = snmp
+
+        unless get_names.empty?
+          clientssl_conns_current = get_conns_current
+          clientssl_conns_current.each_key { |m| agent.report_metric m, "conns", clientssl_conns_current[m] } unless clientssl_conns_current.nil?
+
+          clientssl_session_cache_current = get_session_cache_current
+          clientssl_session_cache_current.each_key { |m| agent.report_metric m, "entries", clientssl_session_cache_current[m] } unless clientssl_session_cache_current.nil?
+
+          clientssl_session_cache_hits = get_session_cache_hits
+          clientssl_session_cache_hits.each_key { |m| agent.report_counter_metric m, "hits/sec", clientssl_session_cache_hits[m] } unless clientssl_session_cache_hits.nil?
+
+          clientssl_session_cache_lookups = get_session_cache_lookups
+          clientssl_session_cache_lookups.each_key { |m| agent.report_counter_metric m, "lookups/sec", clientssl_session_cache_lookups[m] } unless clientssl_session_cache_lookups.nil?
+
+          NewRelic::PlatformLogger.debug("Calculating Client SSL Profile hit ratios")
+          clientssl_hit_ratio = { }
+          clientssl_session_cache_hits.each_key do |h|
+            key = h.gsub(/^Client SSL Profiles\/Session Cache Hits\//, '')
+            l = "Client SSL Profiles/Session Cache Lookups/#{key}"
+            p = "Client SSL Profiles/Session Cache Hit Ratio/#{key}"
+            unless clientssl_session_cache_lookups[l].nil?
+              if clientssl_session_cache_lookups[l].to_f > 0
+                clientssl_hit_ratio[p] = (clientssl_session_cache_hits[h].to_f / clientssl_session_cache_lookups[l].to_f) * 100
+              else
+                clientssl_hit_ratio[p] = 0.0
+              end
+            end
+          end
+          clientssl_hit_ratio.each_key { |m| agent.report_metric m, "%", clientssl_hit_ratio[m] } unless clientssl_hit_ratio.empty?
+
+          clientssl_session_cache_overflows = get_session_cache_overflows
+          clientssl_session_cache_overflows.each_key { |m| agent.report_counter_metric m, "overflows/sec", clientssl_session_cache_overflows[m] } unless clientssl_session_cache_overflows.nil?
+
+          clientssl_session_cache_invalidations = get_session_cache_invalidations
+          clientssl_session_cache_invalidations.each_key { |m| agent.report_counter_metric m, "invld/sec", clientssl_session_cache_invalidations[m] } unless clientssl_session_cache_invalidations.nil?
+        end
+      end
 
       #
       # Get the list of iRule names

data/lib/newrelic_f5_plugin/device.rb

@@ -7,7 +7,7 @@ module NewRelic
   module F5Plugin
 
     class Device
-      attr_accessor :vs_names, :snmp_manager
+      attr_accessor :snmp_manager
 
       # Create the OIDs if they do not exist
       OID_SYS_CLIENTSSL_STAT_CUR_CONNS                       = "1.3.6.1.4.1.3375.2.1.1.2.9.2.0"
@@ -118,6 +118,62 @@ module NewRelic
         end
       end
 
+
+
+      #
+      # Perform polling and reportings of metrics
+      #
+      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?
+
+        system_connections = get_connections
+        system_connections.each_key { |m| agent.report_metric m, "conn", system_connections[m] } unless system_connections.nil?
+
+        system_connection_rates = get_connection_rates
+        system_connection_rates.each_key { |m| agent.report_counter_metric m, "conn/sec", system_connection_rates[m] } unless system_connection_rates.nil?
+
+        system_throughput = get_throughput
+        system_throughput.each_key { |m| agent.report_counter_metric m, "bits/sec", system_throughput[m] } unless system_throughput.nil?
+
+        system_http_reqs = get_http_requests
+        system_http_reqs.each_key { |m| agent.report_counter_metric m, "req/sec", system_http_reqs[m] } unless system_http_reqs.nil?
+
+        system_http_resp = get_http_responses
+        system_http_resp.each_key { |m| agent.report_counter_metric m, "resp/sec", system_http_resp[m] } unless system_http_resp.nil?
+
+        system_http_compression = get_http_compression
+        system_http_compression.each_key { |m| agent.report_counter_metric m, "bits/sec", system_http_compression[m] } unless system_http_compression.nil?
+
+        system_ssl = get_ssl
+        system_ssl.each_key { |m| agent.report_counter_metric m, "trans/sec", system_ssl[m] } unless system_ssl.nil?
+
+        system_tcp_conns = get_tcp_connections
+        system_tcp_conns.each_key { |m| agent.report_metric m, "conn", system_tcp_conns[m] } unless system_tcp_conns.nil?
+
+        system_tcp_conn_rates = get_tcp_connection_rates
+        system_tcp_conn_rates.each_key { |m| agent.report_counter_metric m, "conn/sec", system_tcp_conn_rates[m] } unless system_tcp_conn_rates.nil?
+
+        system_tcp_syn_rates = get_tcp_syn_rates
+        system_tcp_syn_rates.each_key { |m| agent.report_counter_metric m, "SYN/sec", system_tcp_syn_rates[m] } unless system_tcp_syn_rates.nil?
+
+        system_tcp_segment_rates = get_tcp_segment_rates
+        system_tcp_segment_rates.each_key { |m| agent.report_counter_metric m, "segments/sec", system_tcp_segment_rates[m] } unless system_tcp_segment_rates.nil?
+
+        system_tcp_error_rates = get_tcp_error_rates
+        system_tcp_error_rates.each_key { |m| agent.report_counter_metric m, "errs/sec", system_tcp_error_rates[m] } unless system_tcp_error_rates.nil?
+      end
+
+
+
       #
       # Gather Version information
       #
@@ -440,6 +496,75 @@ module NewRelic
       end
 
 
+      #
+      # Gather TCP Segment statistics
+      #
+      def get_tcp_segment_rates(snmp = nil)
+        metrics = { }
+        snmp    = snmp_manager unless snmp
+
+        if snmp
+          res = gather_snmp_metrics_array([OID_SYS_TCP_STAT_RXBADSEG, OID_SYS_TCP_STAT_RXOOSEG,
+                                           OID_SYS_TCP_STAT_TXREXMITS],
+                                         snmp)
+
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
+          metrics["TCP/Segments/Received Malformed"]    = res[0]
+          metrics["TCP/Segments/Received Out of Order"] = res[1]
+          metrics["TCP/Segments/Retransmitted"]         = res[2]
+        end
+
+        return metrics
+      end
+
+
+      #
+      # Gather TCP Error statistics
+      #
+      def get_tcp_error_rates(snmp = nil)
+        metrics = { }
+        snmp    = snmp_manager unless snmp
+
+        if snmp
+          res = gather_snmp_metrics_array([OID_SYS_TCP_STAT_RXRST, OID_SYS_TCP_STAT_RXBADSUM], snmp)
+
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
+          metrics["TCP/Errors/Received/Resets"]                = res[0]
+          metrics["TCP/Errors/Received/Bad Checksums"]         = res[1]
+        end
+
+        return metrics
+      end
+
+
+      #
+      # Gather TCP Syn statistics
+      #
+      def get_tcp_syn_rates(snmp = nil)
+        metrics = { }
+        snmp    = snmp_manager unless snmp
+
+        if snmp
+          res = gather_snmp_metrics_array([OID_SYS_TCP_STAT_RXCOOKIE, OID_SYS_TCP_STAT_RXBADCOOKIE,
+                                           OID_SYS_TCP_STAT_SYNCACHEOVER],
+                                         snmp)
+
+          # Bail out if we didn't get anything
+          return metrics if res.empty?
+
+          metrics["TCP/SYN/Received SYN-Cookies"] = res[0]
+          metrics["TCP/SYN/Bad SYN-Cookies"]      = res[1]
+          metrics["TCP/SYN/SYN-cache Overflows"]  = res[2]
+        end
+
+        return metrics
+      end
+
+
       #
       # Gather TCP Statistics in conn/sec
       #
@@ -448,12 +573,20 @@ module NewRelic
         snmp    = snmp_manager unless snmp
 
         if snmp
-          res = gather_snmp_metrics_array([OID_SYS_TCP_STAT_ACCEPTS], snmp)
+          res = gather_snmp_metrics_array([OID_SYS_TCP_STAT_ACCEPTS,  OID_SYS_TCP_STAT_ACCEPTFAILS,
+                                           OID_SYS_TCP_STAT_CONNECTS, OID_SYS_TCP_STAT_CONNFAILS,
+                                           OID_SYS_TCP_STAT_EXPIRES,  OID_SYS_TCP_STAT_ABANDONS],
+                                         snmp)
 
           # Bail out if we didn't get anything
           return metrics if res.empty?
 
-          metrics["TCP/Accepts"] = res[0]
+          metrics["TCP/Accepts"]                 = res[0]
+          metrics["TCP/Accept Fails"]            = res[1]
+          metrics["TCP/Connections/Established"] = res[2]
+          metrics["TCP/Connections/Failed"]      = res[3]
+          metrics["TCP/Connections/Expired"]     = res[4]
+          metrics["TCP/Connections/Abandoned"]   = res[5]
         end
 
         return metrics