right_chimp 2.1.13 → 2.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a1bf8d5dec859eb24d0fad4003af83381f78339
-  data.tar.gz: fdabc1c04d9aa7593bf6ca56966c31958e593361
+  metadata.gz: cac365e612655681144bf8e6364069c1738cc2d5
+  data.tar.gz: 534d04f219972cf4fe2158ec61cda670bef698b0
 SHA512:
-  metadata.gz: 30a3fab9da5cac9f3a8401719cc1d04a9a266c262d0f7fd16fec33ce69b789ac9c4812f73bca4002da74156d7f9d0670f231a06a1a9d163b4f94bba3b14b1f5d
-  data.tar.gz: cba737a819c688bf0a68f7c6c7ba1d9c0a7c6b62e6496ab4d46d6b3ba933770bd7454c85b7c4d8859e02faf7e84a1ed75ada587071b055b41d0ff6b07eaf5f2e
+  metadata.gz: df533cc2e7da178112555fcbccdf19d51a6e51333dd712909a0f3930cb8930cb815712f28895a492a3b83f4cbf8de0b6dac384643f8d58c2561515ed6c22bf3a
+  data.tar.gz: d77763bc9930a973c8cc5985b36bf048e284a48472040ccb72374618300b984ec729ba96f6d1fbc7c91071b6583c2138385184591ee9d0bd0b355a138f0f76cb

data/docker/Dockerfile

@@ -0,0 +1,23 @@
+# Runs right_chimp (https://rubygems.org/gems/right_chimp) ruby gem from a container
+###
+# Arbitrary chimp commands executed in container -or- defaults to running execution daemon ('chimpd')
+# * Requires volume share with creds to /root/
+# - ex1 - Execute arbitrary chimp command:
+# => docker run -it -p -v ~/.rest_connection:/root/.rest_connection:ro mastamark/right_chimp:latest chimp --tag="some:tag=true" --script="MyScript"
+# - ex2 - Start right_chimp daemon with docker host port 9055 bound to same container port:
+# => docker run -d -p 9055:9055 -v ~/.rest_connection:/root/.rest_connection:ro mastamark/right_chimp:latest
+# Send your dockerized chimp queries to your dockerized chimpd by adding flag "--chimpd=172.17.0.1:9055" (assuming this is your docker host ip) to chimp queries.
+###
+# Built via: docker build -t mastamark/right_chimp:latest .
+###
+
+FROM rightscale/ops_ruby22x_build
+MAINTAINER mastamark+github@gmail.com
+WORKDIR /srv
+ADD right_chimp.sh /srv/
+
+RUN gem install right_chimp --no-ri --no-rdoc
+
+ENTRYPOINT ["/srv/right_chimp.sh"]
+CMD ["chimpd"]
+EXPOSE 9055

data/docker/right_chimp.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+# Entrypoint script for dockerized right_chimp
+
+first_arg=$1
+operation=$*
+
+case "$first_arg" in
+  chimpd)
+    chimp_operation="$operation --bind-address=0.0.0.0"
+    echo "Executing chimpd operation: '$chimp_operation'"
+    $chimp_operation
+    ;;
+  chimp)
+    chimp_operation="$operation"
+    echo "Executing chimp operation: '$chimp_operation'"
+    $chimp_operation
+    ;;
+  *)
+    echo "Error: Requested operation '$operation' does not appear to be a 'chimp' or 'chimpd' operation"
+    exit 1
+    ;;
+esac

data/lib/right_chimp/Chimp.rb

@@ -414,7 +414,14 @@ module Chimp
               exit 0
             when '--chimpd'
               @use_chimpd = true
-              @chimpd_port = arg.to_i unless arg.empty?
+              unless arg.empty?
+                if arg =~ /[\d]+\.[\d]+\.[\d]+\.[\d]+:[\d]+/ 
+                  @chimpd_host, @chimpd_port = arg.split(':')
+                  @chimpd_port = @chimpd_port.to_i
+                else
+                  @chimpd_port = arg.to_i
+                end
+              end
             when '--chimpd-wait-until-done'
               @use_chimpd = true
               @chimpd_wait_until_done = true

data/lib/right_chimp/daemon/ChimpDaemon.rb

@@ -8,7 +8,8 @@ module Chimp
   class ChimpDaemon
 
     attr_accessor :verbose, :debug, :port, :concurrency, :delay, :retry_count,
-                  :dry_run, :logfile, :chimp_queue, :proc_counter, :semaphore
+                  :dry_run, :logfile, :chimp_queue, :proc_counter, :semaphore,
+                  :bind_address
     attr_reader :queue, :running
 
     include Singleton
@@ -17,6 +18,7 @@ module Chimp
       @verbose     = false
       @debug       = false
       @port        = 9055
+      @bind_address = "localhost"
       @concurrency = 50
       @delay       = 0
       @retry_count = 0
@@ -60,6 +62,7 @@ module Chimp
           [ '--delay', '-d',        GetoptLong::REQUIRED_ARGUMENT ],
           [ '--retry', '-y',        GetoptLong::REQUIRED_ARGUMENT ],
           [ '--port', '-p',         GetoptLong::REQUIRED_ARGUMENT ],
+          [ '--bind-address', '-b', GetoptLong::REQUIRED_ARGUMENT ],
           [ '--help', '-h',         GetoptLong::NO_ARGUMENT ],
           [ '--exit', '-x', 				GetoptLong::NO_ARGUMENT ]
         )
@@ -81,6 +84,8 @@ module Chimp
               @quiet = true
             when '--port', '-p'
               @port = arg
+            when '--bind-address', '-b'
+              @bind_address = arg.to_s
             when '--help', '-h'
               help
             when '--exit', '-x'
@@ -90,7 +95,7 @@ module Chimp
           end
         end
       rescue GetoptLong::InvalidOption => ex
-        puts "Syntax: chimpd [--logfile=<name>] [--concurrency=<c>] [--delay=<d>] [--retry=<r>] [--port=<p>] [--verbose]"
+        puts "Syntax: chimpd [--logfile=<name>] [--concurrency=<c>] [--delay=<d>] [--retry=<r>] [--port=<p>] [--bind-address=<addr> ] [--verbose]"
         exit 1
       end
 
@@ -119,7 +124,7 @@ module Chimp
       puts
       puts  "chimpd -- a RightScale Platform command-line tool"
       puts
-      puts  "Syntax: chimpd [--logfile=<name>] [--concurrency=<c>] [--delay=<d>] [--retry=<r>] [--port=<p>] [--verbose]"
+      puts  "Syntax: chimpd [--logfile=<name>] [--concurrency=<c>] [--delay=<d>] [--retry=<r>] [--port=<p>] [--bind-address=<addr> ] [--verbose]"
       puts
       puts  "Options:"
       puts
@@ -132,6 +137,7 @@ module Chimp
       puts  " --quiet                     Supress non-essential output"
       puts
       puts  " --port=<port>               Specify the port number for chimpd to listen on (default: 9055)"
+      puts  " --bind-address=<addr>       Specify an interface address for chimpd to bind to.  0.0.0.0 allows all, default is 'localhost'"
       puts
       puts  " --help                      Displays this menu"
       puts
@@ -154,7 +160,7 @@ module Chimp
     #
     def spawn_webserver
       opts = {
-        :BindAddress  => "localhost",
+        :BindAddress  => @bind_address,
         :Port         => @port,
         :MaxClients   => 500,
         :RequestTimeout => 120,

data/lib/right_chimp/version.rb

@@ -1,3 +1,3 @@
 module Chimp
-  VERSION = "2.1.13"
+  VERSION = "2.1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: right_chimp
 version: !ruby/object:Gem::Version
-  version: 2.1.13
+  version: 2.1.14
 platform: ruby
 authors:
 - RightScale Operations
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -142,6 +142,8 @@ files:
 - bin/chimp
 - bin/chimpd
 - chimp.gemspec
+- docker/Dockerfile
+- docker/right_chimp.sh
 - lib/right_chimp.rb
 - lib/right_chimp/Chimp.rb
 - lib/right_chimp/IDManager.rb