newrelic_f5_plugin 1.0.7 → 1.0.8

data/CHANGES

@@ -1,3 +1,7 @@
+* 1.0.8
+  - Changed the name attribute to agent_name as name wasn't being picked up
+    and we don't want to break systems that might have it set.
+
 * 1.0.7
   - Better handling of older versions of BIG-IP (pre 11.3.0)
   - Print F5 version in debug logs

data/bin/f5_monitor

@@ -26,6 +26,7 @@ EOF
   end
 
   opts.on("-h", "--help") do
+    puts "New Relic F5 Plugin version #{NewRelic::F5Plugin::VERSION}"
     puts opts
     if File.basename($0) == File.basename(__FILE__)
       exit 0

data/config/newrelic_plugin.yml

@@ -31,8 +31,12 @@ agents:
   f5:
     # Define one or more instances
     -
-      name:           'My F5'
       hostname:       'my-f5'
       port:           161
       snmp_community: 'public'
+#    -
+#      agent_name:     'Optional Label in New Relic (defaults to hostname)'
+#      hostname:       'my-other-f5'
+#      port:           161
+#      snmp_community: 'public'
 

data/lib/newrelic_f5_plugin/agent.rb

@@ -4,7 +4,7 @@ require 'newrelic_plugin'
 require 'snmp'
 
 module NewRelic::F5Plugin
-  VERSION = '1.0.7'
+  VERSION = '1.0.8'
 
   # Register and run the agent
   def self.run
@@ -27,8 +27,17 @@ module NewRelic::F5Plugin
   class Agent < NewRelic::Plugin::Agent::Base
     agent_guid    'com.newrelic.f5'
     agent_version VERSION
-    agent_config_options :hostname, :port, :snmp_community
-    agent_human_labels('F5') { "#{hostname}" }
+    agent_config_options :hostname, :port, :snmp_community, :agent_name
+    agent_human_labels('F5') { "#{agent_label}" }
+
+    #
+    #
+    #
+    def agent_label
+      return agent_name unless agent_name.nil?
+      return hostname
+    end
+
 
     #
     # Required, but not used

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.7'
-  s.date              = '2013-10-28'
+  s.version           = '1.0.8'
+  s.date              = '2013-12-31'
   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.7
+  version: 1.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-28 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: newrelic_plugin