heartbeat-client 0.5.0 → 0.6.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTI0ZmU4MWMxYmQyNGYwZThkYTcxM2U5OWQ4ODdhZWNiODZiNWQ5OQ==
+  data.tar.gz: !binary |-
+    NzE4MjI3ZGQxM2NhNGI4ZDZiOGM3NTQzNGE1N2E2YzVkYzVhNGNlNg==
+SHA512:
+  metadata.gz: !binary |-
+    MzFjMzkxYTAwYWVhZTBkZGZhMzg5OTBlZThmMjFjNGZiZDQwMDRjZDA2YWFk
+    OWZmZjUyNTNmZmZmODNlNGQwODAyNDYwYTEzZDBlYTZlMzJhOTNlYWIyNzcy
+    NGUxMDU3MzE4MTliNzcyYWZkOTE0MjA0MzNmZGZjMTljNWNjZjg=
+  data.tar.gz: !binary |-
+    YTVlMDVkN2EyMDM1N2Y0YzczMjA2MWQ2MjRlNjdjYzljZDM4MzA1YmI1NDgy
+    MGJmMDNkZjQ3NzU0M2ZiMzJhMmQ1YmMwZWNiMjYxY2E5MmUxYjg3YzcxNTM4
+    NmFmYzBmODRjY2Y5YzYwZjU3N2U5ODEzNmFjOTVjNmMzYzA0MjM=

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 gem 'httparty'
 gem 'daemons'
 gem 'foreman'
@@ -9,7 +9,7 @@ gem 'keen'
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.1.3"
+  gem "bundler", "~> 1.6.2"
   gem "jeweler", "~> 1.8.4"
-  gem "rcov", ">= 0"
+  gem "simplecov"
 end

data/Gemfile.lock

@@ -1,25 +1,44 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activesupport (3.2.12)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    addressable (2.3.6)
     bourne (1.1.2)
       mocha (= 0.10.5)
+    builder (3.2.2)
     daemons (1.1.9)
+    docile (1.1.5)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
     foreman (0.61.0)
       thor (>= 0.13.6)
-    git (1.2.5)
+    git (1.2.7)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    hashie (3.2.0)
+    highline (1.6.21)
     httparty (0.10.2)
       multi_json (~> 1.0)
       multi_xml (>= 0.5.2)
     i18n (0.6.1)
-    jeweler (1.8.4)
+    jeweler (1.8.8)
+      builder
       bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.7.7)
+    json (1.8.1)
+    jwt (1.0.0)
     keen (0.4.4)
       multi_json (~> 1.0)
     macaddr (1.6.1)
@@ -29,9 +48,17 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.6.1)
     multi_xml (0.5.3)
-    rake (10.0.3)
-    rcov (1.0.0)
-    rdoc (3.12.1)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.3.2)
+    rdoc (4.1.1)
       json (~> 1.4)
     shoulda (3.3.2)
       shoulda-context (~> 1.0.1)
@@ -40,6 +67,11 @@ GEM
     shoulda-matchers (1.4.2)
       activesupport (>= 3.0.0)
       bourne (~> 1.1.2)
+    simplecov (0.9.0)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
     systemu (2.5.2)
     thor (0.17.0)
 
@@ -47,12 +79,12 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.1.3)
+  bundler (~> 1.6.2)
   daemons
   foreman
   httparty
   jeweler (~> 1.8.4)
   keen
   macaddr
-  rcov
   shoulda
+  simplecov

data/Rakefile

@@ -19,11 +19,6 @@ Jeweler::Tasks.new do |gem|
   gem.description = "Heartbeat Client in Ruby"
   gem.email = "kiessler@inceedo.com"
   gem.authors = ["Oliver Kiessler"]
-  gem.add_runtime_dependency 'daemons'
-  gem.add_runtime_dependency 'httparty'
-  gem.add_runtime_dependency 'json'
-  gem.add_runtime_dependency 'foreman'
-  gem.add_runtime_dependency 'macaddr'
 end
 Jeweler::RubygemsDotOrgTasks.new
 
@@ -34,13 +29,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
 require 'rdoc/task'

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.6.0

data/heartbeat-client.gemspec

@@ -0,0 +1,79 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: heartbeat-client 0.6.0 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "heartbeat-client"
+  s.version = "0.6.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["Oliver Kiessler"]
+  s.date = "2014-07-30"
+  s.description = "Heartbeat Client in Ruby"
+  s.email = "kiessler@inceedo.com"
+  s.executables = ["hbc"]
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "Procfile",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bin/hbc",
+    "heartbeat-client.gemspec",
+    "heartbeat-client.yml.sample",
+    "lib/heartbeat-client.rb",
+    "test/helper.rb",
+    "test/test_heartbeat-client.rb"
+  ]
+  s.homepage = "http://github.com/okiess/heartbeat-client"
+  s.licenses = ["MIT"]
+  s.rubygems_version = "2.2.2"
+  s.summary = "Heartbeat"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<httparty>, [">= 0"])
+      s.add_runtime_dependency(%q<daemons>, [">= 0"])
+      s.add_runtime_dependency(%q<foreman>, [">= 0"])
+      s.add_runtime_dependency(%q<macaddr>, [">= 0"])
+      s.add_runtime_dependency(%q<keen>, [">= 0"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.6.2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
+    else
+      s.add_dependency(%q<httparty>, [">= 0"])
+      s.add_dependency(%q<daemons>, [">= 0"])
+      s.add_dependency(%q<foreman>, [">= 0"])
+      s.add_dependency(%q<macaddr>, [">= 0"])
+      s.add_dependency(%q<keen>, [">= 0"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.6.2"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<httparty>, [">= 0"])
+    s.add_dependency(%q<daemons>, [">= 0"])
+    s.add_dependency(%q<foreman>, [">= 0"])
+    s.add_dependency(%q<macaddr>, [">= 0"])
+    s.add_dependency(%q<keen>, [">= 0"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.6.2"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
+  end
+end
+

data/heartbeat-client.yml.sample

@@ -3,6 +3,7 @@ apikey: "<YOUR KEY>"
 name: "<SERVER NAME ALIAS>"
 apache_status: "http://127.0.0.1/server-status/?auto"
 mongostat_arguments: "-h 127.0.0.1 -n 1"
+docker_command: "docker ps"
 #mongostat_arguments: "-h 127.0.0.1 -n 1 -u YOUR_USER -p PASS"
 #keen_project_token: ""
 #keen_api_key: ""

data/lib/heartbeat-client.rb

@@ -37,6 +37,7 @@ class Heartbeat
     keen_project_token = config['keen_project_token']
     keen_api_key = config['keen_api_key']
     keen_collection = config['keen_collection']
+    docker_command = config['docker_command']
 
     if gather_metrics
       procs = {'total' => 0, 'running' => 0, 'stuck' => 0, 'sleeping' => 0, 'threads' => 0, 'stopped' => 0, 'zombie' => 0}
@@ -48,6 +49,7 @@ class Heartbeat
       swap = {'free' => 0, 'used' => 0}
       apache = {}
       mongodb = {}
+      docker_containers = []
 
       log.debug("Dumping top output...")
       if is_linux?
@@ -68,6 +70,11 @@ class Heartbeat
         log.debug("Dumping mongostat output...")
         `mongostat #{mongostat_arguments} > /tmp/mongodb.out`
       end
+      
+      if docker_command
+        log.debug("Dumping docker output...")
+        `#{docker_command} > /tmp/docker.out`
+      end
 
       if File.exists?('/tmp/top.out')
         counter = 0; proc_count = 0
@@ -121,6 +128,17 @@ class Heartbeat
             mongodb_status(mongodb, lines)
           end
         end
+        
+        if File.exists?('/tmp/docker.out')
+          File.open("/tmp/docker.out", "r") do |infile|
+            counter = 0; lines = []
+            while (line = infile.gets)
+              lines << line if counter > 0
+              counter += 1
+            end
+            docker(docker_containers, lines)
+          end
+        end
 
         options = {
           :body => {
@@ -140,7 +158,8 @@ class Heartbeat
                 :disks => disks,
                 :swap => swap,
                 :apache_status => apache,
-                :mongodb_status => mongodb
+                :mongodb_status => mongodb,
+                :docker_containers => docker_containers
               }
             }
           }
@@ -272,6 +291,18 @@ class Heartbeat
       end
     end
   end
+  
+  def self.docker(docker_containers, lines)
+    if lines and lines.size > 0
+      lines.each do |line|
+        container = {}
+        parts = line.split(" ")
+        container['name'] = parts[0]
+        container['image'] = parts[1]
+        docker_containers << container
+      end
+    end
+  end
 
   def self.disk_usage(disks, str)
     ds = str.split(' ')

metadata

@@ -1,232 +1,150 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: heartbeat-client
-version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 0
-  version: 0.5.0
+version: !ruby/object:Gem::Version
+  version: 0.6.0
 platform: ruby
-authors: 
+authors:
 - Oliver Kiessler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-23 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2014-07-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id002
-  name: daemons
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: daemons
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id003
-  name: foreman
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: foreman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
-  name: macaddr
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: macaddr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id005
-  name: keen
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: keen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id006
-  name: shoulda
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 1
-        - 3
-        version: 1.1.3
-  version_requirements: *id007
-  name: bundler
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.2
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 1
-        - 8
-        - 4
-        version: 1.8.4
-  version_requirements: *id008
+      - !ruby/object:Gem::Version
+        version: 1.6.2
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id009
-  name: rcov
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.4
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id010
-  name: daemons
   prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id011
-  name: httparty
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id012
-  name: json
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id013
-  name: foreman
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id014
-  name: macaddr
-  prerelease: false
-  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Heartbeat Client in Ruby
 email: kiessler@inceedo.com
-executables: 
+executables:
 - hbc
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -236,42 +154,33 @@ files:
 - Rakefile
 - VERSION
 - bin/hbc
+- heartbeat-client.gemspec
 - heartbeat-client.yml.sample
 - lib/heartbeat-client.rb
 - test/helper.rb
 - test/test_heartbeat-client.rb
 homepage: http://github.com/okiess/heartbeat-client
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Heartbeat
 test_files: []
-