dtk-node-agent 0.6.7 → 0.7.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODVhMGY3YTdhZWQwN2Q4ZTZmMmI5ODgzYzNiNTkxMTRiYzg4MjkyNg==
+    OGU1YzU1MGExMTNiOWE2YmY5YjI0YmY0ZjVhODZkZDM2MGI0OTM3Nw==
   data.tar.gz: !binary |-
-    NTI5NDk3NGUyOTIyZTI5ZjNlZmNkMDNkMTg4ZGJkNDE5YmYwNDRjMg==
+    NTIxY2IwNmIyYzI4OTgxNGI2OGU0NzFmMmM5MjQ1MGI2OTE1ZDBjMw==
 SHA512:
   metadata.gz: !binary |-
-    ZjI2MzM4M2M4NDA2OTZmNjA1ZjNlYjA2OWMwYTk0MTY2ZjYyZTA0YmZmZTMz
-    NzY0ODUwYmMxMzQzYWVmMDYzYmJlZThjN2RkYzE3YWM3NTdlNWYyNTZlOWVh
-    MGI3MzZhYjk2NmMzOTkzYTY0MjFlNTdhZGQwOTY2YTE3NWU2Y2M=
+    Y2JlZDAzNGEyMjgzZmM4ZDMwYWJlOTZlNzIxNGIxNDkwZGNiYzhjMWFhMjhm
+    ODA2YmM0MTIxY2U5ODViM2NiOGRkYTVhZmEwMDg3ZWNjNWRjYjM0NGM5ODA5
+    NjgxYWVjMGFkNjllODU5NzU4ZWJkYTlkZGYwY2NjYjI5MWYyYTQ=
   data.tar.gz: !binary |-
-    MzYyNWRkN2NlMTU4MWJkNGY3OGVhNzhmNWQ2OTg0ZDk2M2I0ZmY2ZWIyZjcx
-    MjIxMTFhYmI0NWNkOTNlMmMxNzBiYzBjZGU4YTUwZjA0OTJlNDM5NDViNTJj
-    YzllNWNmMDBiMzQ3Y2U1N2Q3NjgxZjcwYmMwOTJiYmNiYjQ0MjQ=
+    MmUxNGYyNzNjZTkwZTJiODA4ZTM2MmJlOGU3YTg1YTM4NTE0NGI5NGNhMzgz
+    ODExMTQ4NzkzMGMzNTlmYWYzYjNjYzA0MGRjODRjZWY0NDMzZTFiODY4MTkz
+    MjUxOWVkY2ZlM2I1ZGMyOTAwZTQ2OTczN2FkOGQwMGE3Yjc5NmQ=

data/dtk-node-agent.gemspec

@@ -36,5 +36,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'serverspec', '~> 1.1.0'
   gem.add_dependency 'specinfra', '~> 1.0.4'
   gem.add_dependency 'posix-spawn', '0.3.8'
+  gem.add_dependency 'dtk-action-agent'
 
 end

data/lib/config/install.config

@@ -10,6 +10,8 @@
 	:rpm_forge_el6_i686_repo   => 'http://apt.sw.be/redhat/el6/en/i386/rpmforge/RPMS/rpmforge-release-0.5.3-1.el6.rf.i686.rpm',
 	:puppet_omnibus_deb64      => 'http://dtk-storage.s3.amazonaws.com/puppet-omnibus_2.7.23-fpm0_amd64.deb',
 	:puppet_omnibus_rpm64      => 'http://dtk-storage.s3.amazonaws.com/puppet-omnibus-2.7.23.fpm0-1.x86_64.rpm',
+  :logstash_forwarder_rpm64  => 'http://dtk-storage.s3.amazonaws.com/logstash-forwarder-0.3.1-1.x86_64.rpm',
+  :logstash_forwarder_deb64  => 'http://dtk-storage.s3.amazonaws.com/logstash-forwarder_0.3.1_amd64.deb',
   :upgrades => {
     :redhat => ['openssl', 'bash', 'emacs-nox', 'vim-enhanced'],
     :debian => ['openssl', 'bash', 'emacs23-nox', 'vim']

data/lib/dtk-node-agent/installer.rb

@@ -36,8 +36,16 @@ module DTK
               shell "wget http://apt.puppetlabs.com/puppetlabs-release-#{@distcodename}.deb"
               puts "Installing Puppet Labs repository..."
               shell "dpkg -i puppetlabs-release-#{@distcodename}.deb"
+              puts "Installing Puppet Labs repository..."
+              shell "dpkg -i puppetlabs-release-#{@distcodename}.deb"
+              # install logstash forwarder
+              logstash_forwarder_url = CONFIG[:logstash_forwarder_deb64]
+              logstash_forwarder_package = logstash_forwarder_url.rpartition('/').last
+              shell "wget #{logstash_forwarder_url}"
+              puts "Installing logstash-forwarder"
+              shell "dpkg -i #{logstash_forwarder_package}"
               shell "apt-get update"
-              shell "rm puppetlabs-release-#{@distcodename}.deb"
+              shell "rm puppetlabs-release-#{@distcodename}.deb #{logstash_forwarder_package}"
               # install mcollective
               puts "Installing MCollective..."
               shell "apt-get -y install mcollective"
@@ -74,6 +82,11 @@ module DTK
                 FileUtils.cp("#{base_dir}/src/etc/init.d/ec2-run-user-data", "/etc/init.d/ec2-run-user-data") unless File.exist?("/etc/init.d/ec2-run-user-data")
                 set_init("ec2-run-user-data")
               end
+              # install logstash-forwarder
+              puts "Installing logstash-forwarder"
+              shell "rpm -ivh #{CONFIG[:logstash_forwarder_rpm64]}"
+              FileUtils.cp("#{base_dir}/src/etc/init.d/logstash-forwarder.rpm.init", "/etc/init.d/logstash-forwarder")
+              set_init("logstash-forwarder")
             else
               puts "Unsuported OS for automatic agent installation. Exiting now..."
               exit(1)

data/lib/dtk-node-agent/version.rb

@@ -1,3 +1,3 @@
 module DtkNodeAgent
-  VERSION="0.6.7"
+  VERSION="0.7.0"
 end

data/mcollective_additions/plugins/v2.2/agent/action_agent.ddl

@@ -0,0 +1,9 @@
+metadata    :name        => "action agent",
+            :description => "Action Agent allows us to run native bash commands on target system",
+            :author      => "Reactor8",
+            :license     => "",
+            :version     => "",
+            :url         => "",
+            :timeout     => 180
+action "run_command", :description => "Run provided command on system" do
+end

data/mcollective_additions/plugins/v2.2/agent/action_agent.rb

@@ -0,0 +1,41 @@
+require 'json'
+require 'cgi'
+
+module MCollective
+  module Agent
+    class Action_agent < RPC::Agent
+     action "run_command" do
+        #validate :action_agent_request, String
+
+        payload = request[:action_agent_request].to_json
+        Log.info "Run command has been started with params: "
+        Log.info payload
+
+        # we encode payload
+        encoded_payload = CGI.escape(payload)
+        result = `/opt/puppet-omnibus/embedded/bin/dtk-action-agent '#{encoded_payload}'`
+
+        json_result = JSON.parse(result)
+        reply[:results] = json_result['results']
+        reply[:errors]  = json_result['errors']
+
+        Log.info reply
+        reply[:pbuilderid] = Facts["pbuilderid"]
+
+        if reply[:errors].empty?
+          Log.info "DTK Action Agent has finished successfully sending proper response"
+          reply[:status] = :ok
+        else
+          reply[:status]     = :failed
+          reply[:statusmsg]  = :failed
+          reply[:statuscode] = 1
+
+          Log.error "DTK Action Agent has errors:"
+          reply[:errors].each { |a| Log.error a }
+        end
+
+      end
+
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/agent/dev_manager.rb

@@ -9,7 +9,10 @@ module MCollective
       action "inject_agent" do
         begin
 
-          ret ||= Response.new() 
+          ret ||= Response.new()
+
+          # make sure default `service` command paths are set
+          ENV['PATH'] += ":/usr/sbin:/sbin"
 
           request[:agent_files].each do |k,v|
             if v == :deleted
@@ -24,7 +27,14 @@ module MCollective
           ret.set_status_succeeded!()
 
           t1 = Thread.new do
-            system("sudo /etc/init.d/mcollective restart")
+            sleep(2)
+            Log.instance.info "Initiating mcollective restart..."
+            system("#{service_command} restart")
+          end
+
+          def self.service_command
+            cmd = `which service`.chomp
+            cmd.empty? ? "/etc/init.d/mcollective" : "#{cmd} mcollective"
           end
 
           return ret

data/mcollective_additions/plugins/v2.2/audit/logfile.rb

@@ -0,0 +1,26 @@
+module MCollective
+  module RPC
+    # An audit plugin that just logs to a file
+    #
+    # You can configure which file it logs to with the setting
+    #
+    #   plugin.rpcaudit.logfile
+
+    class Logfile<Audit
+      require 'pp'
+
+      def audit_request(request, connection)
+        logfile = Config.instance.pluginconf["rpcaudit.logfile"] || "/var/log/mcollective-audit.log"
+
+        now = Time.now
+        # Already told timezone to be in UTC so we don't look it up again
+        # This avoids platform specific timezone representation issues
+        now_iso8601 = now.utc.strftime("%Y-%m-%d %H:%M:%S UTC")
+
+        File.open(logfile, "a") do |f|
+          f.puts("[#{now_iso8601}] reqid=#{request.uniqid}: reqtime=#{request.time} caller=#{request.caller}@#{request.sender} agent=#{request.agent} action=#{request.action} data=#{request.data.pretty_print_inspect}")
+        end
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/data/agent_data.ddl

@@ -0,0 +1,22 @@
+metadata    :name        => "Agent",
+            :description => "Meta data about installed MColletive Agents",
+            :author      => "R.I.Pienaar <rip@devco.net>",
+            :license     => "ASL 2.0",
+            :version     => "1.0",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 1
+
+dataquery :description => "Agent Meta Data" do
+    input :query,
+          :prompt => "Agent Name",
+          :description => "Valid agent name",
+          :type => :string,
+          :validation => /^[\w\_]+$/,
+          :maxlength => 20
+
+    [:license, :timeout, :description, :url, :version, :author].each do |item|
+      output item,
+             :description => "Agent #{item}",
+             :display_as => item.to_s.capitalize
+    end
+end

data/mcollective_additions/plugins/v2.2/data/agent_data.rb

@@ -0,0 +1,17 @@
+module MCollective
+  module Data
+    class Agent_data<Base
+      query do |plugin|
+        raise "No agent called #{plugin} found" unless PluginManager.include?("#{plugin}_agent")
+
+        agent = PluginManager["#{plugin}_agent"]
+
+        result[:agent] = plugin
+
+        [:license, :timeout, :description, :url, :version, :author].each do |item|
+          result[item] = agent.meta[item]
+        end
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/data/collective_data.ddl

@@ -0,0 +1,20 @@
+metadata    :name        => "Collective",
+            :description => "Collective membership",
+            :author      => "Puppet Labs",
+            :license     => "ASL 2.0",
+            :version     => "1.0",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 1
+
+dataquery :description => "Collective" do
+  input :query,
+        :prompt => 'Collective',
+        :description => 'Collective name to ask about, eg mcollective',
+        :type => :string,
+        :validation => /./,
+        :maxlength => 256
+
+  output :member,
+        :description => 'Node is a member of the named collective',
+        :display_as => 'member'
+end

data/mcollective_additions/plugins/v2.2/data/collective_data.rb

@@ -0,0 +1,9 @@
+module MCollective
+  module Data
+    class Collective_data<Base
+      query do |collective|
+        result[:member] = Config.instance.collectives.include?(collective)
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/data/fact_data.ddl

@@ -0,0 +1,28 @@
+metadata    :name        => "Fact",
+            :description => "Structured fact query",
+            :author      => "Puppet Labs",
+            :license     => "ASL 2.0",
+            :version     => "1.0",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 1
+
+dataquery :description => "Fact" do
+  input :query,
+        :prompt => 'Fact Path',
+        :description => 'Path to a fact, eg network.eth0.address',
+        :type => :string,
+        :validation => /./,
+        :maxlength => 256
+
+  output :exists,
+        :description => 'Fact is present',
+        :display_as => 'exists'
+
+  output :value,
+        :description => 'Fact value',
+        :display_as => 'value'
+
+  output :value_encoding,
+        :description => 'Encoding of the fact value (text/plain or application/json)',
+        :display_as => 'value_encoding'
+end

data/mcollective_additions/plugins/v2.2/data/fact_data.rb

@@ -0,0 +1,55 @@
+module MCollective
+  module Data
+    class Fact_data<Base
+      query do |path|
+        parts = path.split /\./
+        walk_path(parts)
+      end
+
+      private
+
+      def walk_path(path)
+        # Set up results as though we didn't find the value
+        result[:exists] = false
+        result[:value] = false
+        result[:value_encoding] = false
+
+        facts = PluginManager['facts_plugin'].get_facts
+
+        path.each do |level|
+          case facts
+          when Array
+            level = Integer(level)
+            if level >= facts.size
+              # array index out would be out of bounds, so we don't have the value
+              return
+            end
+          when Hash
+            if !facts.include?(level)
+              # we don't have the key for the next level, so give up
+              return
+            end
+          else
+            # this isn't a container data type, so we can't walk into it
+            return
+          end
+
+          facts = facts[level]
+        end
+
+        result[:exists] = true
+        case facts
+        when Array, Hash
+          # Currently data plugins cannot return structured data, so until
+          # this is fixed flatten the data with json and flag that we have
+          # munged the data
+          result[:value] = facts.to_json
+          result[:value_encoding] = 'application/json'
+        else
+          result[:value] = facts
+          result[:value_encoding] = 'text/plain'
+        end
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/data/fstat_data.ddl

@@ -0,0 +1,89 @@
+metadata    :name        => "File Stat",
+            :description => "Retrieve file stat data for a given file",
+            :author      => "R.I.Pienaar <rip@devco.net>",
+            :license     => "ASL 2.0",
+            :version     => "1.0",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 1
+
+dataquery :description => "File stat information" do
+    input :query,
+          :prompt => "File Name",
+          :description => "Valid File Name",
+          :type => :string,
+          :validation => /.+/,
+          :maxlength => 120
+
+    output :name,
+           :description => "File name",
+           :display_as => "Name"
+
+    output :output,
+           :description => "Human readable information about the file",
+           :display_as => "Status"
+
+    output :present,
+           :description => "Indicates if the file exist using 0 or 1",
+           :display_as => "Present"
+
+    output :size,
+           :description => "File size",
+           :display_as => "Size"
+
+    output :mode,
+           :description => "File mode",
+           :display_as => "Mode"
+
+    output :md5,
+           :description => "File MD5 digest",
+           :display_as => "MD5"
+
+    output :mtime,
+           :description => "File modification time",
+           :display_as => "Modification time"
+
+    output :ctime,
+           :description => "File change time",
+           :display_as => "Change time"
+
+    output :atime,
+           :description => "File access time",
+           :display_as => "Access time"
+
+    output :mtime_seconds,
+           :description => "File modification time in seconds",
+           :display_as => "Modification time"
+
+    output :ctime_seconds,
+           :description => "File change time in seconds",
+           :display_as => "Change time"
+
+    output :atime_seconds,
+           :description => "File access time in seconds",
+           :display_as => "Access time"
+
+    output :mtime_age,
+           :description => "File modification age in seconds",
+           :display_as => "Modification age"
+
+    output :ctime_age,
+           :description => "File change age in seconds",
+           :display_as => "Change age"
+
+    output :atime_age,
+           :description => "File access age in seconds",
+           :display_as => "Access age"
+
+    output :uid,
+           :description => "File owner",
+           :display_as => "Owner"
+
+    output :gid,
+           :description => "File group",
+           :display_as => "Group"
+
+    output :type,
+           :description => "File type",
+           :display_as => "Type"
+end
+

data/mcollective_additions/plugins/v2.2/data/fstat_data.rb

@@ -0,0 +1,56 @@
+module MCollective
+  module Data
+    class Fstat_data<Base
+      query do |file|
+        result[:name] = file
+        result[:output] = "not present"
+        result[:type] = "unknown"
+        result[:mode] = "0000"
+        result[:present] = 0
+        result[:size] = 0
+        result[:mtime] = 0
+        result[:ctime] = 0
+        result[:atime] = 0
+        result[:mtime_seconds] = 0
+        result[:ctime_seconds] = 0
+        result[:atime_seconds] = 0
+        result[:md5] = 0
+        result[:uid] = 0
+        result[:gid] = 0
+
+
+        if File.exists?(file)
+          result[:output] = "present"
+          result[:present] = 1
+
+          if File.symlink?(file)
+            stat = File.lstat(file)
+          else
+            stat = File.stat(file)
+          end
+
+          [:size, :uid, :gid].each do |item|
+            result[item] = stat.send(item)
+          end
+
+          [:mtime, :ctime, :atime].each do |item|
+            result[item] = stat.send(item).strftime("%F %T")
+            result["#{item}_seconds".to_sym] = stat.send(item).to_i
+            result["#{item}_age".to_sym] = Time.now.to_i - stat.send(item).to_i
+          end
+
+          result[:mode] = "%o" % [stat.mode]
+          result[:md5] = Digest::MD5.hexdigest(File.read(file)) if stat.file?
+
+          result[:type] = "directory" if stat.directory?
+          result[:type] = "file" if stat.file?
+          result[:type] = "symlink" if stat.symlink?
+          result[:type] = "socket" if stat.socket?
+          result[:type] = "chardev" if stat.chardev?
+          result[:type] = "blockdev" if stat.blockdev?
+        end
+      end
+    end
+  end
+end
+

data/mcollective_additions/plugins/v2.2/discovery/flatfile.ddl

@@ -0,0 +1,11 @@
+metadata    :name        => "flatfile",
+            :description => "Flatfile based discovery for node identities",
+            :author      => "R.I.Pienaar <rip@devco.net>",
+            :license     => "ASL 2.0",
+            :version     => "0.1",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 0
+
+discovery do
+    capabilities :identity
+end

data/mcollective_additions/plugins/v2.2/discovery/flatfile.rb

@@ -0,0 +1,48 @@
+# discovers against a flatfile instead of the traditional network discovery
+# the flat file must have a node name per line which should match identities
+# as configured
+module MCollective
+  class Discovery
+    class Flatfile
+      def self.discover(filter, timeout, limit=0, client=nil)
+        unless client.options[:discovery_options].empty?
+          file = client.options[:discovery_options].first
+        else
+          raise "The flatfile discovery method needs a path to a text file"
+        end
+
+        raise "Cannot read the file %s specified as discovery source" % file unless File.readable?(file)
+
+        discovered = []
+        hosts = []
+
+        File.readlines(file).each do |host|
+          host = host.chomp.strip
+          if host.empty? || host.match(/^#/)
+            next
+          end
+          raise 'Identities can only match /^[\w\.\-]+$/' unless host.match(/^[\w\.\-]+$/)
+          hosts << host
+        end
+
+        # this plugin only supports identity filters, do regex matches etc against
+        # the list found in the flatfile
+        if !(filter["identity"].empty?)
+          filter["identity"].each do |identity|
+            identity = Regexp.new(identity.gsub("\/", "")) if identity.match("^/")
+
+            if identity.is_a?(Regexp)
+              discovered = hosts.grep(identity)
+            elsif hosts.include?(identity)
+              discovered << identity
+            end
+          end
+        else
+          discovered = hosts
+        end
+
+        discovered
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/discovery/mc.ddl

@@ -0,0 +1,11 @@
+metadata    :name        => "mc",
+            :description => "MCollective Broadcast based discovery",
+            :author      => "R.I.Pienaar <rip@devco.net>",
+            :license     => "ASL 2.0",
+            :version     => "0.1",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 2
+
+discovery do
+    capabilities [:classes, :facts, :identity, :agents, :compound]
+end

data/mcollective_additions/plugins/v2.2/discovery/mc.rb

@@ -0,0 +1,30 @@
+module MCollective
+  class Discovery
+    class Mc
+      def self.discover(filter, timeout, limit, client)
+        begin
+          hosts = []
+          Timeout.timeout(timeout) do
+            reqid = client.sendreq("ping", "discovery", filter)
+            Log.debug("Waiting #{timeout} seconds for discovery replies to request #{reqid}")
+
+            loop do
+              reply = client.receive(reqid)
+              Log.debug("Got discovery reply from #{reply.payload[:senderid]}")
+              hosts << reply.payload[:senderid]
+
+              return hosts if limit > 0 && hosts.size == limit
+            end
+          end
+        rescue Timeout::Error => e
+        rescue Exception => e
+          raise
+        ensure
+          client.unsubscribe("discovery", :reply)
+        end
+
+        hosts
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/discovery/stdin.ddl

@@ -0,0 +1,11 @@
+metadata    :name        => "stdin",
+            :description => "STDIN based discovery for node identities",
+            :author      => "Tomas Doran <bobtfish@bobtfish.net.net>",
+            :license     => "ASL 2.0",
+            :version     => "0.1",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 0
+
+discovery do
+    capabilities :identity
+end

data/mcollective_additions/plugins/v2.2/discovery/stdin.rb

@@ -0,0 +1,66 @@
+# discovers against stdin instead of the traditional network discovery
+# the input must be a flat file with a node name per line which should match identities as configured,
+# or it should be a json string as output by the -j option of mco rpc
+require 'mcollective/rpc/helpers'
+
+module MCollective
+  class Discovery
+    class Stdin
+      def self.discover(filter, timeout, limit=0, client=nil)
+        unless client.options[:discovery_options].empty?
+          type = client.options[:discovery_options].first.downcase
+        else
+          type = 'auto'
+        end
+
+        discovered = []
+
+        file = STDIN.read
+
+        if file =~ /^\s*$/
+              raise("data piped on STDIN contained only whitespace - could not discover hosts from it.")
+        end
+
+        if type == 'auto'
+          if file =~ /^\s*\[/
+            type = 'json'
+          else
+            type = 'text'
+          end
+        end
+
+        if type == 'json'
+          hosts = MCollective::RPC::Helpers.extract_hosts_from_json(file)
+        elsif type == 'text'
+          hosts = file.split("\n")
+        else
+          raise("stdin discovery plugin only knows the types auto/text/json, not \"#{type}\"")
+        end
+
+        hosts.map do |host|
+          raise 'Identities can only match /\w\.\-/' unless host.match(/^[\w\.\-]+$/)
+          host
+        end
+
+        # this plugin only supports identity filters, do regex matches etc against
+        # the list found in the flatfile
+        unless filter["identity"].empty?
+          filter["identity"].each do |identity|
+            identity = Regexp.new(identity.gsub("\/", "")) if identity.match("^/")
+
+            if identity.is_a?(Regexp)
+              discovered = hosts.grep(identity)
+            elsif hosts.include?(identity)
+              discovered << identity
+            end
+          end
+        else
+          discovered = hosts
+        end
+
+        discovered
+      end
+    end
+  end
+end
+

data/mcollective_additions/plugins/v2.2/facts/yaml_facts.rb

@@ -0,0 +1,61 @@
+module MCollective
+  module Facts
+    require 'yaml'
+
+    # A factsource that reads a hash of facts from a YAML file
+    #
+    # Multiple files can be specified seperated with a : in the
+    # config file, they will be merged with later files overriding
+    # earlier ones in the list.
+    class Yaml_facts<Base
+      def initialize
+        @yaml_file_mtimes = {}
+
+        super
+      end
+
+      def load_facts_from_source
+        config = Config.instance
+
+        fact_files = config.pluginconf["yaml"].split(File::PATH_SEPARATOR)
+        facts = {}
+
+        fact_files.each do |file|
+          begin
+            if File.exist?(file)
+              facts.merge!(YAML.load_file(file))
+            else
+              raise("Can't find YAML file to load: #{file}")
+            end
+          rescue Exception => e
+            Log.error("Failed to load yaml facts from #{file}: #{e.class}: #{e}")
+          end
+        end
+
+        facts
+      end
+
+      # force fact reloads when the mtime on the yaml file change
+      def force_reload?
+        config = Config.instance
+
+        fact_files = config.pluginconf["yaml"].split(File::PATH_SEPARATOR)
+
+        fact_files.each do |file|
+          @yaml_file_mtimes[file] ||= File.stat(file).mtime
+          mtime = File.stat(file).mtime
+
+          if mtime > @yaml_file_mtimes[file]
+            @yaml_file_mtimes[file] = mtime
+
+            Log.debug("Forcing fact reload due to age of #{file}")
+
+            return true
+          end
+        end
+
+        false
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/registration/agentlist.rb

@@ -0,0 +1,10 @@
+module MCollective
+  module Registration
+    # A registration plugin that simply sends in the list of agents we have
+    class Agentlist<Base
+      def body
+        Agents.agentlist
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/validator/array_validator.ddl

@@ -0,0 +1,7 @@
+metadata    :name        => "Array",
+            :description => "Validates that a value is included in a list",
+            :author      => "P. Loubser <pieter.loubser@puppetlabs.com>",
+            :license     => "ASL 2.0",
+            :version     => "1.0",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 1

data/mcollective_additions/plugins/v2.2/validator/array_validator.rb

@@ -0,0 +1,9 @@
+module MCollective
+  module Validator
+    class ArrayValidator
+      def self.validate(validator, array)
+        raise ValidatorError, "value should be one of %s" % [ array.join(", ") ] unless array.include?(validator)
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/validator/ipv4address_validator.ddl

@@ -0,0 +1,7 @@
+metadata    :name        => "IPv4 Address",
+            :description => "Validates that a value is an ipv4 address",
+            :author      => "P. Loubser <pieter.loubser@puppetlabs.com>",
+            :license     => "ASL 2.0",
+            :version     => "1.0",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 1

data/mcollective_additions/plugins/v2.2/validator/ipv4address_validator.rb

@@ -0,0 +1,16 @@
+module MCollective
+  module Validator
+    class Ipv4addressValidator
+      require 'ipaddr'
+
+      def self.validate(validator)
+        begin
+          ip = IPAddr.new(validator)
+          raise ValidatorError, "value should be an ipv4 adddress" unless ip.ipv4?
+        rescue
+          raise ValidatorError, "value should be an ipv4 address"
+        end
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/validator/ipv6address_validator.ddl

@@ -0,0 +1,7 @@
+metadata    :name        => "IPv6 Address",
+            :description => "Validates that a value is an ipv6 address",
+            :author      => "P. Loubser <pieter.loubser@puppetlabs.com>",
+            :license     => "ASL 2.0",
+            :version     => "1.0",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 1

data/mcollective_additions/plugins/v2.2/validator/ipv6address_validator.rb

@@ -0,0 +1,16 @@
+module MCollective
+  module Validator
+    class Ipv6addressValidator
+      require 'ipaddr'
+
+      def self.validate(validator)
+        begin
+          ip = IPAddr.new(validator)
+          raise ValidatorError, "value should be an ipv6 adddress" unless ip.ipv6?
+        rescue
+          raise ValidatorError, "value should be an ipv6 address"
+        end
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/validator/length_validator.ddl

@@ -0,0 +1,7 @@
+metadata    :name        => "Length",
+            :description => "Validates that the length of a string is less or equal to a specified value",
+            :author      => "P. Loubser <pieter.loubser@puppetlabs.com>",
+            :license     => "ASL 2.0",
+            :version     => "1.0",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 1

data/mcollective_additions/plugins/v2.2/validator/length_validator.rb

@@ -0,0 +1,11 @@
+module MCollective
+  module Validator
+    class LengthValidator
+      def self.validate(validator, length)
+        if (validator.size > length) && (length > 0)
+          raise ValidatorError, "Input string is longer than #{length} character(s)"
+        end
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/validator/regex_validator.ddl

@@ -0,0 +1,7 @@
+metadata    :name        => "Regex",
+            :description => "Validates that a string matches a supplied regular expression",
+            :author      => "P. Loubser <pieter.loubser@puppetlabs.com>",
+            :license     => "ASL 2.0",
+            :version     => "1.0",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 1

data/mcollective_additions/plugins/v2.2/validator/regex_validator.rb

@@ -0,0 +1,9 @@
+module MCollective
+  module Validator
+    class RegexValidator
+      def self.validate(validator, regex)
+        raise ValidatorError, "value should match #{regex}" unless validator.match(regex)
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/validator/shellsafe_validator.ddl

@@ -0,0 +1,7 @@
+metadata    :name        => "Shellsafe",
+            :description => "Validates that a string is shellsafe",
+            :author      => "P. Loubser <pieter.loubser@puppetlabs.com>",
+            :license     => "ASL 2.0",
+            :version     => "1.0",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 1

data/mcollective_additions/plugins/v2.2/validator/shellsafe_validator.rb

@@ -0,0 +1,13 @@
+module MCollective
+  module Validator
+    class ShellsafeValidator
+      def self.validate(validator)
+        raise ValidatorError, "value should be a String" unless validator.is_a?(String)
+
+        ['`', '$', ';', '|', '&&', '>', '<'].each do |chr|
+          raise ValidatorError, "value should not have #{chr} in it" if validator.match(Regexp.escape(chr))
+        end
+      end
+    end
+  end
+end

data/mcollective_additions/plugins/v2.2/validator/typecheck_validator.ddl

@@ -0,0 +1,7 @@
+metadata    :name        => "Typecheck",
+            :description => "Validates that a value is of a certain type",
+            :author      => "P. Loubser <pieter.loubser@puppetlabs.com>",
+            :license     => "ASL 2.0",
+            :version     => "1.0",
+            :url         => "http://marionette-collective.org/",
+            :timeout     => 1

data/mcollective_additions/plugins/v2.2/validator/typecheck_validator.rb

@@ -0,0 +1,28 @@
+module MCollective
+  module Validator
+    class TypecheckValidator
+      def self.validate(validator, validation_type)
+        raise ValidatorError, "value should be a #{validation_type.to_s}" unless check_type(validator, validation_type)
+      end
+
+      def self.check_type(validator, validation_type)
+        case validation_type
+          when Class
+            validator.is_a?(validation_type)
+          when :integer
+            validator.is_a?(Fixnum)
+          when :float
+            validator.is_a?(Float)
+          when :number
+            validator.is_a?(Numeric)
+          when :string
+            validator.is_a?(String)
+          when :boolean
+            [TrueClass, FalseClass].include?(validator.class)
+          else
+            false
+        end
+      end
+    end
+  end
+end

data/src/etc/init.d/logstash-forwarder.rpm.init

@@ -0,0 +1,112 @@
+#!/bin/bash
+# chkconfig: 345 80 20
+# description: Logstash Forwarder
+# processname: logstash-forwarder
+# config: /etc/logstash-forwarder
+# pidfile: /var/run/logstash-forwarder.pid
+
+### BEGIN INIT INFO
+# Provides: logstash-forwarder
+# Required-Start: $local_fs $network $remote_fs
+# Required-Stop: $local_fs $network $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: start and stop logstash-forwarder
+# Description: Logstash Forwarder
+### END INIT INFO
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+
+prog=logstash-forwarder
+DAEMON=/opt/logstash-forwarder/bin/logstash-forwarder
+pidfile=/var/run/$prog.pid
+lockfile=/var/lock/subsys/$prog
+
+# load defaults
+
+[ -e /etc/default/$prog ] && . /etc/default/$prog
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+DAEMON_ARGS="${DAEMON_ARGS:--config /etc/logstash-forwarder -spool-size 100 -log-to-syslog}"
+
+start()
+{
+    echo -n $"Starting $prog: "
+    nohup $DAEMON $DAEMON_ARGS </dev/null >/dev/null 2>&1 &
+    retval=$?
+    pid=$!
+    echo $pid > $pidfile
+    if [ rh_status_q ]; then
+        touch $lockfile
+        success
+        echo
+    fi
+    return $retval
+}
+
+stop()
+{
+    echo -n $"Stopping $prog: "
+    killproc -p "$pidfile" $prog
+    retval=$?
+    [ -f "$pidfile" ] && rm -f $pidfile
+    echo
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    restart
+}
+
+force_reload() {
+    restart
+}
+
+rh_status() {
+    status -p $pidfile $prog
+}
+
+rh_status_q() {
+    rh_status >/dev/null 2>&1
+}
+
+case "$1" in
+    start)
+        rh_status_q && exit 0
+        $1
+        ;;
+    stop)
+        rh_status_q || exit 0
+        $1
+		;;
+    restart)
+        $1
+        ;;
+    reload)
+        rh_status_q || exit 7
+        $1
+        ;;
+    force-reload)
+        force_reload
+        ;;
+    condrestart|try-restart)
+        rh_status_q || exit 0
+        restart
+        ;;
+    status)
+        rh_status
+        ;;
+    *)
+        echo "Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+        exit 2
+esac
+exit $?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-node-agent
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.0
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-04 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -122,6 +122,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.3.8
+- !ruby/object:Gem::Dependency
+  name: dtk-action-agent
+  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'
 description: The DTK Node Agent runs on your nodes that you wish to manage using your
   DTK Server.  It comes pre-installed on all nodes created/managed by hosted DTK Server
   accounts.
