wavefront-client 3.5.2 → 3.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9396cafd5d5f3e458c9147b3e381fc11f3dee48d
-  data.tar.gz: 936de304d4419dd50a5c23dc0f6003e8f9e50841
+  metadata.gz: beeb02e2fa86d2049cf941fe782f4a57aff4320a
+  data.tar.gz: 1a7fc2bdf6fd1f8015856519daee209889199377
 SHA512:
-  metadata.gz: 93c35116bd36d60d178289c31126c4743f6ff69e690782e0826ef25a3a0682d123762f6791acbd85e3415ad899fb854baa53a64dc79cbaa0262e65a10cecbe4d
-  data.tar.gz: 478854bc64520703ea2cf5694b918c3f43fa2788a5699462407e9fe028c04496ebe77d9bc8f22eab1a82371489122f7e466bb3413e63048cfc2cf5e816bfc62a
+  metadata.gz: 0f3b60f1c518d9dae1cce42fe8b246c2f60d561008ef6ce941029db9d1ad029f61994e1fd102da4583729f574e2687b7fd22f9ef01affab80b6de1866cf9a25b
+  data.tar.gz: a3a604a315860308f795c813abfe45a3cd0cf9c9d50d8c85529429a5f854a0c2742b58f81bef024d2f9025c70096a10c62a968c46f3716f65cf6d7cf209c808d

data/bin/wavefront

@@ -46,6 +46,7 @@ Global options:
   -c, --config=FILE    path to configuration file [default: #{DEF_CF}]
   -P, --profile=NAME   profile in configuration file [default: default]
   -D, --debug          enable debug mode
+  -V, --verbose        be verbose
   -h, --help           show this message
 )
 
@@ -55,7 +56,7 @@ Global options:
 usage = {
 ts: %(
 Usage:
-  #{ME} ts [-c file] [-P profile] [-E endpoint] [-t token] [-OD]
+  #{ME} ts [-c file] [-P profile] [-E endpoint] [-t token] [-ODV]
             [-S | -m | -H | -d] [-s time] [-e time] [-f format] [-p num]
             [-X bool] <query>
 #{global_opts}
@@ -81,7 +82,7 @@ Options:
 
 alerts: %(
 Usage:
-  #{ME} alerts [-c file] [-P profile] [-E endpoint] [-t token]
+  #{ME} alerts [-c file] [-P profile] [-E endpoint] [-t token] [-V]
             [-f format] [-p tag] [ -s tag] <state>
 #{global_opts}
 Options:
@@ -108,7 +109,6 @@ Usage:
 #{global_opts}
 Options:
   -i, --instant        create an instantaneous event
-  -V, --verbose        be verbose
   -s, --start=TIME     time at which event begins
   -e, --end=TIME       time at which event ends
   -l, --level=LEVEL    level of event (#{EVENT_LEVELS.join(', ')})
@@ -139,7 +139,6 @@ Options:
   -m, --metric=STRING  the metric path to which contents of a file will be
                        assigned. If the file contains a metric name, the two
                        will be concatenated
-  -V, --verbose        be verbose
 
 Files are whitespace separated, and fields can be defined with the -F
 option.  Use 't' for timestamp; 'm' for metric name; 'v' for value
@@ -147,19 +146,19 @@ and 'T' for tags. Put 'T' last.
 ),
 source: %(
 Usage:
-  #{ME} source list [-c file] [-P profile] [-E endpoint] [-t token]
+  #{ME} source list [-c file] [-P profile] [-E endpoint] [-t token] [-V]
            [-f format] [-T tag ...] [-at] [-s source] [-l limit] <pattern>
-  #{ME} source show [-c file] [-P profile] [-E endpoint] [-t token]
+  #{ME} source show [-c file] [-P profile] [-E endpoint] [-t token] [-V]
            [-f format] <host> ...
   #{ME} source describe [-c file] [-P profile] [-E endpoint] [-t token]
-           [-H host ... ] <description>
+           [-V] [-H host ... ] <description>
   #{ME} source undescribe [-c file] [-P profile] [-E endpoint] [-t token]
-           [<host>] ...
+           [-V] [<host>] ...
   #{ME} source tag add [-c file] [-P profile] [-E endpoint] [-t token]
-           [-H host ... ] <tag> ...
+           [-V] [-H host ... ] <tag> ...
   #{ME} source tag delete [-c file] [-P profile] [-E endpoint] [-t token]
-           [-H host ... ] <tag> ...
-  #{ME} source untag [-c file] [-P profile] [-E endpoint] [-t token]
+           [-V] [-H host ... ] <tag> ...
+  #{ME} source untag [-c file] [-P profile] [-E endpoint] [-t token] [-V]
            [<host>] ...
   #{ME} source --help
 #{global_opts}

data/lib/wavefront/cli/sources.rb

@@ -10,7 +10,8 @@ class Wavefront::Cli::Sources < Wavefront::Cli
   attr_accessor :wf, :out_format, :show_hidden, :show_tags
 
   def setup_wf
-    @wf = Wavefront::Metadata.new(options[:token])
+    @wf = Wavefront::Metadata.new(options[:token], options[:endpoint],
+                                 false, { verbose: options[:verbose] })
   end
 
   def run

data/lib/wavefront/client/version.rb

@@ -16,6 +16,6 @@ See the License for the specific language governing permissions and
 
 module Wavefront
   class Client
-    VERSION = "3.5.2"
+    VERSION = "3.5.3"
   end
 end

data/lib/wavefront/metadata.rb

@@ -40,14 +40,16 @@ module Wavefront
     include Wavefront::Validators
     DEFAULT_PATH = '/api/manage/source/'.freeze
 
-    attr_reader :headers, :host
+    attr_reader :headers, :host, :verbose, :endpoint
 
-    def initialize(token, host=DEFAULT_HOST, debug=false)
+    def initialize(token, host=DEFAULT_HOST, debug=false, options = {})
       #
       # 'host' is the Wavefront API endpoint
       #
       @headers = {'X-AUTH-TOKEN' => token}
       @base_uri = URI::HTTPS.build(:host => host, :path => DEFAULT_PATH)
+      @endpoint = host
+      @verbose = options[:verbose] || false
       debug(debug)
     end
 
@@ -193,7 +195,7 @@ module Wavefront
     private
 
     def build_uri(path_ext = '', options = {})
-      options[:host] ||= DEFAULT_HOST
+      options[:host] ||= endpoint
       options[:path] ||= DEFAULT_PATH
 
       URI::HTTPS.build(
@@ -204,14 +206,17 @@ module Wavefront
     end
 
     def call_get(uri)
+      puts "GET #{uri.to_s}" if verbose
       RestClient.get(uri.to_s, headers)
     end
 
     def call_delete(uri)
+      puts "DELETE #{uri.to_s}" if verbose
       RestClient.delete(uri.to_s, headers)
     end
 
     def call_post(uri, query = nil)
+      puts "POST #{uri.to_s} #{query}" if verbose
       h = headers
 
       RestClient.post(uri.to_s, query,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-client
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 3.5.3
 platform: ruby
 authors:
 - Sam Pointer
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler