wavefront-cli 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7e6e0c9d8fddd6df88fbd3f2f3f8410a74f508627b818b95e5eccaeafdcaf06
-  data.tar.gz: ac3fabdf56be3ce5585802ea5459d66a0a37471171460dd7a30bc22cb07d0992
+  metadata.gz: c6829c82ead73104270f19e4f3c06084719720afdc64233f25683940155cef12
+  data.tar.gz: 40530d75b0b5ceb505a5afe9268bcb26036c92cc25114f664ba97662a5639506
 SHA512:
-  metadata.gz: 5a29eb0de9db686d9a4cd4c32beb3c17379a9385fc5532d398af6553aa33406ad06b4637752f5555cc3482f917022ae3ea08f48bc27ff1f4c361048444be1948
-  data.tar.gz: 49d870efddc368949dc08e14da1c740e6200255cb667379918b50ec6ab90dca6b35c2b4bc69226fe2ed55df9a8322c88bedda58081acd31f4d6408306a970d14
+  metadata.gz: 072f0f0bbd20bce99729bf3ff4e1a0a64fa34599677be8972b00c7ce48c8ac0fa88c6e0eb45f95b8f17e7e77039d1c70c4e03aff37f0354e1e587063a5ae4bbb
+  data.tar.gz: 88c1dcd21de080393d131c381c28d98da6624c4a866e4d84ee4694e16ff555f067df52c5993ac33599088015d8e8d70506fd1dbcd59d4095a6a7a38947c5a060

data/HISTORY.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.7.0 (04/07/2018)
+
+* Add a `-i` option to the `report` command, to send delta metrics.
+* Fix delta metrics on the `write` command.
+
 ## 2.6.0 (27/06/2018)
 
 * Anything which can be imported can be imported from STDIN. The CLI

data/lib/wavefront-cli/base_write.rb

@@ -20,7 +20,7 @@ module WavefrontCli
     end
 
     def send_point(p)
-      wf.write(p)
+      call_write(p)
     rescue Wavefront::Exception::InvalidEndpoint
       abort "could not speak to proxy #{options[:proxy]}:#{options[:port]}."
     end
@@ -42,17 +42,23 @@ module WavefrontCli
           process_line(l)
         end
 
-        wf.write(data)
+        call_write(data)
       end
     end
 
+    # A wrapper which lets us send normal points or deltas
+    #
+    def call_write(data)
+      options[:delta] ? wf.write_delta(data) : wf.write(data)
+    end
+
     # Read from standard in and stream points through an open
     # socket. If the user hits ctrl-c, close the socket and exit
     # politely.
     #
     def read_stdin
       open_connection
-      STDIN.each_line { |l| wf.write(process_line(l.strip), false) }
+      STDIN.each_line { |l| call_write(process_line(l.strip), false) }
       close_connection
     rescue SystemExit, Interrupt
       puts 'ctrl-c. Exiting.'

data/lib/wavefront-cli/commands/report.rb

@@ -8,8 +8,9 @@ class WavefrontCommandReport < WavefrontCommandBase
   end
 
   def _commands
-    ["point #{CMN} [-s time] [-H host] [-T tag...] <metric> <value>",
-     "file #{CMN} [-H host] [-F format] [-m metric] [-T tag...] <file>"]
+    ["point #{CMN} [-s time] [-H host] [-T tag...] [-iq] <metric> <value>",
+     "file #{CMN} [-H host] [-F format] [-m metric] [-T tag...] " \
+     '[-iq] <file>']
   end
 
   def _options
@@ -22,14 +23,15 @@ class WavefrontCommandReport < WavefrontCommandBase
      '-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 dot-concatenated, with this value first',
+     '-i, --delta                increment metric by given value',
      "-q, --quiet                don't report the points sent summary " \
      '(unless there were errors)']
   end
 
   def postscript
     'Files are whitespace separated, and fields can be defined ' \
-    "with the '-F' option.  Use 't' for timestamp; 'm' for metric " \
-    "name; 'v' for value, 's' for source, and 'T' for tags. Put 'T' " \
+    "with the '-F' option.  Use 't' for timestamp, 'm' for metric " \
+    "name, 'v' for value, 's' for source, and 'T' for tags. Put 'T' " \
     'last.'.cmd_fold(TW, 0)
   end
 end

data/lib/wavefront-cli/commands/write.rb

@@ -11,9 +11,9 @@ class WavefrontCommandWrite < WavefrontCommandBase
     ['point [-DnViq] [-c file] [-P profile] [-E proxy] [-t time] ' \
      '[-p port] [-H host] [-T tag...] <metric> <value>',
      'file [-DnViq] [-c file] [-P profile] [-E proxy] [-H host] ' \
-     '[-p port] [-F format] [-m metric] [-T tag...] ' \
-     '[-r rate] <file>']
+     '[-p port] [-F format] [-m metric] [-T tag...] <file>']
   end
+
   def _options
     ['-E, --proxy=URI            proxy endpoint',
      '-t, --time=TIME            time of data point (omit to use ' \
@@ -27,15 +27,13 @@ class WavefrontCommandWrite < WavefrontCommandBase
      'the two will be dot-concatenated, with this value first',
      '-i, --delta                increment metric by given value',
      "-q, --quiet                don't report the points sent summary " \
-     '(unless there were errors)',
-     '-r, --rate=INTEGER         throttle point sending to this many ' \
-     'points per second']
+     '(unless there were errors)']
   end
 
   def postscript
     'Files are whitespace separated, and fields can be defined ' \
-    "with the '-F' option.  Use 't' for timestamp; 'm' for metric " \
-    "name; 'v' for value, 's' for source, and 'T' for tags. Put 'T' " \
+    "with the '-F' option.  Use 't' for timestamp, 'm' for metric " \
+    "name, 'v' for value, 's' for source, and 'T' for tags. Put 'T' " \
     'last.'.cmd_fold(TW, 0)
   end
 end

data/lib/wavefront-cli/report.rb

@@ -3,7 +3,7 @@ require_relative 'base_write'
 module WavefrontCli
   class Report < BaseWrite
     def send_point(p)
-      wf.write(p)
+      call_write(p)
     rescue Wavefront::Exception::InvalidEndpoint
       abort 'could not speak to API'
     end

data/lib/wavefront-cli/version.rb

@@ -1 +1 @@
-WF_CLI_VERSION = '2.6.0'.freeze
+WF_CLI_VERSION = '2.7.0'.freeze

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wavefront-cli
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Robert Fisher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-27 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docopt