cdn_manager_pcache_probe 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6a4287dc0fb35d06c1bfc95dd042f11f28fb4ee
-  data.tar.gz: 577b24fab8aa53bb69060f40e69083dfcac693db
+  metadata.gz: 64b966db0cd13b998c92873f7f91826833ba7e1a
+  data.tar.gz: 2870cd90b2129a8088d6a488893206b43146821d
 SHA512:
-  metadata.gz: 46399e35cd55865a0f5b47013430f5e6e8949fa00c6512ba68eec38a73f9d672dc36038fbda4897043cc96dcba14fbe1ff306f7569ce06ae736a67ce86d63a51
-  data.tar.gz: 670b2e7b90599fa08dcbb0a087c02335ffa5761c29f37901d917c2fb21562fe64b3551ea9fe094a1cdd47e18d503001c34d52cab6a055057c856954983de15cc
+  metadata.gz: 4eac5e1cfedc6efab7c8a3e3ca5ba1f8f661e544493fb21ef2fac86af06ca9b6c2a1da9f03f29cb36e659871aeeb53cfea6d411eb0a7f4aeaa5a07d8598f3c96
+  data.tar.gz: ca8df6adabd3736c205913cd4fedbc647a52b90d969df893d71f0a78ebcaeb55503be1697de5b3cb6a673d5a1f295a7662b2a0ecb8474de91a4fc5f305743a46

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    cdn_manager_pcache_probe (0.3)
-      json_pure (~> 1.8.3)
-      rest-client (~> 1.8.0)
-      thor (~> 0.19.1)
+    cdn_manager_pcache_probe (0.4)
+      multi_json (~> 1.11)
+      rest-client (~> 1.8)
+      thor (~> 0.19)
 
 GEM
   remote: https://rubygems.org/
@@ -13,8 +13,8 @@ GEM
       unf (>= 0.0.5, < 1.0.0)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
-    json_pure (1.8.3)
     mime-types (2.99)
+    multi_json (1.11.2)
     netrc (0.11.0)
     rake (10.4.2)
     rest-client (1.8.0)

data/README.md

@@ -5,10 +5,12 @@ Pcache load probe for cdn-manager using ElasticSearch data.
 
 Get overall usage for last 3 minutes:
 ```bash
-bin/get_pcache_probe collect --url http://indexer.swisstxt.ch:9200/_all/pcache/_search --interval 3
+get_pcache_probe collect --url http://indexer.swisstxt.ch:9200/_all/pcache/_search --interval 3
 ```
 
-Limit usage to volume_key "blick.simplex.ch":
+Limit usage to volume_key "swisstxt.ch":
 ```bash
-bin/get_pcache_probe collect --url http://indexer.swisstxt.ch:9200/_all/pcache/_search --key blick.simplex.ch
+get_pcache_probe collect --url http://indexer.swisstxt.ch:9200/_all/pcache/_search --key swisstxt.ch
 ```
+
+For all command options see ```get_pcache_probe help collect```

data/cdn-manager_pcache-probe.gemspec

@@ -27,9 +27,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "thor", "~> 0.19.1"
-  spec.add_runtime_dependency "rest-client", "~> 1.8.0"
-  spec.add_runtime_dependency "json_pure", "~> 1.8.3"
+  spec.add_runtime_dependency "thor", "~> 0.19"
+  spec.add_runtime_dependency "rest-client", "~> 1.8"
+  spec.add_runtime_dependency "multi_json", "~> 1.11"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/cdn_manager_pcache_probe/cli.rb

@@ -38,6 +38,9 @@ module CdnManagerPcacheProbe
         desc: "data delay - give elasticsearch some time to receive the logs",
         default: 5,
         type: :numeric
+      option :quiet,
+        desc: "print minimal output, just Mbit/s",
+        type: :boolean
       option :debug,
         desc: "print debug output",
         type: :boolean
@@ -46,15 +49,20 @@ module CdnManagerPcacheProbe
           options[:url]
         ).get_probe(options)
 
-        usage = (bytes_sent / (options[:interval] * 60) * 8 / 1024**3).round(3)
-        if options[:key]
-          say "Usage for #{options[:key]} ", :yellow
+        usage = (bytes_sent / (options[:interval] * 60) * 8 / 1024**2).round(3)
+        if options[:quiet]
+          puts usage.round(0)
         else
-          say "Overall usage ", :yellow
+          if options[:key]
+            say "Usage for #{options[:key]} ", :yellow
+          else
+            say "Overall usage ", :yellow
+          end
+          say "over #{options[:interval]} min (#{options[:delay]} min delay):", :yellow
+          puts "Total volume sent: #{(bytes_sent / 1024**3).round(3)} GB"
+          print "Average bandwidth: #{usage} Mbit/s"
+          puts usage >= 1000 ? " (#{(usage / 1024.0).round(2)} Gbit/s)" : nil
         end
-        say "over #{options[:interval]} min (#{options[:delay]} min delay):", :yellow
-        puts "Total volume sent: #{(bytes_sent / 1024**3).round(3)} GB"
-        puts "Average bandwidth: #{usage} Gbit/s"
       end
 
     end # class

data/lib/cdn_manager_pcache_probe/connector.rb

@@ -1,5 +1,5 @@
 require 'rest-client'
-require 'json'
+require 'multi_json'
 
 module CdnManagerPcacheProbe
   class Connector
@@ -13,12 +13,12 @@ module CdnManagerPcacheProbe
     end
 
     def get_probe(options = {})
-      probe = JSON.parse(
+      probe = MultiJson.load(
         RestClient.get(
           @url, params: { source: query(options) }
         )
       )
-      puts "Response: \n" + JSON.pretty_generate(probe) if options[:debug]
+      puts "Response: \n" + MultiJson.dump(probe, pretty: true) if options[:debug]
       probe["aggregations"]["bytes_sent"]["value"]
     end
 
@@ -57,7 +57,7 @@ module CdnManagerPcacheProbe
           }
         }
       }).gsub(/\A[[:space:]]+/, '').gsub(/[[:space:]]+\z/, '').gsub(/[[:space:]]+/, ' ')
-      puts "Query: \n" + JSON.pretty_generate(JSON.parse(query)) if options[:debug]
+      puts "Query: \n" + MultiJson.dump(MultiJson.load(query), pretty: true) if options[:debug]
       query
     end
   end

data/lib/cdn_manager_pcache_probe/version.rb

@@ -1,3 +1,3 @@
 module CdnManagerPcacheProbe
-  VERSION = "0.3"
+  VERSION = "0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdn_manager_pcache_probe
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - niwo
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.1
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: json_pure
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement