panteras_api 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d291a384ff04cd8639e9ffc80459fba0e2814f4d
-  data.tar.gz: 093afbcc53e6461723e4fe482265d59f6a21f413
+  metadata.gz: d3b7de68bc417673c5a3fe9ba5bd159b4d15c05b
+  data.tar.gz: cf67f85241261d9d33f4bf15da8fbc01be723b6b
 SHA512:
-  metadata.gz: ab50b4f3905ccbf0231f369b1f684a18059f62500d64ca86ac505e09ea6a0fa2f807814e92d5e4ecbfe19a43bef7146dfbe78a2cd97c98b9ff70c6b87cdfdc5d
-  data.tar.gz: 3817e2f8dc501e1851dc16d90fb7c477260409852964aa289b69fd5059d41f1cf3f3d950f905506b6951fb4686aea64aa0ed7cb1e9774c1edda35d00b535a1da
+  metadata.gz: 5b431635a6479b59ebab84056fc7e0ab44944b043f35cbab2b1159671c1598d08115efeae6f7812c4e3439f277b91d67ab39655dc0533f08d9394f069e7cbcad
+  data.tar.gz: 6b4193b5e7f6aafdaebba2137f23f559bfd18cabb6668aaf30c9a222ebd5360d66eaf97cbaf9dbb4d39fce3ba66969953c3a2e6d314bed64314d7fbe54b6ba27

data/bin/mesos_consul_consistency_check

@@ -17,7 +17,7 @@ bad_news = []
 good_news = []
 
 OptionParser.new("Usage: #{$0} [options]")  do |opts|
-  opts.release =  PanterasApi::VERSION
+  opts.release = PanterasApi::VERSION
   
   opts.on("-m", "--mesos-master-hostname MESOS_MASTER_HOSTNAME", "Default: #{config_default[:mesos_master_hostname]}") do |m|
     options[:mesos_master_hostname] = m
@@ -59,7 +59,7 @@ rescue SocketError, Errno::ECONNREFUSED => e
   abort("Problem connecting to mesos host #{config[:mesos_master_hostname]}:#{config[:mesos_master_port]}: #{e.message}")
 end
 
-abort("No running mesos tasks seen on mesos master #{config[:mesos_master_hostname]}:#{config[:mesos_master_port]}") if mesos.tasks.nil?
+abort("No running mesos tasks seen on mesos master #{config[:mesos_master_hostname]}:#{config[:mesos_master_port]}") if mesos.tasks('marathon').size == 0
 
 puts "#" * 75 if config[:debug]
 puts "* Mesos tasks ids running this cluster (all slaves):" if config[:debug]
@@ -68,7 +68,9 @@ puts mesos.tasks if config[:debug]
 
 puts "#" * 75 if config[:debug]
 puts "* Mesos tasks ids for tasks running on #{my_fqdn}:" if config[:debug]
-mesos_tasks = mesos.my_tasks_ids(my_fqdn).flatten
+mesos_tasks = mesos.my_tasks_ids(my_fqdn, 'marathon').flatten
+mesos_tasks = mesos_tasks + mesos.my_tasks_ids(my_fqdn, 'chronos-2.4.0').flatten
+
 puts mesos_tasks if config[:debug]
   
 good_news << "#{mesos_tasks.size} mesos tasks running." if ! mesos_tasks.empty?
@@ -79,13 +81,23 @@ marathon = MarathonEndpoint.new(mesos.master_hostname)
 
 puts "#" * 75 if config[:debug]
 puts "* Marathon tasks on #{my_fqdn}:" if config[:debug]
-marathon_tasks = marathon.my_task_ids(my_fqdn)
+marathon_tasks = marathon.my_task_ids(my_fqdn, 'marathon')
 puts marathon_tasks if config[:debug]
 
 good_news << "#{marathon_tasks.size} marathon tasks running."
 
+
+### CHRONOS
+chronos = ChronosEndpoint.new(mesos.master_hostname, 4400)
+
+puts "#" * 75 if config[:debug]
+puts "* Chrnos tasks on #{my_fqdn}:" if config[:debug]
+chronos_tasks = chronos.my_task_ids(my_fqdn, 'chronos-2.4.0')
+puts chronos_tasks  if config[:debug]
+
 ## compare mesos tasks (source of truth) with tasks seen in marathon
 only_in_mesos = mesos_tasks - marathon_tasks
+chronos_tasks.each {|chronos_task| only_in_mesos.delete_if {|mesos_task| mesos_task.match(chronos_task) }}
 
 ## compare marathon tasks with tasks seen in marathon
 only_in_marathon = marathon_tasks - mesos_tasks
@@ -98,16 +110,16 @@ if ! only_in_marathon.empty?
   bad_news << "marathon tasks not seen in mesos: #{only_in_marathon.join(',')}"
 end
 
+
 ### CONSUL
 consul = ConsulCluster.new(mesos.master_hostname)
 ### TODO: test with paas-formatted service names
 puts "#" * 75 if config[:debug]
 puts "* Consul services for #{my_fqdn}:" if config[:debug]
-#consul_services = consul.my_service_ids
-consul_services = consul.my_service_ids.reject { |p| p =~ /panteras/ }.collect { |d| d }.compact.reject   { |i| i.empty? }
+consul_services = consul.my_service_ids
 puts consul.my_services.join("\n") if config[:debug]
 
-good_news << "#{consul_services.size} consul services running."
+good_news << "#{consul.my_services.size} consul services running."
 
 ### set these environment variables here or in shell for testing a remote docker (ie, boot2docker)
 #ENV['DOCKER_HOST']='tcp://192.168.59.103:2376'
