kldockeragent 0.5.9 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abddf3cacc1de263d02ee180bb3f4fea4053082a
-  data.tar.gz: 76dafbf86dbf48aabbc9027e3905dc3858ef712c
+  metadata.gz: 523f3483e93ca597947ec856755a1e08f165c416
+  data.tar.gz: 78ec27a13d24964c0b0f9aa07e488fc8c6c7f154
 SHA512:
-  metadata.gz: a1e2e83f811e8ac2f9cd4427d63ac04cf522dd8e871ea701a69d0728020186531ee78426a6bd331e85f4541ed9e69ef945b0f2c158b3e4095238d3c8c815a1c6
-  data.tar.gz: 5b2fbdf3120d9dc5cd717e493fde7d6eaadbc39c507de9676069ca15dc35a08496f00f95073fbac49ea189bfb333625fb1cdfbbbbe3dff7a3da987e8fbc6be2d
+  metadata.gz: 9f0c293ff37b84bee484eb6705fe186c91a5d02193c102144617411c9b7b6bcaaff3854345fd88ac98e2b7d32fa06ff580dd53350350281a190d7024df219ae2
+  data.tar.gz: a441aab80df7f354a5d42e2f393e382b37f73c747183329cf33d49b9d758ca01256427c8cf35e6f16659f5a59cf398ad88a4e7f096df45e65e68ff46e166eb2f

data/VERSION

@@ -1 +1 @@
-0.5.9
+0.6.1

data/kldockeragent.gemspec

@@ -14,14 +14,13 @@ Gem::Specification.new do |s|
   
   s.required_ruby_version = '~> 2.3'
 
-  s.add_dependency 'thread'
-  s.add_dependency 'json'
-  s.add_dependency 'trollop'
-  s.add_dependency 'webrick'
-  s.add_dependency 'sinatra'
-  s.add_dependency 'openssl'
-  s.add_dependency 'usagewatch'
-  s.add_dependency 'rack-ssl'
+  s.add_dependency 'thread', '~> 0.2'
+  s.add_dependency 'json', '~> 2.0'
+  s.add_dependency 'trollop', '~> 2.1'
+  s.add_dependency 'webrick', '~> 1.3'
+  s.add_dependency 'sinatra', '~> 1.4'
+  s.add_dependency 'openssl', '~> 2.0'
+  s.add_dependency 'usagewatch', '~> 0.0'
 
-  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rake', '~> 10.4'
 end

data/lib/kldockeragent/agent.rb

@@ -33,7 +33,7 @@ module KL
 			puts "Starting agent..."
 
 			@@config = opts
-			Process.daemon if opts[:daemon] and not opts[:mock]
+			Process.daemon() if opts[:daemon] and not opts[:mock]
 			begin
 			 	if not is_windows
 					# trap signal
@@ -58,7 +58,9 @@ module KL
 			 	web_server.start
 
 			 	@@main_enabled = true
-			 	while @@main_enabled; end
+			 	while @@main_enabled 
+			 		sleep(1)
+			 	end
 
 			rescue Exception => e
 			 	KL.logger.error "Starting the agent [Failed] #{e}\n#{e.backtrace.join("\n")}"

data/lib/kldockeragent/helper.rb

@@ -120,20 +120,67 @@ module KL
 	def KL.Request_getDockerListAllApplications
 		filter = '_klac'
 		apps = Array.new
-	    query = `docker ps --filter="name=#{filter}" --format="{{.ID}}::{{.Names}}::{{.Status}}::{{.Image}}"`
+	    query = `docker ps --format="{{.ID}}::{{.Names}}::{{.Status}}::{{.Image}}"`
 	    query.gsub!(/\r\n?/, "\n")
 	    query.each_line do |line|
 	        data = line.split('::')
 	        apps.push({
 	        	'id' => data[0], 
-	        	'name' => data[1].gsub(filter,""),
+	        	'name' => data[1],
 	        	'status'=>data[2],
-	        	'image'=>data[3].gsub("\n","")
+	        	'image'=>data[3].gsub("\n",""),
+	        	'stats'=>KL.getDockerConfigData(data[0]),
+	        	'application' => KL.getApplicationInfo(data[1], filter)
 	        	})
 	    end
 	    return apps
 	end
 
+	def KL.getDockerConfigData(container)
+		query = `docker stats --no-stream #{container}`
+		query.gsub!(/\r\n?/, "\n")
+		keys = Array.new
+		values = Array.new
+		out = '{'
+		i = 0
+		query.each_line do |line|
+			data = line.split('  ')
+			data.each do |value|
+				if (value.strip != '')
+					if (i == 0)
+						keys.push(value.strip)
+					else
+						values.push(value.strip)
+					end
+				end
+			end
+			i = i + 1
+		end
+		i = 0
+		keys.each do |key|
+			if (i > 0)
+				out = out + ','
+			end
+  			out = out + "\"#{key}\":\"#{values[i]}\""
+  			i = i + 1
+		end
+		out = out + '}'
+
+		return JSON.parse(out)
+	end
+
+	def KL.removeEmptyObjects(json)
+		return json.gsub('{}','""')
+	end
+
+	def KL.getApplicationInfo(name, filter)
+		output = ""
+		if (name.include? filter)
+			output = name.gsub(filter,'')
+		end
+		return output
+	end
+
 	def KL.Request_getSystemInfo
 		usw = Usagewatch
 		info = {}
@@ -143,8 +190,6 @@ module KL
 			info['diskused_perc'] = usw.uw_diskused_perc.to_s
 			info['cpuused'] = usw.uw_cpuused.to_s
 			info['memused'] = usw.uw_memused.to_s
-			#info['cputop'] = usw.uw_cputop
-			#info['memtop'] = usw.uw_memtop
 		else
 			info['os'] = 'not linux'
 		end 

metadata

@@ -1,141 +1,127 @@
 --- !ruby/object:Gem::Specification
 name: kldockeragent
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.1
 platform: ruby
 authors:
 - Kytoonlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: webrick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: usagewatch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-ssl
-  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'
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.4'
 description: Agent with REST Api to send information about docker containers
 email: admin@kytoonlabs.com
 executables:
@@ -176,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: KL DockerAgent