echo_cli 0.6.19 → 0.6.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 061f3487e6d0be96c2a48f11c114c4dd2128e887
-  data.tar.gz: 0d3a15469d351b5c10371e1f4b04fa8409443915
+  metadata.gz: cd5f609e5d770299aa3c77843c4f22d1a8ce5243
+  data.tar.gz: 0128cf4cddd4dc07ecb9a6e1cad5f89c1df46c9e
 SHA512:
-  metadata.gz: 26483bcb7d0eeb6e7444017201afe0e22fc19b2226e3ae50a325a4b236946426187972239abd4de52c973d5abe09ac40826528916774f8317c24f6b648868f65
-  data.tar.gz: 8691197e9f88518fa22ab15da0fcc97a72f68270656b87beeb62f47762f9d3af5e332bfbd1728c0895d10bdc80ad99c37cea45aaa73376831e817beeb4f289a6
+  metadata.gz: 1056a5fa9b7197db6a646d37892f8f2086fac67b49124d33c5c0a6ec20dbb2aaf9cf040178f5d51617a622e1f0a977278dfce2e2f84e8f9c908582650f840a89
+  data.tar.gz: c0016a5bef2ee41db51406ea3a12cbf70fcbc0f5de5435ccd0642ecab0f42b875614a69af093d5cd080a19ab4ecb4f6d740b36d8296547b2d2ba095e1582c3d6

data/README.md

@@ -110,7 +110,7 @@ The previous example would post the metric 'sample' with tags 'post' and 'here'
 
 #### query
 ```bash
-$ echo_cli query <URL> '<metric>' <time_start> <time_end> {-v}
+$ echo_cli query <URL> '<metric>' <time_start> <time_end> {-v} {-e} {-s}
 ```
 Parameters:
 
@@ -124,6 +124,10 @@ Parameters:
 
 `{-v}`: (optional) verbosely prints the status code and response body of the query
 
+`{-e}`: (optional) formats the response datapoints such that their timestamps are in the epoch format, must have '-v' option selected for changes to appear
+
+`{-s}`: (optional) formats the response datapoints to be usable as SQL statements for insertions into SQL-esque databases, must have '-v' option selected for changes to appear
+
 Example:
 ```bash
 $ echo_cli https://localhost:4242/api/query 'sample.query.here' 1492464745 1492465045 -v
@@ -132,7 +136,7 @@ The previous example will query OpenTSDB with the metric name 'sample' and tags
 
 #### quick_query
 ```bash
-$ echo_cli quick_query <URL> '<metric>' <range> {-h}
+$ echo_cli quick_query <URL> '<metric>' <range> {-e} {-s}
 ```
 Parameters:
 
@@ -144,11 +148,13 @@ Parameters:
 
 `{-e}`: (optional) formats the response datapoints such that their timestamps are in the epoch format
 
+`{-s}`: (optional) formats the response datapoints to be usable as SQL statements for insertions into SQL-esque databases
+
 Example:
 ```bash
-$ echo_cli https://localhost:4242/api/query 'sample.query.here' 300
+$ echo_cli https://localhost:4242/api/query 'sample.query.here' 300 -s
 ```
-The previous example will query OpenTSDB located on 'https://localhost:4242/api/query' with the metric name 'sample' and tags 'query' and 'here', within the time range spanning from the current time to '300' seconds before the current time.
+The previous example will query OpenTSDB located on 'https://localhost:4242/api/query' with the metric name 'sample' and tags 'query' and 'here', within the time range spanning from the current time to '300' seconds before the current time. The '-s' option will return the data as SQL statements for later insertion into a SQL database.
 
 ## Development
 

data/lib/echo_cli/cli.rb

@@ -161,9 +161,11 @@ module Echo_cli
 
     end
 
-    desc "query", "Query metrics on Echo. Use \"echo_cli query <URL> '<metric>' <time_start> <time_end> {-v}\""
+    desc "query", "Query metrics on Echo. Use \"echo_cli query <URL> '<metric>' <time_start> <time_end> {-v} {-e} {-s}\""
 
     option :v
+    option :e
+    option :s
 
     long_desc <<-LONGDESC
       `echo_cli query` will query a metric directly from Echo's OpenTSDB server instance.
@@ -178,6 +180,10 @@ module Echo_cli
 
       With -v (verbose) option, query will print the status code and response body upon completion of the request.
 
+      With -e (epoch) option, echo_cli will format the response datapoints, with the verbose ('-v') option selected, such that their timestamps will be in epoch format.
+
+      With -s (sql) option, echo_cli will format the response data, with the verbose ('-v') option selected, to be usable within a sql database.
+
       > $ echo_cli query https://localhost:4242/api/query 'example.post' 1492186212 1492186214 {-v}
     LONGDESC
 
@@ -197,16 +203,39 @@ module Echo_cli
       req.body = opentsdb_query
 
       if options[:v]
-        begin
+        # begin
           res = https.request(req)
           if res.code == '200'
-            puts "\nSuccessfully retrieved ".green + metric_name.yellow + " from ".green + opentsdb_uri.blue + " in timestamp range: ".green + time_start.yellow + " to ".green + time_end.yellow + "\nStatus Code: ".green + res.code.yellow + "\nResponse Body: ".green + JSON.pretty_generate(JSON.parse(res.body)).green
+
+            json = JSON.parse(res.body)[0]
+
+            if !options[:e]
+              json["dps"] = {}
+              for i in JSON.parse(res.body)[0]["dps"].keys do
+                Helper.new.stfu do
+                  json["dps"][convert(i)] = JSON.parse(res.body)[0]["dps"][i]
+                end
+              end
+            end
+
+            if options[:s]
+              sql = "CREATE TABLE " + metric + "(\n  sep VARCHAR(24) NOT NULL PRIMARY KEY\n  ,FIELD2 VARCHAR(21) NOT NULL\n);"
+              for i in json["dps"].keys do
+                Helper.new.stfu do
+                  sql = sql + "\nINSERT INTO " + metric + "(sep,FIELD2) VALUES ('" + i.to_s + "','" + json["dps"][i].to_s + "');"
+                end
+              end
+
+              puts "\nSuccessfully retrieved ".green + metric_name.yellow + " from ".green + opentsdb_uri.blue + " in timestamp range: ".green + time_start.yellow + " to ".green + time_end.yellow + "\nSQL-ized data points:\n\n".green + sql.green
+            else
+              puts "\nSuccessfully retrieved ".green + metric_name.yellow + " from ".green + opentsdb_uri.blue + " in timestamp range: ".green + time_start.yellow + " to ".green + time_end.yellow + "\nData points:\n\n".green +  JSON.pretty_generate(json).green
+            end
           else
             puts "\nFailed to retrieve ".red + metric_name.yellow + " from ".red + opentsdb_uri.blue + " in timestamp range: ".red + time_start.yellow + " to ".red + time_end.yellow + "\nStatus Code: ".red + res.code.yellow + "\nResponse Body: ".red + JSON.pretty_generate(JSON.parse(res.body)).red
           end
-        rescue
-          puts "\nYour request returned an error. Are you sure your query was correct?"
-        end
+        # rescue
+        #   puts "\nYour request returned an error. Are you sure your query was correct?"
+        # end
       else
         begin
           res = https.request(req)
@@ -225,9 +254,10 @@ module Echo_cli
       return res.code
     end
 
-    desc "quick_query", "Query metrics on Echo from the current time. Use \"echo_cli quick_query <URL> '<metric>' <range> {-e}\""
+    desc "quick_query", "Query metrics on Echo from the current time. Use \"echo_cli quick_query <URL> '<metric>' <range> {-e} {-s}\""
 
     option :e
+    option :s
 
     long_desc <<-LONGDESC
       `echo_cli quick_query` will query a metric directly from Echo's OpenTSDB server instance for a given time range beginning in the present.
@@ -240,6 +270,8 @@ module Echo_cli
 
       With -e (epoch) option, echo_cli will format the response datapoints such that their timestamps will be in epoch format.
 
+      With -s (sql) option, echo_cli will format the response data to be usable within a sql database.
+
       > $ echo_cli quick_query https://localhost:4242/api/query 'example' 30
 
       The previous example would find all data points with metric name 'example' on Echo's OpenTSDB instance at 'localhost' in the last 30 seconds.
@@ -275,12 +307,23 @@ module Echo_cli
             json["dps"] = {}
             for i in JSON.parse(res.body)[0]["dps"].keys do
               Helper.new.stfu do
-                json[convert(i)] = JSON.parse(res.body)[0]["dps"][i]
+                json["dps"][convert(i)] = JSON.parse(res.body)[0]["dps"][i]
               end
             end
           end
 
-          puts "\nSuccessfully retrieved ".green + metric_name.yellow + " from ".green + opentsdb_uri.blue + " in timestamp range: ".green + time_start.yellow + " to ".green + time_end.yellow + "\nData points in the last ".green + range.yellow + " seconds:\n".green +  JSON.pretty_generate(json).green
+          if options[:s]
+            sql = "CREATE TABLE " + metric + "(\n  sep VARCHAR(24) NOT NULL PRIMARY KEY\n  ,FIELD2 VARCHAR(21) NOT NULL\n);"
+            for i in json["dps"].keys do
+              Helper.new.stfu do
+                sql = sql + "\nINSERT INTO " + metric + "(sep,FIELD2) VALUES ('" + i.to_s + "','" + json["dps"][i].to_s + "');"
+              end
+            end
+
+            puts "\nSuccessfully retrieved ".green + metric_name.yellow + " from ".green + opentsdb_uri.blue + " in timestamp range: ".green + time_start.yellow + " to ".green + time_end.yellow + "\nSQL-ized data points in the last ".green + range.yellow + " seconds:\n\n".green + sql.green
+          else
+            puts "\nSuccessfully retrieved ".green + metric_name.yellow + " from ".green + opentsdb_uri.blue + " in timestamp range: ".green + time_start.yellow + " to ".green + time_end.yellow + "\nData points in the last ".green + range.yellow + " seconds:\n\n".green +  JSON.pretty_generate(json).green
+          end
         else
           puts "\nFailed to retrieve ".red + metric_name.yellow + " from ".red + opentsdb_uri.blue + " in timestamp range: ".red + time_start.yellow + " to ".red + time_end.yellow + "\nStatus Code: ".red + res.code.yellow + "\nResponse Body: ".red + JSON.pretty_generate(JSON.parse(res.body)).red
         end

data/lib/echo_cli/version.rb

@@ -1,3 +1,3 @@
 module Echo_cli
-  VERSION = "0.6.19"
+  VERSION = "0.6.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: echo_cli
 version: !ruby/object:Gem::Version
-  version: 0.6.19
+  version: 0.6.20
 platform: ruby
 authors:
 - Brandon Raphael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor