echo_cli 0.6.16 → 0.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b440b79534c4a019a1f713085751a9ca0548cb4
-  data.tar.gz: c4ce497a6fa9735fc79a7b42d884df56bdab1104
+  metadata.gz: 14216c8750583aca2b4df9fa4d05a264b9102c6d
+  data.tar.gz: 69ccc1e2be2e1ef4150f5c483447dde10958a257
 SHA512:
-  metadata.gz: 08c8130f3db46a4b0eea93e1bd69646a47c9f610b54ca967c31f0a7933cc192ba5cb17f90d6b8d1bb98d1e0c9b844b622aa8ef97b4ea5b29ac57b9012dd6e058
-  data.tar.gz: 5d3412d36a2cec318d34b2280194a120655e84376687a72868cbca10c75a1f824b5e8157275817fe56b230d8775097bdad59d9e7b2ea4371ba9b2caeadec2db9
+  metadata.gz: 2a0f1dde362e333a474dbcd1c44caa42fb9b2dd1ba7f6445c701b0f664dd22668b8600e9203e84fcd3fc1ac480de3928febf532a8d256c13bb8237e08f55e226
+  data.tar.gz: 9dc18f4ed92a02cf7627f031d14d37b39d29cbb556c4c4f07af892e65009764057208b03a04e1ebb64d4077eecce1599d633b4f4b0bc77cce63a7092e855dfd4

data/lib/echo_cli/cli.rb

@@ -27,8 +27,7 @@ module Echo_cli
 
     def post(statsd_uri, metric, num = 0)
 
-      ENV["http_proxy"] = ENV["HTTP_PROXY"]
-      ENV["https_proxy"] = ENV["HTTPS_PROXY"]
+      Helper.new.set_envs()
 
       uri = URI.parse(statsd_uri)
       request = Net::HTTP::Post.new(uri)
@@ -49,7 +48,7 @@ module Echo_cli
               http.request(request)
             end
             if response.code != '200'
-              puts "Final run at: " + i
+              puts "Final run at: " + i + " of " + num
               raise
             end
           end
@@ -99,8 +98,7 @@ module Echo_cli
       end
       return response
 
-      ENV["http_proxy"] = ""
-      ENV["https_proxy"] = ""
+      Helper.new.unset_envs()
     end
 
     desc "query", "Query metrics on Echo. Use \"echo_cli query <URL> '<metric>' <time_start> <time_end> {-v}\""
@@ -124,47 +122,12 @@ module Echo_cli
     LONGDESC
 
     def query(opentsdb_uri, metric, time_start, time_end)
-      metric = metric.gsub(/'/,"")
-      if metric.include? ":"
-        metric = metric[0..metric.index(":")-1]
-      end
-
-      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
+      metric = Helper.new.get_metric(metric)
+      metric_name = Helper.new.get_metric_name(metric)
+      tags = Helper.new.check_get_tags(metric)
+      opentsdb_query = Helper.new.get_query(time_start, time_end, metric_name, tags)
 
-        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"]
+      Helper.new.set_envs()
 
       uri = URI.parse(opentsdb_uri)
       https = Net::HTTP.new(uri.host, uri.port)
@@ -177,9 +140,9 @@ module Echo_cli
         begin
           res = https.request(req)
           if res.code == '200'
-            puts "\nSuccessfully retrieved ".green + metric.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
+            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
           else
-            puts "\nFailed to retrieve ".red + metric.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
+            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?"
@@ -188,17 +151,16 @@ module Echo_cli
         begin
           res = https.request(req)
           if res.code == '200'
-            puts "\nSuccessfully retrieved ".green + metric.yellow + " from ".green + opentsdb_uri.blue + " in timestamp range: ".green + time_start.yellow + " to ".green + time_end.yellow
+            puts "\nSuccessfully retrieved ".green + metric_name.yellow + " from ".green + opentsdb_uri.blue + " in timestamp range: ".green + time_start.yellow + " to ".green + time_end.yellow
           else
-            puts "\nFailed to retrieve ".red + metric.yellow + " from ".red + opentsdb_uri.blue + " in timestamp range: ".red + time_start.yellow + " to ".red + time_end.yellow
+            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
           end
         rescue
           puts "\nYour request returned an error. Are you sure your query was correct?"
         end
       end
 
-      ENV["http_proxy"] = ""
-      ENV["https_proxy"] = ""
+      Helper.new.unset_envs()
 
       return res.code
     end
@@ -224,53 +186,17 @@ module Echo_cli
     LONGDESC
 
     def quick_query(opentsdb_uri, metric, range)
-      metric = metric.gsub(/'/,"")
-      if metric.include? ":"
-        metric = metric[0..metric.index(":")-1]
-      end
-
-      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
-
       time_end = Time.new.to_i
       time_start = time_end - range.to_i
-
       time_start = time_start.to_s
       time_end = time_end.to_s
 
-      opentsdb_query =
-      "{
-        \"start\": " + time_start + ",
-        \"end\": " + time_end + ",
-        \"queries\": [
-          {
-          \"aggregator\": \"sum\",
-          \"metric\": \"" + metric + "\",
-          \"tags\": {" + tags +
-            "}
-          }
-        ]
-      }"
+      metric = Helper.new.get_metric(metric)
+      metric_name = Helper.new.get_metric_name(metric)
+      tags = Helper.new.check_get_tags(metric)
+      opentsdb_query = Helper.new.get_query(time_start, time_end, metric_name, tags)
 
-      ENV["http_proxy"] = ENV["HTTP_PROXY"]
-      ENV["https_proxy"] = ENV["HTTPS_PROXY"]
+      Helper.new.set_envs()
 
       uri = URI.parse(opentsdb_uri)
       https = Net::HTTP.new(uri.host, uri.port)
@@ -294,16 +220,15 @@ module Echo_cli
             end
           end
 
-          puts "\nSuccessfully retrieved ".green + metric.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
+          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
         else
-          puts "\nFailed to retrieve ".red + metric.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
+          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
 
-      ENV["http_proxy"] = ""
-      ENV["https_proxy"] = ""
+      Helper.new.unset_envs()
 
       return res.code
     end
@@ -351,5 +276,71 @@ module Echo_cli
       end
       retval
     end
+
+    def check_get_tags(metric)
+      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
+      return tags
+    end
+
+    def get_metric(metric)
+      metric = metric.gsub(/'/,"")
+      if metric.include? ":"
+        metric = metric[0..metric.index(":")-1]
+      end
+      return metric
+    end
+
+    def get_metric_name(metric)
+      if metric.include?(".")
+        metric = metric[0..metric.index(".")-1]
+      end
+      return metric
+    end
+
+    def get_query(time_start, time_end, metric, tags)
+      opentsdb_query =
+      "{
+        \"start\": " + time_start + ",
+        \"end\": " + time_end + ",
+        \"queries\": [
+          {
+          \"aggregator\": \"sum\",
+          \"metric\": \"" + metric + "\",
+          \"tags\": {" + tags +
+            "}
+          }
+        ]
+      }"
+      return opentsdb_query
+    end
+
+    def set_envs
+      ENV["http_proxy"] = ENV["HTTP_PROXY"]
+      ENV["https_proxy"] = ENV["HTTPS_PROXY"]
+    end
+
+    def unset_envs
+      ENV["http_proxy"] = ENV[""]
+      ENV["https_proxy"] = ENV[""]
+    end
+
   end
 end

data/lib/echo_cli/version.rb

@@ -1,3 +1,3 @@
 module Echo_cli
-  VERSION = "0.6.16"
+  VERSION = "0.6.17"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: echo_cli
 version: !ruby/object:Gem::Version
-  version: 0.6.16
+  version: 0.6.17
 platform: ruby
 authors:
 - Brandon Raphael
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor