circonus 3.1.5 → 3.3.0

data/bin/circonus-add-composite

@@ -0,0 +1,58 @@
+#!/usr/bin/env ruby
+# Add a composite metric given a set of tags to filter on
+
+require 'circonusutil'
+cu = CirconusUtil.new() { |opts,options|
+  options[:tags] = ['application:composite']
+  options[:filter] = []
+  options[:stats] = 'mean'
+  options[:metric] = 'average'
+  options[:name] = nil
+  opts.on( '--tags TAGLIST',"Apply comma separated list of tags (default: empty list)" ) { |t| options[:tags] += t.split(/,/) }
+  opts.on( '--filter TAGLIST',"Apply comma separated list of tags to filter on" ) { |t| options[:filter] += t.split(/,/) }
+  opts.on( '--stats TYPE',"Take the sum/mean/min/etc.. of the group of stats (default: mean)" ) { |t| options[:stats] = t }
+  opts.on( '--metric TYPE',"The type (counter/average/etc..) of the datapoint (default: average)" ) { |t| options[:metric] = t }
+  opts.on( '--name NAME',"The name of the metric to use." ) { |t| options[:name] = t }
+}
+if cu.options[:filter].empty?
+  puts "Missing filter"
+  exit -1
+end
+if cu.options[:metric].to_s.empty?
+  puts "Missing metric"
+  exit -1
+end
+
+brokers = cu.circonus.list_broker({'_name'=>'composite'})
+bid = brokers.first['_cid']
+
+formula = "stats:#{cu.options[:stats]}(metric:#{cu.options[:metric]}(#{cu.options[:filter].sort.map {|m|'tag:'+m}.join(' and ')}, \"#{cu.options[:name]}\", 60000))"
+display_name = cu.options[:filter].sort.join(' ') + ' ' + cu.options[:name] + ' composite'
+bundle = {
+  "target"=>"composite",
+  "timeout"=>10,
+  "metrics"=> [ {"status"=>"active", "name"=>cu.options[:name], "type"=>"numeric"} ],
+  "brokers"=>[bid],
+  "period"=>60,
+  "display_name"=>display_name,
+  "tags"=> cu.options[:tags],
+  "notes"=>nil,
+  "config"=> {
+    "formula" => formula,
+    "composite_metric_name" => cu.options[:name]
+  },
+  "type"=>"composite"
+}
+puts "Bundle=#{bundle.inspect}"
+bundles = cu.circonus.list_check_bundle({'type'=>'composite','display_name'=>display_name})
+r = nil
+if bundles.any?
+  print "Updating cid=#{bundles.first['_cid']}\n"
+  r = cu.circonus.update_check_bundle(bundles.first['_cid'],bundle)
+else
+  print "Adding bundle\n"
+  r = cu.circonus.add_check_bundle(bundle)
+end
+if not r.nil? then
+  print "Success\n"
+end

data/lib/circonus.rb

@@ -116,7 +116,7 @@ class Circonus
   end
 
   # Not all these are available:
-  %w{ account annotation broker check_bundle contact_group graph rule_set template user worksheet check }.each do |m|
+  %w{ account annotation broker check_bundle contact_group graph metric_cluster rule_set template user worksheet check }.each do |m|
     define_method("list_#{m}".to_sym) do |*filter|
       return list(m,filter.first)
     end

data/lib/circonusutil.rb

@@ -0,0 +1,50 @@
+require 'rubygems'
+require 'circonus'
+require 'optparse'
+class CirconusUtil
+  attr_accessor :options
+  attr_accessor :circonus
+  def add_opts(&optblock)
+    @addl_opts = optblock
+  end
+  def parse_opts()
+    OptionParser.new { |opts|
+      opts.banner = "Usage: #{File.basename($0)}\n"
+      opts.on( '-h', '--help', "This usage menu") do
+        puts opts
+        exit
+      end
+      opts.on( '-a','--appname APPNAME',"Name of application to report to Circonus (default: curl)" ) do |t|
+        @options[:appname] = t
+      end
+      opts.on( '-s','--server APISERVER',"API server to use (default: api.circonus.com)" ) do |t|
+        @options[:apiserver] = t
+      end
+      opts.on( '-t','--token APITOKEN',"API token to use (required in either .circonus.rb or in args" ) do |t|
+        @options[:apitoken] = t
+      end
+      unless @additional_opts.nil?
+        @additional_opts.call(opts,@options)
+      end
+    }.parse!
+    if options[:apitoken].to_s.empty?
+      puts "Missing apitoken!"
+      exit -1
+    end
+  end
+  def connect
+    @circonus = Circonus.new(@options[:apitoken],@options[:appname])
+    @circonus.set_server(@options[:apiserver])
+  end
+  def initialize(&addl_opts)
+    rbfile = "#{ENV['HOME']}/.circonus.rb"
+    require rbfile if File.exist? rbfile
+    @options = {}
+    @options[:apiserver] = @apiserver || "api.circonus.com" # can be something else for Circonus inside product...
+    @options[:appname] = @appname || "curl"
+    @options[:apitoken] = @apitoken
+    @additional_opts = addl_opts
+    self.parse_opts
+    self.connect
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: circonus
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-26 00:00:00.000000000 Z
+date: 2014-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -62,17 +62,20 @@ dependencies:
 description: Wrapper and CLI for Circonus API
 email: david-vv@nicklay.com
 executables:
+- circonus-add-composite
 - circonus-cli
 - circonus-data-cli
 - circonus-delete-host
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/circonusutil.rb
 - lib/circonus.rb
 - bin/circonus-delete-host
 - bin/update_all_composites.rb
 - bin/circonus_list_checkbundle
 - bin/circonus-data-cli
+- bin/circonus-add-composite
 - bin/circonus_list_tags
 - bin/composite_builder.rb
 - bin/circonus-cli
@@ -113,3 +116,4 @@ signing_key:
 specification_version: 3
 summary: Circonus API wrapper and CLI
 test_files: []
+has_rdoc: