circonus 3.6.3 → 3.6.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (2) hide show
  1. data/bin/circonus-add-http-check +3 -1
  2. metadata +2 -2
@@ -12,11 +12,13 @@ host = nil
12
12
  options[:url] = nil
13
13
  options[:timeout] = 10 # seconds
14
14
  options[:texttomatch] = nil
15
+ options[:subcomponents] = []
15
16
  options[:tags] = ['application:http','source:manual']
16
17
  opts.banner = "Usage: #{File.basename($0)}\n"
17
18
  opts.on( '--tags TAGLIST',"Apply comma separated list of tags (default: empty list)" ) { |t| options[:tags] += t.split(/,/) }
18
19
  opts.on( '--brokers BROKER',"Comma separated list of broker names to use" ) { |t| options[:brokers] = t.split(',') }
19
20
  opts.on( '--hostname HOSTNAME',"Hostname to add" ) { |t| options[:hostname] = t }
21
+ opts.on( '--uniqueid STRING',"For checks with the same hostname, uniquely identify the check" ) { |t| options[:subcomponents] += [t] }
20
22
  opts.on( '--timeout TIMEOUT',"Host timeout" ) { |t| options[:timeout] = t.to_i }
21
23
  opts.on( '--match TEXTTOMATCH',"String to match against in the response" ) { |t| options[:texttomatch] = t }
22
24
  opts.on( '--contactgroups CONTACTGROUPS',"Comma separated list of contact groups to send alerts to" ) { |t| options[:contactgroups] = t }
@@ -95,7 +97,7 @@ bundle = bundle_stub.clone
95
97
  bundle['brokers'] = brokers.values.sort
96
98
  bundle['target'] = @cu.options[:hostname]
97
99
  bundle['tags'] = @cu.options[:tags]
98
- bundle['display_name'] = "#{@cu.options[:hostname]} http"
100
+ bundle['display_name'] = ([@cu.options[:hostname],'http'] + @cu.options[:subcomponents]).join(' ')
99
101
  bundle['config']['url'] = @cu.options[:url]
100
102
  bundle['config']['body'] = @cu.options[:texttomatch] unless @cu.options[:texttomatch].nil?
101
103
  bundle['config']['header_Host'] = @cu.options[:hostname]
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: circonus
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.6.3
4
+ version: 3.6.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-09-02 00:00:00.000000000 Z
12
+ date: 2014-09-04 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rest-client