chef-monitor 0.1.0 → 0.1.2

data/bin/chef-logmon

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require "chef_monitor"
+require "chef_logmon"
 require 'rubygems'
 require 'file-tail'
 require 'bunny'
@@ -24,9 +24,12 @@ require 'json'
 require 'daemons'
 
 config=nil
+debug=false
+
 opt=0
 ARGV.each do |arg|
   config = ARGV[opt+1] if arg == "-C" || arg == "--config"
+  debug = true if arg == "--debug"
   opt+=1
 end
 
@@ -47,6 +50,7 @@ MQSERVER = Monitor::Config[:mq_server]
 MQQUEUE  = Monitor::Config[:mq_queue]
 MON_FILE = Monitor::Config[:mon_file]
 CHEF_URL = Monitor::Config[:chef_url]
+DEBUG = debug
 
 @options = {
   :log_output => true,

data/bin/chef-worker

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+#!/opt/chef/embedded/bin/ruby
 #
 # Author:: Sander Botman (<sander.botman@gmail.com>)
 # Copyright:: Copyright (c) 2014 Sander Botman.
@@ -15,17 +16,21 @@
 # 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.
-
-require "chef_monitor"
+# $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+require "chef_worker"
 require 'rubygems'
 require 'bunny'
 require 'json'
 require 'daemons'
 
 config=nil
+populate=nil
+debug=false
 opt=0
 ARGV.each do |arg|
   config = ARGV[opt+1] if arg == "-C" || arg == "--config"
+  populate = ARGV[opt+1] if arg == "-O" 
+  debug = true if arg == "--debug"
   opt+=1
 end
 
@@ -42,10 +47,12 @@ else
   end
 end    
 
-MQSERVER      = Monitor::Config[:mq_server]
-MQQUEUE       = Monitor::Config[:mq_queue]
-DOWNLOAD_PATH = Monitor::Config[:download_path]
-CHEF_URL      = Monitor::Config[:chef_url]
+ALLOWED_OBJECTS = ['users', 'cookbooks','roles','environments','clients','nodes','groups','data']
+DOWNLOAD_PATH   = Monitor::Config[:download_path]
+MQSERVER        = Monitor::Config[:mq_server]
+MQQUEUE         = Monitor::Config[:mq_queue]
+CHEF_URL        = Monitor::Config[:chef_url]
+DEBUG           = debug
 Chef::Config[:node_name]  = Monitor::Config[:node_name]
 Chef::Config[:client_key] = Monitor::Config[:client_key]
 
@@ -56,6 +63,26 @@ Chef::Config[:client_key] = Monitor::Config[:client_key]
   :log_dir => Monitor::Config[:log_dir]
 }
 
+unless populate.nil?
+  Chef::Config[:chef_server_url] = CHEF_URL + "/organizations/#{populate}"
+  ALLOWED_OBJECTS.each do |object|
+    data = {}
+    data['object'] = object
+    data['action'] = 'POST'
+    data['org']    = populate
+    data['time']   = Time.now
+    data['user']   = 'chef-worker'
+    data['server'] = ENV['HOSTNAME']
+    pop = Monitor::Item.new(data)
+    obj = Monitor::ItemList.new(data)
+    obj.each do |item|
+      item.download(DOWNLOAD_PATH)
+    end
+    pop.commit_nohook(DOWNLOAD_PATH)
+  end
+  exit 0
+end
+
 Daemons.run_proc('chef-worker', @options) do
   worker = Monitor::Worker.new
   worker.run()

data/lib/chef_logmon.rb

@@ -0,0 +1,20 @@
+#
+# 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.
+
+require "chef_monitor/log"
+require "chef_monitor/config"
+require "chef_monitor/logmon"

data/lib/chef_monitor/item.rb

@@ -43,13 +43,12 @@ class Monitor
     attr_reader :organization
   
     def download(path)
-      case self.object
-      when 'data', 'roles', 'clients', 'environments', 'nodes'
-        r = download_object(path)
-      when 'cookbooks'
+
+      if @object == "cookbooks" 
         r = download_cookbook(path)
+      else
+        r = download_object(path)
       end
- 
 
       (@version.nil? || @version.empty?) ? object = [@organization, @object, @name].join('/') : object = [@organization, @object, @name, @version].join('/') 
 
@@ -71,8 +70,8 @@ class Monitor
       items << @organization
       items << @object
       if @name
-        filename=@name + ".json" if [ "nodes", "clients", "roles", "environments" ].include?(@object)
-
+        filename=@name + ".json" 
+ 
         if @object == "cookbooks"
           (@version.nil? || @version.empty?) ? filename=@name : filename=@name + "-" + @version
         end
@@ -83,37 +82,62 @@ class Monitor
 
         items << filename
       end
-
       file = items.join("/")
