circonus 3.4.2 → 3.4.3

data/examples/add_nginx_node.rb

@@ -1,19 +1,30 @@
 #!/usr/bin/env ruby
 # Add a single nginx host to circonus
 
-require 'rubygems'
-require 'circonus'
-require 'optparse'
-require "#{ENV['HOME']}/.circonus.rb"
+require 'circonusutil'
 
-def do_update_check_bundle(data)
-  search_check_bundle = @c.list_check_bundle({'display_name' => data['display_name']})
+host = nil
+cu = CirconusUtil.new() { |opts,options|
+  options[:broker] = nil
+  options[:tags] = ['application:nginx']
+  opts.banner = "Usage: #{File.basename($0)} hostname\n"
+  opts.on( '--tags TAGLIST',"Apply comma separated list of tags (default: empty list)" ) { |t| options[:tags] += options[:tags] + t.split(/,/) }
+  opts.on( '--broker BROKER',"Name of the broker to use" ) { |t| options[:broker] = t }
+}
+if ARGV.empty? then
+  puts "Missing hostname!"
+  exit -1
+end
+host = ARGV.pop
+
+def do_update_check_bundle(cu,data)
+  search_check_bundle = cu.circonus.list_check_bundle({'display_name' => data['display_name']})
   existing = false
   if search_check_bundle.any? # already exists...
     existing = true
-    r = @c.update_check_bundle(search_check_bundle.first['_cid'],data)
+    r = cu.circonus.update_check_bundle(search_check_bundle.first['_cid'],data)
   else
-    r = @c.add_check_bundle(data)
+    r = cu.circonus.add_check_bundle(data)
   end
   if not r.nil? then
     pp r
@@ -21,39 +32,13 @@ def do_update_check_bundle(data)
   end
 end
 
-
-options = {}
-options[:tags] = []
-OptionParser.new { |opts|
-  opts.banner = "Usage: #{File.basename($0)} [-h] hostname [-t tag1,tag2,...]\n"
-  opts.on( '-h', '--help', "This usage menu") do
-    puts opts
-    exit
-  end
-  opts.on( '-t','--tags TAGLIST',"Apply comma separated list of tags" ) do |t|
-    options[:tags] += t.split(/,/)
-  end
-}.parse!
-
-def usage()
-  print <<EOF
-  Usage: #{File.basename($0)} hostname [-t tag1,tag2,... ]
-    -h,--help        This usage menu
-    -t,--tags        Comma separated list of tag names to apply (default is an empty list)
-EOF
-end
-
-host = ARGV[0]
-if host.nil? then
-  usage()
+agents = cu.circonus.list_broker({'_name'=>cu.options[:broker]})
+agentid = agents.select { |a| a['_name'] == cu.options[:broker] }.first['_cid']
+if agentid.nil?
+  puts "Missing agent id!"
   exit -1
 end
 
-@c = Circonus.new(@apitoken,@appname,@agent)
-
-agents = @c.list_broker
-agentid = agents.select { |a| a['_name'] == @agent }.first['_cid']
-
 print "Adding nginx for host #{host}\n"
 data = {
   :agent_id => agentid,
@@ -63,7 +48,7 @@ data = {
 bundle = {
   "type" => "nginx",
   "target" => host,
-  "tags" => options[:tags],
+  "tags" => cu.options[:tags],
   "timeout" => 10,
   "period" => 60,
   "display_name" => "#{host} nginx",
@@ -83,5 +68,5 @@ bundle = {
   }
 end
 
-do_update_check_bundle(bundle)
+do_update_check_bundle(cu,bundle)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circonus
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
   prerelease: 
 platform: ruby
 authors: