chef-deployment-monitor 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: a97d20f6c294a70850ba7e1a465e6a701b218dbb
-  data.tar.gz: af54833c10acbbb6f1ebad76e5eaff0e717ebd9b
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWM1YmNlNWJhNjc3NGNmYWVmNDVmZDBmZDgyZDgwOWQ2MmIxNTI2Nw==
+  data.tar.gz: !binary |-
+    Y2FlNDY2ZTQ2YTJmNzZhMDNhYWNjYzAxM2JmZmY3ZTY2MGJmNGUyYg==
 SHA512:
-  metadata.gz: 58f375bae12d0af850d9ef085be6c853957b4fddc6292e1b9a39369633609b3ab84d8269b09ad79ba4d38eff72e38a1e70b94cc55e96d6d256fde9cdd92ca65a
-  data.tar.gz: ceb79408bd8fcad581350d861f6036af7fd9a9e18051ea6b4854f1dd452eda5420de2c87c10b6bee740e7c9ec15636b7d97416c4bbb0ad9ebff5cfe197c47da2
+  metadata.gz: !binary |-
+    NTEzM2E2YzRlNzQwZjJiMjNiYWIzNjRkOTVkOTI0ZWFjOTMzOGI5OTZhNTYy
+    Mjk1ZWU0MGY4YzJkMTNjZDhjNDI2NzkyZDQ1OGRmNjMyNzdiYWMyNTJlMDUw
+    MDRkN2IyMDNhZGRkYmFmN2FhNWE2NzFhNTZjZDVlZDdlZDRmYzc=
+  data.tar.gz: !binary |-
+    ZDE0NTAwNGExZjk4NzY2YmM3NTJmN2Q1NWQ1MDQwMmU3ZDM5MTBmODg2NzEz
+    MGM2NDE2N2QxN2I1M2UxYjU3NTJjMDg1ZDczNmViMDBlNzcxNDA1YzhjZmVi
+    MjQ3MjZjZDRhNDYzNmFmMDgzYTE4YjgwZTA4ZGU5ZDZlZjYzNTk=

data/.gitignore

@@ -0,0 +1,2 @@
+*.gem
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+rvm:
+- 1.9.3
+- 2.2.0
+deploy:
+  provider: rubygems
+  api_key:
+    secure: mqUOkyrmNz2gB58ejdwW25+7XWDm9e2GdiuogdmJ/RcfhyPOjhUqf7DtJIeeNt8MZ21JGZNr079sR7wLHHBFhPAVLI0jxUwyWe9Z20p2OJydqS/gYaAiZykWp8sPbfbwKvmdMNiVPTMmscz/27NALROjpQvKS7t/yhCirBrOVPNsh/8YS94bQbOK6NsxN0l9Xig2Ltq68nDjezCR0fgpGaNnu6XMAz8+uw9H9T20ZeTUhLBKYxx7zgDg56v/GwUW5LD9b/4h/YBF9kqCKiTxZ1xx1sPU+cGXqpKZxGzOzXwCr2OFPD/6d12aMfcQaCIML1AWIrgIR0pYZnzf7Qz4ZkMJv27ZF0RSqG0Asyg41z+pf5EMxHTw43ARnk9f7+TX/LXEIP7LexevGPq6dAOcGYjQtutq5V6iMyU7V2uSDsHX2fAPOI/75IiXDw8l4EedXraFcf0NpfBV0vf0pdePMThjF8dy0BbBbNPZ+ioq6RiMyppJdFtTyViZylOSbNvl6GXBRj9SEYje5cvjTzuXE7YmpCUtPiA46HqEEXqBerlkxHRAZLWZxMKnVD6STCZxkwgH9agJyD0dOaWqnUAkQ23YUa3hjePpp7Fd7PUjK58uxy0C+usZK6GhDa0IfX/Yi3XoWbQOO9jK1bwv2uAGSG0tqFZKcnhBgiFa4b3t1Hc=
+  gem: chef-deployment-monitor
+  on:
+    tags: true
+    repo: kamaradclimber/chef-deployment-monitor

data/Rakefile

@@ -1 +1,11 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new do |t|
+  t.options << '--lint'
+end
+
+task default: :rubocop
+
+task :test do
+end

data/bin/chef-logmon

@@ -17,47 +17,46 @@
 # limitations under the License.
 #
 
-require "chef_logmon"
+require 'chef_logmon'
 require 'rubygems'
 require 'file-tail'
 require 'json'
 require 'daemons'
 
-config=nil
-debug=false
+config = nil
+debug = false
 
-opt=0
+opt = 0
 ARGV.each do |arg|
-  config = ARGV[opt+1] if arg == "-C" || arg == "--config"
-  debug = true if arg == "--debug"
-  opt+=1
+  config = ARGV[opt + 1] if arg == '-C' || arg == '--config'
+  debug = true if arg == '--debug'
+  opt += 1
 end
 
 if config.nil?
-  puts "Please enter the configuration file with the option -C or --config"
+  puts 'Please enter the configuration file with the option -C or --config'
   exit 1
 else
-  Monitor::Config.from_file(config)
-  [ "mon_file", "chef_url", "pid_dir", "log_dir" ].each do |item|
-    if Monitor::Config[item.to_sym].empty?
+  Chef::Deployment::Monitor::Config.from_file(config)
+  %w(mon_file pid_dir log_dir).each do |item|
+    if (Chef::Deployment::Monitor::Config[item.to_sym] || '').empty?
       puts "Missing item: #{item} within the configuration file!"
       exit 1
     end
   end
-end    
+end
 
-LOGMONNAME = %x[hostname]
+LOGMONNAME = `hostname`
 DEBUG = debug
 
 @options = {
-  :log_output => true,
-  :dir_mode => :normal,
-  :dir => Monitor::Config[:pid_dir],
-  :log_dir => Monitor::Config[:log_dir]
+  log_output: true,
+  dir_mode: :normal,
+  dir: Chef::Deployment::Monitor::Config[:pid_dir],
+  log_dir: Chef::Deployment::Monitor::Config[:log_dir]
 }
 
 Daemons.run_proc('chef-logmon', @options) do
-  logmon = Monitor::Logmon.new
-  logmon.run()
+  logmon = Chef::Deployment::Monitor::Logmon.new
+  logmon.run
 end
-

data/chef-deployment-monitor.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'chef_deployment_monitor/version'
+
+Gem::Specification.new do |s|
+  s.name              = 'chef-deployment-monitor'
+  s.version           = Chef::Deployment::Monitor::VERSION
+  s.platform          = Gem::Platform::RUBY
+  s.has_rdoc          = false
+  s.extra_rdoc_files  = ['LICENSE']
+  s.authors           = ['Sander Botman', 'Grégoire Seux']
+  s.email             = ['g.seux@criteo.com']
+  s.homepage          = 'https://github.com/kamaradclimber/chef-deployment-monitor'
+  s.summary           = 'Chef Monitoring tool to monitor all changes made'
+  s.description       = s.summary
+  s.files             = `git ls-files`.split("\n")
+  s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables       = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths     = ['lib']
+  s.license           = 'Apache 2.0'
+  s.add_dependency 'file-tail', '>= 1.0.12'
+  s.add_dependency 'daemons', '>= 1.1.9'
+  s.add_dependency 'mixlib-config'
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rubocop'
+end

data/lib/{chef_monitor → chef_deployment_monitor}/config.rb

@@ -17,15 +17,22 @@
 
 require 'mixlib/config'
 
-class Monitor
-  class Config
-
-    extend Mixlib::Config
-    config_strict_mode true
-
-    default :marker_file, '/tmp/last_chef_deployment'
-    %w(user_blacklist mon_file log_dir pid_dir).each { |o| configurable o.to_sym }
+class Chef
+  class Deployment
+    class Monitor
+      class Config
+        extend Mixlib::Config
+        config_strict_mode true
 
+        default :marker_file, '/tmp/last_chef_deployment'
+        default :action_blacklist, /GET/
+        %w(
+      user_blacklist
+      mon_file
+      log_dir
+      pid_dir
+        ).each { |o| configurable o.to_sym }
+      end
+    end
   end
 end
-

data/lib/{chef_monitor → chef_deployment_monitor}/log.rb

@@ -15,23 +15,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Monitor
-  class Log
-    
-    def initialize(text, type='INFO')
-      case type.downcase
-      when "INFO".downcase
-        puts "[" + Time.now.iso8601 + "] INFO: " + text
-      when "WARN".downcase
-        puts "[" + Time.now.iso8601 + "] WARN: " + text
-      when "ERROR".downcase
-        puts "[" + Time.now.iso8601 + "] ERROR: " + text
-      when "DEBUG".downcase
-        puts "[" + Time.now.iso8601 + "] DEBUG: " + text if DEBUG
-      else
-        puts "[" + Time.now.iso8601 + "] UNKNOWN: " + text
+class Chef
+  class Deployment
+    class Monitor
+      class Log
+        def initialize(text, type = 'INFO')
+          case type.downcase
+          when 'INFO'.downcase
+            puts '[' + Time.now.iso8601 + '] INFO: ' + text
+          when 'WARN'.downcase
+            puts '[' + Time.now.iso8601 + '] WARN: ' + text
+          when 'ERROR'.downcase
+            puts '[' + Time.now.iso8601 + '] ERROR: ' + text
+          when 'DEBUG'.downcase
+            puts '[' + Time.now.iso8601 + '] DEBUG: ' + text if DEBUG
+          else
+            puts '[' + Time.now.iso8601 + '] UNKNOWN: ' + text
+          end
+        end
       end
     end
-
   end
 end

data/lib/chef_deployment_monitor/logmon.rb

@@ -0,0 +1,77 @@
+#
+# Author:: Sander Botman (<sander.botman@gmail.com>)
+# Copyright:: Copyright (c) 2014 Sander Botman.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+class Chef
+  class Deployment
+    class Monitor
+      class Logmon
+        def run
+          sink = MarkerFileSink.new
+
+          begin
+            File.open(Monitor::Config[:mon_file]) do |mon|
+              mon.extend(File::Tail)
+              mon.interval = 5
+              mon.backward(1)
+              mon.tail do |line|
+                data = scan(line)
+                # skipping the objects 'checksum-.*' and 'reports'
+                unless data.nil? || data['org'].nil? || data['object'] =~ /(^checksum-.*$|^reports$)/
+                  unless filter(data)
+                    Monitor::Log.new(data.to_json, 'INFO')
+                    sink.receive(data)
+                  end
+                end
+              end
+            end
+          end
+        end
+
+        def filter(data)
+          filter_user(data) || filter_action(data)
+        end
+
+        def filter_user(data)
+          user_blacklist = Monitor::Config[:user_blacklist]
+          user_blacklist && (data['user'] =~ user_blacklist)
+        end
+
+        def filter_action(data)
+          action_blacklist = Monitor::Config[:action_blacklist]
+          action_blacklist && (data['action'] =~ action_blacklist)
+        end
+
+        def scan(line)
+          @regex = /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - (.{0})- \[([^\]]+?)\]  "(\w+) ([^\s]+?) (HTTP\/1\.1)" (\d+) "(.*)" (\d+) "-" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)"/
+          if line =~ @regex
+            data = {}
+            data['time']    = Regexp.last_match(3)
+            data['user']    = Regexp.last_match(16)
+            data['server']  = LOGMONNAME
+            data['org']     = Regexp.last_match(5).split('/')[2] unless Regexp.last_match(5).split('/')[2].nil?
+            data['object']  = Regexp.last_match(5).split('/')[3] unless Regexp.last_match(5).split('/')[3].nil?
+            data['name']    = Regexp.last_match(5).split('/')[4] unless Regexp.last_match(5).split('/')[4].nil?
+            data['version'] = Regexp.last_match(5).split('/')[5] unless Regexp.last_match(5).split('/')[5].nil?
+            data['action']  = Regexp.last_match(4)
+            return data
+          end
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/chef_deployment_monitor/sinks.rb

@@ -0,0 +1,37 @@
+
+class Chef
+  class Deployment
+    class Monitor
+      class Sink
+        def receive(_data)
+          fail 'must be implemented by subclass'
+        end
+      end
+
+      class RmqSink < Sink
+        def initialize
+          @conn = Bunny.new(hostname: Monitor::Config[:mq_server])
+          @conn.start
+
+          @ch = @conn.create_channel
+          @q  = @ch.queue(Monitor::Config[:mq_queue], durable: true)
+        end
+
+        def receive(data)
+          @q.publish(data, persistent: true, content_type: 'application/json')
+        end
+      end
+
+      class MarkerFileSink < Sink
+        # will modify the marker file
+        # last write data of marker file will be within 5 seconds
+        # of last deployement
+        def receive(data)
+          File.open(Monitor::Config[:marker_file], 'w+') do |f|
+            f.write(data['user'])
+          end
+        end
+      end
+    end
+  end
+end

data/lib/{chef_monitor → chef_deployment_monitor}/version.rb

@@ -15,7 +15,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-class Monitor
-  VERSION = "0.1.6"
-  MAJOR, MINOR, TINY = VERSION.split('.')
+class Chef
+  class Deployment
+    class Monitor
+      VERSION = '0.2.0'
+      MAJOR, MINOR, TINY = VERSION.split('.')
+    end
+  end
 end

data/lib/chef_logmon.rb

@@ -15,7 +15,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "chef_monitor/log"
-require "chef_monitor/config"
-require "chef_monitor/sinks"
-require "chef_monitor/logmon"
+require 'chef_deployment_monitor/log'
+require 'chef_deployment_monitor/config'
+require 'chef_deployment_monitor/sinks'
+require 'chef_deployment_monitor/logmon'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-deployment-monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Sander Botman
@@ -15,42 +15,70 @@ dependencies:
   name: file-tail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.12
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.1.9
 - !ruby/object:Gem::Dependency
   name: mixlib-config
   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'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Chef Monitoring tool to monitor all changes made
