scaltainer 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8a33c9f8383c9b06b2c6407f5700cb32f53541d
-  data.tar.gz: 5887f88f04df613831025a986154667afbe80091
+  metadata.gz: fc1f4a8170d0381fe795de4f5f16a134d686e074
+  data.tar.gz: 6ee9fdcff6aed1c694e3a0bda90d3c8209b8bfc2
 SHA512:
-  metadata.gz: 7f7a731402f9d58926023a5de82b8f9c5f604c664a6e2cae85ff531fb0ebae71528ebd761adbab88d99bbae8b9887c936046192fe425e19e3fb0845294a42892
-  data.tar.gz: 036fea9e0e831ad8ef760f357726834eafd9ea2cb8bfe80c2e0e43468947cf1ec8d98872cf34066197dc9c3c2bbf25327da05a00221da367ea4e17cddf12e75b
+  metadata.gz: 4b8c5e16a59f0ab61f25f78f376df5b6296346d9c5eb91b8c328c7e492c2f717bb7ba9f2137c2d02e68c703649d6968db60e19f73d208e159cee5b6ef3a4931b
+  data.tar.gz: 7ee00f85b2604f9df32ea2555171e7cba53c6e0efbdf63ff9acb4d1b72434c24e7ddcd2197700730835340b441c5e6676a2ab05a1b01a2da3fadce1f64ae0ec8

data/README.md

@@ -68,6 +68,12 @@ measure average response time in the past 3 minutes. Default value is 5.
 - `LOG_LEVEL`: Accepted values here are: `DEBUG`, `INFO` (default), `WARN`, `ERROR`, `FATAL`.
 Log output goes to stdout.
 
+- `DOCKER_SECRETS_PATH_GLOB`: Path glob containing environment files to load.
+This is useful if running from a docker swarm mode environment where one or more of the above
+environment variables are set using `docker config` or `docker secret`.
+These files should be in the form `VARIABLE=value`.
+A typical value of this variable would be: `{/run/secrets/*,/config1,/config2}`
+
 ### Configuration file
 
 The configuration file (determined by `-f FILE` command line parameter) should be in the following form:

data/lib/scaltainer/command.rb

@@ -15,6 +15,13 @@ module Scaltainer
         end
         opts.on_tail("-h", "--help", "Show this message") do
           puts opts
+          puts "\nEnvironment variables: \n"
+          puts "- DOCKER_URL: defaults to local socket"
+          puts "- HIREFIRE_TOKEN"
+          puts "- NEW_RELIC_LICENSE_KEY"
+          puts "- RESPONSE_TIME_WINDOW: defaults to 5"
+          puts "- LOG_LEVEL: defaults to INFO"
+          puts "- DOCKER_SECRETS_PATH_GLOB: path glob containing env files to load"
           exit
         end     
       end.parse!
@@ -22,10 +29,28 @@ module Scaltainer
       statefile = "#{configfile}.state" unless statefile
 
       raise ConfigurationError.new("File not found: #{configfile}") unless File.exists?(configfile)
+
+      load_env
+
       logger = Logger.new(STDOUT)
       logger.level = %w(debug info warn error fatal unknown).find_index((ENV['LOG_LEVEL'] || '').downcase) || 1
 
       return configfile, statefile, logger
     end
+
+    private
+
+    def self.load_env
+      # load docker configs/secrets
+      path = ENV['DOCKER_SECRETS_PATH_GLOB']
+      unless path.nil?
+        files = Dir[path]
+        unless files.empty?
+          require 'dotenv'
+          Dotenv.load(*files)
+          puts ENV['NEW_RELIC_LICENSE_KEY']
+        end
+      end
+    end
   end
 end

data/lib/scaltainer/newrelic/metrics.rb

@@ -18,7 +18,7 @@ module Newrelic
       http_call_count, http_average_call_time = response_array[0]["call_count"], response_array[0]["average_call_time"]
       webfe_call_count, webfe_average_response_time = response_array[1]["call_count"], response_array[1]["average_response_time"]
 
-      http_average_call_time + (1.0 * webfe_call_count * webfe_average_response_time / http_call_count)
+      http_average_call_time + (1.0 * webfe_call_count * webfe_average_response_time / http_call_count) rescue 0.0/0
     end
 
   private
@@ -33,9 +33,12 @@ module Newrelic
       responses = conn.requests requests
       responses.map {|response|
         body = JSON.parse(response.body)
-        body["metric_data"]["metrics"][0]["timeslices"][0]["values"]
+        if body["error"] && body["error"]["title"]
+          raise body["error"]["title"]
+        else
+          body["metric_data"]["metrics"][0]["timeslices"][0]["values"] rescue {}
+        end
       }
     end
-
   end
 end

data/lib/scaltainer/service_types/web.rb

@@ -19,7 +19,7 @@ module Scaltainer
         begin
           metric = nr.get_avg_response_time app_id, from, to
         rescue => e
-          raise NetworkError.new "Could not retrieve metrics from New Relic API for #{service_name}.\n#{e.message}"
+          raise NetworkError.new "Could not retrieve metrics from New Relic API for #{service_name}: #{e.message}"
         end
 
         hash.merge!(service_name => metric)

data/lib/scaltainer/version.rb

@@ -1,3 +1,3 @@
 module Scaltainer
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/scaltainer.gemspec

@@ -30,4 +30,5 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'excon', '>= 0.47.0'
   spec.add_runtime_dependency "docker-api"
+  spec.add_runtime_dependency "dotenv"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scaltainer
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Hossam Hammady
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-02 00:00:00.000000000 Z
+date: 2017-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   A ruby gem inspired by HireFire to autoscale docker swarm services.
       Metrics can be standard average response time, New Relic web metrics, queue size for workers, ...