echo_cli 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f40be413ffd45a59cdb6ab5da86ae6667617f128
-  data.tar.gz: 078150dff54063387c76aca88649d67026264239
+  metadata.gz: 0448a4ae9927eeb77e8b2043f5ff4bdceddcd39c
+  data.tar.gz: 0f9b13961677f98786fb2152e51b3cad864b91ab
 SHA512:
-  metadata.gz: d5be7474e7224e833b85c554305ca6ba1c6b561ddbaadba42df28c9e578597818edd26b6a2b42736865c4cb2e085a52495623b558a75650fab1bb9aa148fa865
-  data.tar.gz: fef649166a32f16685218da4cd6fa03780b5203be9371eb6ef422e2288425a526fc9e6f0faf4ba6255213b45a03aba62cea7fd9b3a69bfbe9591edbfb9c567dc
+  metadata.gz: 3acbc693f08696a9970fac9a604b037bccbaaaad7633fb650e8e57f619699bd2bd3979a82cd07b09f447f9398471c5d1fcc1546c2eeb29eb77ba12f79d079ac5
+  data.tar.gz: b78fcdaad8e3dded18685d09c12a2d08cf8d1ce10d6a185b6d9329493508bf6bf50907d3df67fec960255a47e7df5f7acba102dc62dc90d34e23bf5433340be9

data/README.md

@@ -30,6 +30,19 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+```bash
+git add .
+git commit -m
+git push
+
+gem bump minor/major
+rake build
+rake install
+rake release
+
+gem install echo_cli
+```
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/echo_cli. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
@@ -38,4 +51,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/lib/echo_cli/cli.rb

@@ -7,6 +7,8 @@ module Echo_cli
   class Echo < Thor
     desc "post", "Post metrics to Echo. Use \"echo_cli post <IP> '<metric>' <{number}>\""
 
+    option :q
+
     long_desc <<-LONGDESC
       `echo_cli post` will post a metric directly to Echo's StatsD server.
 
@@ -14,11 +16,13 @@ module Echo_cli
 
       Ensure single-quotes surround the metric.
 
-      > $ echo_cli post localhost 'example.post:1|c' {10}
+      With -q (query-verify) option, post will perform a query of previously posted metric in Echo's instance of OpenTSDB, and provide a message verifying the datapoint exists.
+
+      > $ echo_cli post localhost 'example.post:1|c' {10} {-q}
     LONGDESC
 
-    def post(ip, body, num = 0)
-      request_body = body.gsub(/'/,"")
+    def post(ip, metric, num = 0)
+      request_body = metric.gsub(/'/,"")
       statsd_uri = "http://" + ip + ":8125/metrix"
 
       ENV["http_proxy"] = ENV["HTTP_PROXY"]
@@ -34,6 +38,7 @@ module Echo_cli
       if(num.to_i > 0)
         begin
           time_start = Time.new.to_i.to_s
+
           for i in 1..num.to_i
             res = https.request(req)
             if res.code != '200'
@@ -41,6 +46,10 @@ module Echo_cli
               raise
             end
           end
+
+          if options[:q]
+            sleep 10 # ensure data reception and replication
+          end
           time_end = Time.new.to_i.to_s
 
           puts "\n\tSuccessfully posted ".green + request_body.yellow + " to ".green + ip.blue + " " + num.green + " time(s)".green + "\n\tTime start: ".green + time_start.yellow + ", Time end: ".green + time_end.yellow
@@ -51,8 +60,15 @@ module Echo_cli
       else
         begin
           time_start = Time.new.to_i.to_s
+
           res = https.request(req)
+
+          if options[:q]
+            sleep 10 # ensure data reception and replication
+          end
+
           time_end = Time.new.to_i.to_s
+
           if res.code == '200'
             puts "\n\tSuccessfully posted ".green + request_body.yellow + " to ".green + ip.blue + "\n\tTime start: ".green + time_start.yellow + ", Time end: ".green + time_end.yellow
           end
@@ -61,6 +77,108 @@ module Echo_cli
         end
       end
 
+      if options[:q]
+        query(ip, request_body[0..request_body.index(":")-1], time_start, time_end)
+      end
+
+      ENV["http_proxy"] = ""
+      ENV["https_proxy"] = ""
+    end
+
+    desc "query", "Query metrics on Echo. Use \"echo_cli query <IP> '<metric>' <time_start> <time_end> {-v}\""
+
+    option :v
+
+    long_desc <<-LONGDESC
+      `echo_cli query` will query a metric directly from Echo's OpenTSDB server instance.
+
+      If timestamps are unknown, echo_cli's post command provides time_start and time_end values for future querying.
+
+      Ensure single-quotes surround the metric.
+
+      Unlike the echo_cli post command, query does not require the data value nor the data type (e.g. remove ':1|c' from 'example.post:1|c' and your query will still work).
+
+      With -v (verbose) option, query will print the status code and response body upon completion of the request.
+
+      > $ echo_cli query localhost 'example.post' 1492186212 1492186214 {-v}
+    LONGDESC
+
+    def query(ip, metric, time_start, time_end)
+      metric = metric.gsub(/'/,"")
+      if metric.include? ":"
+        metric = metric[0..metric.index(":")-1]
+      end
+
+      opentsdb_uri = "http://" + ip + ":4242/api/query"
+
+      tags=""
+
+      if metric.include? "."
+        tags = metric[metric.index(".")+1..-1] + "."
+        metric = metric[0..metric.index(".")-1]
+
+        toReturn = ""
+        count = 1
+        while tags.include?(".") do
+          toReturn = toReturn + "\"tag" + count.to_s + "\": \"" + tags[0..tags.index(".")-1] + "\""
+          count = count + 1
+          tags = tags[tags.index(".")+1..-1]
+          if tags.include?(".")
+            toReturn = toReturn + ",\n"
+          end
+        end
+
+        tags = toReturn
+      end
+
+      opentsdb_query =
+      "{
+        \"start\": " + time_start + ",
+        \"end\": " + time_end + ",
+        \"queries\": [
+          {
+          \"aggregator\": \"sum\",
+          \"metric\": \"" + metric + "\",
+          \"tags\": {" + tags +
+            "}
+          }
+        ]
+      }"
+
+      ENV["http_proxy"] = ENV["HTTP_PROXY"]
+      ENV["https_proxy"] = ENV["HTTPS_PROXY"]
+
+      uri = URI.parse(opentsdb_uri)
+      https = Net::HTTP.new(uri.host, uri.port)
+      https.use_ssl = false
+      https.verify_mode = OpenSSL::SSL::VERIFY_NONE if https.use_ssl?
+      req = Net::HTTP::Post.new(uri.request_uri, initheader = {'Content-Type' => 'text/plain'}, )
+      req.body = opentsdb_query
+
+      if options[:v]
+        begin
+          res = https.request(req)
+          if res.code == '200'
+            puts "\n\tSuccessfully retrieved ".green + metric.yellow + " from ".green + ip.blue + " in timestamp range: ".green + time_start.yellow + " to ".green + time_end.yellow + "\n\tStatus Code: ".green + res.code.yellow + "\n\tResponse Body: ".green + res.body.green
+          else
+            puts "\n\tFailed to retrieve ".red + metric.yellow + " from ".red + ip.blue + " in timestamp range: ".red + time_start.yellow + " to ".red + time_end.yellow + "\n\tStatus Code: ".red + res.code.yellow + "\n\tResponse Body: ".red + res.body.red
+          end
+        rescue
+          puts "\n\tYour request returned an error. Are you sure your query was correct?"
+        end
+      else
+        begin
+          res = https.request(req)
+          if res.code == '200'
+            puts "\n\tSuccessfully retrieved ".green + metric.yellow + " from ".green + ip.blue + " in timestamp range: ".green + time_start.yellow + " to ".green + time_end.yellow
+          else
+            puts "\n\tFailed to retrieve ".red + metric.yellow + " from ".red + ip.blue + " in timestamp range: ".red + time_start.yellow + " to ".red + time_end.yellow
+          end
+        rescue
+          puts "\n\tYour request returned an error. Are you sure your query was correct?"
+        end
+      end
+
       ENV["http_proxy"] = ""
       ENV["https_proxy"] = ""
     end

data/lib/echo_cli/version.rb

@@ -1,3 +1,3 @@
 module Echo_cli
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: echo_cli
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Brandon Raphael
@@ -100,7 +100,6 @@ files:
 - bin/console
 - bin/echo_cli
 - bin/setup
-- echo_cli-0.6.0.gem
 - echo_cli.gemspec
 - exe/console
 - exe/echo_cli