@@ -62,18 +90,20 @@ extensions: []
 extra_rdoc_files:
 - LICENSE
 files:
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/chef-logmon
-- chef-monitor.gemspec
+- chef-deployment-monitor.gemspec
+- lib/chef_deployment_monitor/config.rb
+- lib/chef_deployment_monitor/log.rb
+- lib/chef_deployment_monitor/logmon.rb
+- lib/chef_deployment_monitor/sinks.rb
+- lib/chef_deployment_monitor/version.rb
 - lib/chef_logmon.rb
-- lib/chef_monitor/config.rb
-- lib/chef_monitor/log.rb
-- lib/chef_monitor/logmon.rb
-- lib/chef_monitor/sinks.rb
-- lib/chef_monitor/version.rb
 homepage: https://github.com/kamaradclimber/chef-deployment-monitor
 licenses:
 - Apache 2.0
@@ -84,12 +114,12 @@ require_paths:
 - lib
 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: []

data/chef-monitor.gemspec

@@ -1,24 +0,0 @@
-# -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "chef_monitor/version"
-
-Gem::Specification.new do |s|
-  s.name              = "chef-deployment-monitor"
-  s.version           = Monitor::VERSION
-  s.platform          = Gem::Platform::RUBY
-  s.has_rdoc          = false
-  s.extra_rdoc_files  = ["LICENSE"]
-  s.authors           = ["Sander Botman", 'Grégoire Seux']
-  s.email             = ["g.seux@criteo.com"]
-  s.homepage          = "https://github.com/kamaradclimber/chef-deployment-monitor"
-  s.summary           = %q{Chef Monitoring tool to monitor all changes made}
-  s.description       = s.summary
-  s.files             = `git ls-files`.split("\n")
-  s.test_files        = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables       = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths     = ["lib"]
-  s.license           = 'Apache 2.0'
-  s.add_dependency "file-tail", ">= 1.0.12"
-  s.add_dependency "daemons", ">= 1.1.9"
-  s.add_dependency 'mixlib-config'
-end

data/lib/chef_monitor/logmon.rb

@@ -1,71 +0,0 @@
-#
-# Author:: Sander Botman (<sander.botman@gmail.com>)
-# Copyright:: Copyright (c) 2014 Sander Botman.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-class Monitor
-  class Logmon
-
-    def initialize(config)
-      @config = config
-    end
-
-    def run
-
-      sink = MarkerFileSink.new
-      
-      begin
-        File.open(Monitor::Config[:mon_file]) do |mon|
-          mon.extend(File::Tail)
-          mon.interval = 5
-          mon.backward(1)
-          mon.tail { |line|
-            data = scan(line)
-            # skipping the objects 'checksum-.*' and 'reports'
-            unless data.nil? || data['org'].nil? || data['object'] =~  /(^checksum-.*$|^reports$)/
-              unless filter(data)
-                Monitor::Log.new(data.to_json, "INFO")
-                sink.receive(data)
-              end
-            end
-          }
-        end
-      end
-    end
-
-    def filter(data)
-      user_blacklist = Monitor::Config[:user_blacklist]
-      user_blacklist && (data['user'] =~ user_blacklist)
-    end
-
-    def scan(line)
-      @regex = /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) - (.{0})- \[([^\]]+?)\]  "(PUT|DELETE|POST) ([^\s]+?) (HTTP\/1\.1)" (\d+) "(.*)" (\d+) "-" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)" "(.*)"/
-      if line =~ @regex
-        data = {}
-        data['time']    = $3
-        data['user']    = $16
-        data['server']  = LOGMONNAME
-        data['org']     = $5.split('/')[2] unless $5.split('/')[2].nil?
-        data['object']  = $5.split('/')[3] unless $5.split('/')[3].nil?
-        data['name']    = $5.split('/')[4] unless $5.split('/')[4].nil?
-        data['version'] = $5.split('/')[5] unless $5.split('/')[5].nil?
-        data['action']  = $4
-        return data
-      end
-      return nil
-    end
-
-  end
-end

data/lib/chef_monitor/sinks.rb

@@ -1,33 +0,0 @@
-
-class Monitor
-  class Sink
-    def receive(data)
-      raise "must be implemented by subclass"
-    end
-  end
-
-  class RmqSink < Sink
-    def initialize
-      @conn = Bunny.new(:hostname => Monitor::Config[:mq_server])
-      @conn.start
-
-      @ch = @conn.create_channel
-      @q  = @ch.queue(Monitor::Config[:mq_queue], :durable => true)
-    end
-
-    def receive(data)
-      @q.publish(data, :persistent => true, :content_type => "application/json")
-    end
-  end
-
-  class MarkerFileSink < Sink
-    # will modify the marker file
-    # last write data of marker file will be within 5 seconds
-    # of last deployement
-    def receive(data)
-      File.open(Monitor::Config[:marker_file], 'w+') do |f|
-        f.write(data['user'])
-      end
-    end
-  end
-end