@@ -154,6 +168,8 @@ files:
 - mcollective_additions/plugins/v1.2/agent/rpcutil.ddl
 - mcollective_additions/plugins/v1.2/agent/rpcutil.rb
 - mcollective_additions/plugins/v1.2/facts/pbuilder_facts.rb
+- mcollective_additions/plugins/v2.2/agent/action_agent.ddl
+- mcollective_additions/plugins/v2.2/agent/action_agent.rb
 - mcollective_additions/plugins/v2.2/agent/dev_manager.ddl
 - mcollective_additions/plugins/v2.2/agent/dev_manager.rb
 - mcollective_additions/plugins/v2.2/agent/discovery.rb
@@ -182,13 +198,44 @@ files:
 - mcollective_additions/plugins/v2.2/agent/sync_agent_code.rb
 - mcollective_additions/plugins/v2.2/agent/tail.ddl
 - mcollective_additions/plugins/v2.2/agent/tail.rb
+- mcollective_additions/plugins/v2.2/audit/logfile.rb
 - mcollective_additions/plugins/v2.2/connector/r8stomp.rb
 - mcollective_additions/plugins/v2.2/connector/stomp.rb
 - mcollective_additions/plugins/v2.2/connector/stomp_em.rb
+- mcollective_additions/plugins/v2.2/data/agent_data.ddl
+- mcollective_additions/plugins/v2.2/data/agent_data.rb
+- mcollective_additions/plugins/v2.2/data/collective_data.ddl
+- mcollective_additions/plugins/v2.2/data/collective_data.rb
+- mcollective_additions/plugins/v2.2/data/fact_data.ddl
+- mcollective_additions/plugins/v2.2/data/fact_data.rb
+- mcollective_additions/plugins/v2.2/data/fstat_data.ddl
+- mcollective_additions/plugins/v2.2/data/fstat_data.rb
+- mcollective_additions/plugins/v2.2/discovery/flatfile.ddl
+- mcollective_additions/plugins/v2.2/discovery/flatfile.rb
+- mcollective_additions/plugins/v2.2/discovery/mc.ddl
+- mcollective_additions/plugins/v2.2/discovery/mc.rb
+- mcollective_additions/plugins/v2.2/discovery/stdin.ddl
+- mcollective_additions/plugins/v2.2/discovery/stdin.rb
 - mcollective_additions/plugins/v2.2/facts/pbuilder_facts.rb
+- mcollective_additions/plugins/v2.2/facts/yaml_facts.rb
+- mcollective_additions/plugins/v2.2/registration/agentlist.rb
 - mcollective_additions/plugins/v2.2/security/sshkey.ddl
 - mcollective_additions/plugins/v2.2/security/sshkey.rb
 - mcollective_additions/plugins/v2.2/util/puppetrunner.rb
+- mcollective_additions/plugins/v2.2/validator/array_validator.ddl
+- mcollective_additions/plugins/v2.2/validator/array_validator.rb
+- mcollective_additions/plugins/v2.2/validator/ipv4address_validator.ddl
+- mcollective_additions/plugins/v2.2/validator/ipv4address_validator.rb
+- mcollective_additions/plugins/v2.2/validator/ipv6address_validator.ddl
+- mcollective_additions/plugins/v2.2/validator/ipv6address_validator.rb
+- mcollective_additions/plugins/v2.2/validator/length_validator.ddl
+- mcollective_additions/plugins/v2.2/validator/length_validator.rb
+- mcollective_additions/plugins/v2.2/validator/regex_validator.ddl
+- mcollective_additions/plugins/v2.2/validator/regex_validator.rb
+- mcollective_additions/plugins/v2.2/validator/shellsafe_validator.ddl
+- mcollective_additions/plugins/v2.2/validator/shellsafe_validator.rb
+- mcollective_additions/plugins/v2.2/validator/typecheck_validator.ddl
+- mcollective_additions/plugins/v2.2/validator/typecheck_validator.rb
 - mcollective_additions/redhat.mcollective.init
 - mcollective_additions/redhat.mcollective.service
 - mcollective_additions/server.cfg
@@ -199,6 +246,7 @@ files:
 - puppet_additions/puppet_lib_base/puppet/indirector/resource/r8_storeconfig_backend.rb
 - src/etc/apt/preferences.d/puppetlabs
 - src/etc/init.d/ec2-run-user-data
+- src/etc/init.d/logstash-forwarder.rpm.init
 - src/etc/logrotate.d/mcollective
 - src/etc/logrotate.d/puppet
 homepage: https://github.com/rich-reactor8/dtk-node-agent