-      unless file.nil?
-        FileUtils.rm_rf(file)
-        (@version.nil? || @version.empty?) ? object = [@organization, @object, @name].join('/') : object = [@organization, @object, @name, @version].join('/') 
-        Monitor::Log.new("Deleted   : " + object, 'INFO')
-        return true        
+      delete_file(file)
+    end
+
+    def delete_file(file)
+      FileUtils.rm_rf(file)
+      Monitor::Log.new("Deleted   : " + file, 'INFO')
+      true
+    end
+ 
+    def get_item_json(object)
+      begin
+        item = rest.get_rest(object)
+        result = JSON.pretty_generate(item)
+      rescue
+        return nil
       end
-      return false
+      return result
     end
 
     def commit(path)
-        current_dir = Dir.pwd
-        commit_dir = File.join(path, @organization, @object)
-        Dir.chdir(commit_dir)
-        @version ? object = [@organization, @object, @name, @version].join('/') : object = [@organization, @object, @name].join('/')
-        text = "User     : " + @user + "\nObject   : " + @object + "\nAction   : " + @action + "\nLog Time : " + @time
-        domain = %x(git config hooks.emaildomain)
-        domain = "@" + domain unless domain[0,1] == "@"        
-        username = @name
-        useremail = @name + domain
-        %x(git config hooks.username #{username} )
-        %x(git config hooks.useremail #{useremail} )
-        %x(git add .)
-        %x(git commit -am \"#{text}\")
-        Dir.chdir(current_dir)
-      return true
+      current_dir = Dir.pwd
+      commit_dir = File.join(path, @organization, @object)
+      Dir.chdir(commit_dir)
+      @version ? object = [@organization, @object, @name, @version].join('/') : object = [@organization, @object, @name].join('/')
+      text = "User     : " + @user + "\nObject   : " + object + "\nAction   : " + @action + "\nLog Time : " + @time
+      domain = %x(git config hooks.emaildomain) || "acme.com"
+      domain = "@" + domain unless domain[0,1] == "@"        
+      username = @user
+      useremail = @user + domain
+      %x(git config hooks.username #{username} )
+      %x(git config hooks.useremail #{useremail} )
+      %x(git add .)
+      %x(git commit -am \"#{text}\")
+      Dir.chdir(current_dir)
+    end
+
+    def commit_nohook(path)
+      current_dir = Dir.pwd
+      commit_dir = File.join(path, @organization, @object)
+      Dir.chdir(commit_dir)
+      %x(git config hooks.exclude true)
+      %x(git add .)
+      %x(git commit -am \"no hook executed on this commit\")
+      Dir.chdir(current_dir)
     end
-    
+
     private
-    
+
+    def rest
+      @rest ||= begin
+        require 'chef/rest'
+        Chef::REST.new(Chef::Config[:chef_server_url])
+      end
+    end
+
     def download_cookbook(path)
       begin
         args = ['cookbook', 'download', @name ]
@@ -133,26 +157,14 @@ class Monitor
     end
   
     def download_object(path)
-      file = File.join(path, @organization, @object, @name + '.json' )
-      begin
-        case @object
-        when 'roles'
-          data = JSON.pretty_generate(Chef::Role.load(@name))
-        when 'nodes'
-          data = JSON.pretty_generate(Chef::Node.load(@name))
-        when 'environments'
-          data = JSON.pretty_generate(Chef::Environment.load(@name))
-        when 'clients'
-          data = JSON.pretty_generate(Chef::ApiClient.load(@name))
-        when 'data'
-          data = JSON.pretty_generate(Chef::DataBagItem.load(@name, @version))
-          file = File.join(path, @organization, @object, @name, @version + '.json' )
-        end
+      args = [ @object, @name ]
+      args.push(@version) if @version
+      item = args.join('/')
+      file = File.join(path, @organization, item + '.json' )
+      data = get_item_json(item)
+      unless data.nil?
         FileUtils.mkdir_p(File.dirname(file)) unless File.directory?(File.dirname(file))
         File.open(file, 'w') {|f| f.write(data)}
-        self.path = File.dirname(file)
-      rescue Exception => e
-        return e
       end
       return true
     end

data/lib/chef_monitor/itemlist.rb

@@ -16,7 +16,6 @@
 # limitations under the License.
 
 require 'chef/client'
-require 'chef_monitor/log'
 require 'chef_monitor/item'
 
 class Monitor
@@ -24,152 +23,90 @@ class Monitor
 
     def initialize(data)
       @name = data['name']
-      @time = data['time'].freeze
-      @user = data['user'].freeze
-      @object = data['object'].freeze
-      @server = data['server'].freeze
-      @action = data['action'].freeze
+      @time = data['time']
+      @user = data['user']
+      @object = data['object']
+      @server = data['server']
+      @action = data['action']
       @version = data['version'] unless data['version'].nil? || data['version'].empty?
-      @organization = data['org'].freeze 
+      @organization = data['org']
+      check_sub_items()
     end
   
-    attr_reader :name
-    attr_reader :time
-    attr_reader :user
-    attr_reader :object
-    attr_reader :action
-    attr_reader :version
-    attr_reader :organization
-  
-    def get_items()
-      name         = @name 
-      object       = @object
-      version      = @version
-  
-      list = []
-      items = []
-      if object.nil? || object.empty?
-        objects = [ "roles", "nodes", "environments", "clients", "cookbooks", "data" ]
+    private
+
+    def check_sub_items()
+      if @object == "cookbooks" || @object == "data"
+        if @name.nil? || @name.empty?
+          add_sub_items(@object)
+        elsif @version.nil? || @version.empty?
+          add_sub_items(@object, @name)
+        else
+          add_item(@object, @name, @version)
+        end
+      elsif @name.nil? || @name.empty?
+        add_sub_items(@object)
       else
-        objects = [ object ]
+        add_item(@object, @name)
       end
-      
-      objects.each do |object|
-        if object == "data"
-          if name.nil? || name.empty?
-            names = get_names(object)
-            names.each {|itemname| list += get_item(object, itemname)}
+    end
+
+    def add_sub_items(object, name=nil)
+      items = get_sub_items(object, name)
+      items.each do |item|
+        res = item.split('/')
+        add_item(res[0], res[1], res[2]) 
+      end      
+    end
+  
+    def get_sub_items(object, name=nil)
+      col = []
+      target = [ object, name ].join('/')
+      items = get_rest_item(target)
+      items.each do |item,value|
+        if object == "data" || object == "cookbooks"
+          if name.nil?
+            col += get_sub_items(object, item)
           else
-            list += get_item(object, name)
+            col.push([object, name, item].join('/')) if object == "data"
+            value['versions'].each {|ver| col << sub_item_parse(ver['url'])} if object == "cookbooks"
           end
+        elsif object == "users"
+          item.each { |k|  k.each {|sv| col << "users/" + sv['username'] unless sv['username'].nil? }} unless name
         else
-          if name.nil? || name.empty?
-            list += get_item(object)
-          else
-            return [ create_item(object, name) ]
-          end
+          col << sub_item_parse(value) unless name
         end
       end
+      return col
+    end
 
-      list.each do |item|
-        url = item['url'].split('/')
-        items << create_item(url[5], url[6], url[7])
-      end      
-      return items
+    def sub_item_parse(str)
+      str.gsub!(Chef::Config[:chef_server_url],"")
+      str[1..-1] if str[0] == '/'
     end
-  
-    def get_names(object)
-      names = []
-      result = get_item(object)
-      result.each do |item|
-        url = item['url'].split('/')
-        names << url[6] 
+
+    def get_rest_item(target)
+      begin
+        result = rest.get_rest(target)
+      rescue 
+        return []
       end
-      return names.uniq
-    end
+      return result    
+     end
 
-    def create_item(object, name, version=nil)
+    def add_item(object, name, version=nil)
       data = {}
       data['time'] = @time
       data['user'] = @user
       data['action'] = @action
       data['server'] = @server
       data['org'] = @organization
-      data['name'] = name
       data['object'] = object
+      data['name'] = name
       data['version'] = version unless version.nil?
-      Monitor::Item.new(data)
+      self << Monitor::Item.new(data)
     end
   
-    def parse_data(object, data)
-      data = JSON[data].to_hash unless data.class == Hash
-      items = []
-      data.each do |key,val|
-        item = {}
-        item['object'] = object
-        item['url'] = val 
-        items << item
-      end
-      items
-    end
-  
-    def get_item(object=nil, name=nil)
-      objects = []
-      begin
-        case object
-        when 'roles'
-          json = JSON[Chef::Role.list]
-          objects = parse_data("role", json)
-        when 'nodes'
-          json = JSON[Chef::Node.list]
-          objects = parse_data("node", json)
-        when 'environments'
-          json = JSON[Chef::Environment.list]
-          objects = parse_data("environment", json)
-        when 'clients'
-          json = JSON[Chef::ApiClient.list]
-          objects = parse_data("client", json)
-        when 'data'
-          if name
-            json = JSON[Chef::DataBag.load(name)]
-            items = JSON[json].to_hash
-            items.each do |key,val|
-              item = {}
-              item['object'] = 'data_bag'
-              item['url'] = val
-              objects << item
-            end
-          else
-            json = JSON[Chef::DataBag.list]
-            items = JSON[json].to_hash
-            items.each do |key,val|
-              objects += get_item(object, key)
-            end
-          end
-        when 'cookbooks'
-          json = JSON[rest.get_rest("/cookbooks?num_versions=all")]
-          items = JSON[json].to_hash
-          items.each do |key,val|
-            val['versions'].each do |version|
-              item = {}
-              item['object'] = 'cookbook'
-              item['url'] = version['url']
-              objects << item
-            end
-          end
-        end
-      rescue Exception => e
-        @version ? object = [@organization, @object, @name, @version].join('/') : object = [@organization, @object, @name].join('/')
-        if e.respond_to?("message")
-          Monitor::Log.new(e.message + ' with object: ' + object , 'ERROR')
-        else
-          Monitor::Log.new('Error while downloading object: ' + object , 'ERROR')
-        end
-        return []
-      end
-      return objects
-    end
- 
     def rest
       @rest ||= begin
         require 'chef/rest'

data/lib/chef_monitor/log.rb

@@ -17,7 +17,7 @@
 
 class Monitor
   class Log
-
+    
     def initialize(text, type='INFO')
       case type.downcase
       when "INFO".downcase
@@ -26,6 +26,8 @@ class Monitor
         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

data/lib/chef_monitor/version.rb

@@ -16,6 +16,6 @@
 # limitations under the License.
 
 class Monitor
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

data/lib/chef_monitor/worker.rb

@@ -15,9 +15,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
 class Monitor
   class Worker
- 
     def run
       conn = Bunny.new(:hostname => MQSERVER)
       conn.start
@@ -30,37 +30,32 @@ class Monitor
         q.subscribe(:ack => true, :block => true) do |delivery_info, properties, body|
           if properties[:content_type] =~ /.*json/
             data = JSON.parse(body).to_hash
-    
-            if data['object'].nil? || data['object'].empty?
-              log_obj = data['org']
-            elsif data['name'].nil? || data['name'].empty?
-              log_obj = [ data['org'], data['object'] ].join('/')
-            elsif data['version'].nil? || data['version'].empty?
-              log_obj = [ data['org'], data['object'], data['name'] ].join('/')
-            else
-              log_obj = [ data['org'], data['object'], data['name'], data['version'] ].join('/')
-            end
-            Monitor::Log.new("Receiving : #{log_obj} action: #{data['action']}", "INFO")
-    
+            Monitor::Log.new("Receiving : #{data}", "DEBUG") 
+            data['object'] = nil unless ALLOWED_OBJECTS.include?(data['object'])
+
             unless data['object'].nil? || !File.directory?((File.join(DOWNLOAD_PATH, data['org'])))
               Chef::Config[:chef_server_url] = CHEF_URL + "/organizations/#{data['org']}"
 
-              Monitor::Item.new(data).delete(DOWNLOAD_PATH)
-
-              list_obj = Monitor::ItemList.new(data)
-              list_items = list_obj.get_items()
-    
-              if data['action'] == "PUT" || data['action'] == "POST" || data['action'] == "DELETE"
-                list_items.each do |item|
-                  if item.download(DOWNLOAD_PATH)
-                    item.commit(DOWNLOAD_PATH)
-                  else
-                    Monitor::Log.new("Could not download #{log_obj}", "ERROR")
+              obj = Monitor::Item.new(data)
+              if data['action'] == "DELETE"
+                obj.delete(DOWNLOAD_PATH)
+              else
+                items = Monitor::ItemList.new(data)              
+ 
+                items.each do |item|
+                  if data['action'] == "PUT"
+                    item.download(DOWNLOAD_PATH)
+                  end
+               
+                  if data['action'] == "POST"
+                    item.delete(DOWNLOAD_PATH)
+                    item.download(DOWNLOAD_PATH)
                   end
                 end
               end
+              obj.commit(DOWNLOAD_PATH)
             else
-              Monitor::Log.new("Ignoring  : #{log_obj}", "INFO")
+              Monitor::Log.new("Ignoring  : #{data}", "DEBUG")
             end
           else
             Monitor::Log.new("Unknown   : #{body}", "ERROR")

data/lib/{chef_monitor.rb → chef_worker.rb}

@@ -16,8 +16,6 @@
 # limitations under the License.
 
 require "chef_monitor/log"
-require "chef_monitor/item"
 require "chef_monitor/itemlist"
 require "chef_monitor/config"
 require "chef_monitor/worker"
-require "chef_monitor/logmon"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chef-monitor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -92,7 +92,7 @@ files:
 - bin/chef-logmon
 - bin/chef-worker
 - chef-monitor.gemspec
-- lib/chef_monitor.rb
+- lib/chef_logmon.rb
 - lib/chef_monitor/config.rb
 - lib/chef_monitor/item.rb
 - lib/chef_monitor/itemlist.rb
@@ -100,6 +100,7 @@ files:
 - lib/chef_monitor/logmon.rb
 - lib/chef_monitor/version.rb
 - lib/chef_monitor/worker.rb
+- lib/chef_worker.rb
 homepage: https://github.com/schubergphilis/chef-monitor
 licenses:
 - Apache 2.0