@@ -134,10 +146,11 @@ if ! docker_not_mesos.empty?
   bad_news << "docker tasks not seen in mesos: #{docker_not_mesos.join(',')}"
 end
 
+good_news << "#{docker_inspect.count { |d| d[:name] if d[:chronos_job] }} chronos task running."
 good_news << "#{docker_tasks.size} docker tasks running"
 
 ### Compare consul-registered tasks vs docker tasks
-docker_mesos_ids_no_panteras = docker_inspect.reject { |p| p[:name] =~ /panteras/ }.collect { |d| d[:name] }.compact.reject { |i| i.empty? }
+docker_mesos_ids_no_panteras = docker_inspect.reject { |p| p[:name] =~ /panteras/ }.collect { |d| d[:name] if ! d[:chronos_job] }.compact.reject { |i| i.empty? }
 consul_not_docker = consul_services - docker_mesos_ids_no_panteras
 docker_not_consul = docker_mesos_ids_no_panteras - consul_services
 

data/lib/panteras_api/chronos_endpoint.rb

@@ -0,0 +1,18 @@
+class ChronosEndpoint
+  include HTTPUtils
+  include Utils
+
+  def initialize(host, port=8080)
+    @host = host
+    @port = port
+  end
+
+  def all_apps
+    to_j(get_response_with_redirect(@host, '/scheduler/jobs', @port))
+  end
+
+  def my_task_ids(hostname, framework = 'chronos')
+    all_apps.collect { |a| a[:name][0..-1] }
+  end
+
+end

data/lib/panteras_api/docker_host.rb

@@ -25,9 +25,9 @@ class DockerHost
     containers.map do |c|
       inspect = self.command("docker inspect #{c[:container_id]}")[:output]
       h = to_j(inspect.join).first    
-      task_id = h[:Config][:Env].select { |env| env =~ /MESOS_TASK_ID=/ }.first
+      task_id = h[:Config][:Env].select { |env| env.upcase  =~ /MESOS_TASK_ID=/ }.first
       mesos_task_id = task_id.nil? ? '' : task_id.split(/=/)[1] 
-      { id: h[:Id], image: h[:Image], name: h[:Name][1..-1], mesos_task_id: mesos_task_id }
+      { id: h[:Id], image: h[:Image], name: h[:Name][1..-1], mesos_task_id: mesos_task_id, chronos_job: h[:Config][:Env].join(',').include?('CHRONOS_JOB_NAME=') ? true : false  }
     end
   end
   
@@ -74,4 +74,4 @@ class DockerHost
     return { :output => output, :error => error}
        
   end
-end
+end

data/lib/panteras_api/marathon_endpoint.rb

@@ -29,12 +29,12 @@ class MarathonEndpoint
     app_names.collect { |n| app(n)[:tasks].select { |t| t[:host] =~ /^#{hostname}$/ }  }
   end
   
-  def my_task_ids(hostname)
+  def my_task_ids(hostname, framework = 'marathon')
     my_tasks(hostname).collect { |t| t.collect { |a| a[:id] } }.flatten
-end
+  end
   
   def task_ids
     app_names.collect { |a| tasks_ids(a) }
   end
   
-end
+end

data/lib/panteras_api/mesos_cluster.rb

@@ -2,6 +2,7 @@
 
 require 'uri'
 require 'json'
+require 'pp'
 
 class MesosCluster
   include HTTPUtils
@@ -47,8 +48,12 @@ class MesosCluster
     state[:frameworks].collect { |f| f[:completed_tasks].collect { |t| t  } }   
   end
   
-  def tasks
-    results = frameworks.collect { |f| f[:tasks].collect { |t| t[:slave_hostname] = slave_hostname_by_id(t[:slave_id]) ; t } }
+  def tasks(framework = nil)
+    results = frameworks.collect do |a|
+      if a[:name] == framework
+        a[:tasks].collect { |t| t[:slave_hostname] = slave_hostname_by_id(t[:slave_id]) ; t }
+      end
+    end
     results.reject { |r| r.nil? or r.length == 0 }.first
   end
   
@@ -56,9 +61,14 @@ class MesosCluster
     tasks.collect { |t| t[:id] }
   end
   
-  def my_tasks_ids(hostname)
-   raise ArgumentError, "missing hostname argument", caller if hostname.nil?
-   tasks.select { |t| t[:slave_hostname] =~ /^#{hostname}$/ }.collect { |t| t[:id] }
+  def my_tasks_ids(hostname, framework)
+    raise ArgumentError, "missing hostname argument", caller if hostname.nil?
+    new_tasks = tasks(framework)
+    if ! new_tasks.nil?
+      new_tasks.select { |t| t[:slave_hostname] =~ /^#{hostname}$/ }.collect { |t| t[:id] }
+    else
+      new_tasks = []
+    end
   end
   
   def resources

data/lib/panteras_api/version.rb

@@ -1,3 +1,3 @@
 module PanterasApi
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/panteras_api.rb

@@ -3,6 +3,7 @@ require "panteras_api/utils"
 require "panteras_api/http_utils"
 require "panteras_api/mesos_cluster"
 require "panteras_api/marathon_endpoint"
+require "panteras_api/chronos_endpoint"
 require "panteras_api/consul_cluster"
 require "panteras_api/docker_host"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panteras_api
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Jonathan Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-25 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - bin/mesos_consul_consistency_check
 - bin/mesos_consul_consistency_check_nagios_wrapper
 - lib/panteras_api.rb
+- lib/panteras_api/chronos_endpoint.rb
 - lib/panteras_api/consul_cluster.rb
 - lib/panteras_api/docker_host.rb
 - lib/panteras_api/http_utils.rb