puppet 0.16.0 → 0.18.4

data/lib/puppet/metric.rb

@@ -4,133 +4,28 @@ require 'puppet'
 module Puppet
     # A class for handling metrics.  This is currently ridiculously hackish.
 	class Metric
-        def Metric.init
-            @@typemetrics = Hash.new { |typehash,typename|
-                typehash[typename] = Hash.new(0)
-            }
-
-            @@eventmetrics = Hash.new(0)
-
-            @@metrics = {}
-        end
-
-        def Metric.clear
-            Metric.init
-        end
-
-        def Metric.gather
-            Metric.init
-
-            # first gather stats about all of the types
-            Puppet::Type.eachtype { |type|
-                type.each { |instance|
-                    hash = @@typemetrics[type]
-                    hash[:total] += 1
-                    if instance.managed?
-                        hash[:managed] += 1
-                    end
-                }
-            }
-
-            # the rest of the metrics are injected directly by type.rb
-        end
-
-        def Metric.add(type,instance,metric,count)
-            return unless defined? @@typemetrics
-            case metric
-            when :outofsync:
-                @@typemetrics[type][metric] += count
-            when :changes:
-                @@typemetrics[type][:changed] += 1
-                @@typemetrics[type][:totalchanges] += count
-            else
-                raise Puppet::DevError, "Unknown metric %s" % metric
-            end
-        end
-
-        # we're currently throwing away the type and instance information
-        def Metric.addevents(type,instance,events)
-            return unless defined? @@eventmetrics
-            events.each { |event|
-                @@eventmetrics[event] += 1
-            }
-        end
-
-        # Iterate across all of the metrics
-        def Metric.each
-            @@metrics.each { |name,metric|
-                yield metric
-            }
-        end
-
-        # I'm nearly positive this method is used only for testing
-        def Metric.load(ary)
-            @@typemetrics = ary[0]
-            @@eventmetrics = ary[1]
-        end
-
-        def Metric.graph(range = nil)
-            @@metrics.each { |name,metric|
-                metric.graph(range)
-            }
-        end
-
-        def Metric.store(time = nil)
+        Puppet.config.setdefaults("metrics",
+            :rrddir => {:default => "$vardir/rrd",
+                :owner => "$user",
+                :group => "$group",
+                :desc => "The directory where RRD database files are stored."
+            },
+            :rrdgraph => [false, "Whether RRD information should be graphed."]
+        )
+
+        @@haverrd = false
+        begin
             require 'RRD'
-            unless time
-                time = Time.now.to_i
-            end
-            @@metrics.each { |name,metric|
-                metric.store(time)
-            }
+            @@haverrd = true
+        rescue LoadError
         end
 
-        def Metric.tally
-            type = Metric.new("typecount","Types")
-            type.newvalue("Number",@@typemetrics.length)
-
-            metrics = {
-                :total => "Instances",
-                :managed => "Managed Instances",
-                :outofsync => "Out of Sync Instances",
-                :changed => "Changed Instances",
-                :totalchanges => "Total Number of Changes",
-            }
-            total = Hash.new(0)
-            @@typemetrics.each { |type,instancehash|
-                name = type.name.to_s
-                instmet = Metric.new("type-" + name,name.capitalize)
-                metrics.each { |symbol,label|
-                    instmet.newvalue(symbol.to_s,instancehash[symbol],label)
-                    total[symbol] += instancehash[symbol]
-                }
-            }
-
-            totalmet = Metric.new("typetotals","Type Totals")
-            metrics.each { |symbol,label|
-                totalmet.newvalue(symbol.to_s,total[symbol],label)
-            }
-
-            eventmet = Metric.new("events")
-            total = 0
-            @@eventmetrics.each { |event,count|
-                event = event.to_s
-                # add the specific event as a value, with the label being a
-                # capitalized version with s/_/ /g
-                eventmet.newvalue(
-                    event,
-                    count,
-                    event.capitalize.gsub(/_/,' ')
-                )
-
-                total += count
-            }
-            eventmet.newvalue("total",total,"Event Total")
+        def self.haverrd?
+            @@haverrd
         end
 
         attr_accessor :type, :name, :value, :label
 
-
         def create
             Puppet.config.use(:metrics)
 
@@ -154,24 +49,20 @@ module Puppet
         end
 
         def initialize(name,label = nil)
-            @name = name
+            @name = name.to_s
+
             if label
                 @label = label
             else
-                @label = name.capitalize
+                @label = name.to_s.capitalize.gsub("_", " ")
             end
 
             @values = []
-            if @@metrics.include?(self.name)
-                raise "Somehow created two metrics with name %s" % self.name
-            else
-                @@metrics[self.name] = self
-            end
         end
 
         def newvalue(name,value,label = nil)
             unless label
-                label = name.capitalize
+                label = name.to_s.capitalize.gsub("_", " ")
             end
             @values.push [name,label,value]
         end
@@ -181,11 +72,16 @@ module Puppet
         end
 
         def graph(range = nil)
+            unless @@haverrd
+                Puppet.warning "RRD library is missing; cannot graph metrics"
+                return
+            end
             args = [self.path.sub(/rrd$/,"png")]
+
             args.push("--title",self.label)
             args.push("--imgformat","PNG")
             args.push("--interlace")
-            colorstack = %w{#ff0000 #00ff00 #0000ff #099000 #000990 #f00990}
+            colorstack = %w{#ff0000 #00ff00 #0000ff #099000 #000990 #f00990 #0f0f0f}
             i = 0
             defs = []
             lines = []
@@ -210,7 +106,11 @@ module Puppet
         end
 
         def store(time)
-            unless FileTest.exists?(File.join(Puppet[:rrddir],@name + ".rrd"))
+            unless @@haverrd
+                Puppet.warning "RRD library is missing; cannot store metrics"
+                return
+            end
+            unless FileTest.exists?(self.path)
                 self.create
             end
 
@@ -229,4 +129,4 @@ module Puppet
     end
 end
 
-# $Id: metric.rb 965 2006-03-02 07:30:14Z luke $
+# $Id: metric.rb 1358 2006-07-04 16:07:47Z luke $

data/lib/puppet/networkclient.rb

@@ -30,52 +30,75 @@ module Puppet
         Puppet.err "Could not load client network libs: %s" % $noclientnetworking
     else
         class NetworkClient < XMLRPC::Client
-            #include Puppet::Daemon
-
-            # add the methods associated with each namespace
-            Puppet::Server::Handler.each { |handler|
-                interface = handler.interface
-                namespace = interface.prefix
-
-                interface.methods.each { |ary|
-                    method = ary[0]
-                    Puppet.info "Defining %s.%s" % [namespace, method]
-                    self.send(:define_method,method) { |*args|
-                        #Puppet.info "Calling %s" % method
-                        #Puppet.info "peer cert is %s" % @http.peer_cert
-                        #Puppet.info "cert is %s" % @http.cert
-                        begin
-                            call("%s.%s" % [namespace, method.to_s],*args)
-                        rescue OpenSSL::SSL::SSLError => detail
-                            #Puppet.err "Could not call %s.%s: Untrusted certificates" %
-                            #    [namespace, method]
-                            raise NetworkClientError,
-                                "Certificates were not trusted"
-                        rescue XMLRPC::FaultException => detail
-                            #Puppet.err "Could not call %s.%s: %s" %
-                            #    [namespace, method, detail.faultString]
-                            #raise NetworkClientError,
-                            #    "XMLRPC Error: %s" % detail.faultString
-                            raise NetworkClientError, detail.faultString
-                        rescue Errno::ECONNREFUSED => detail
-                            msg = "Could not connect to %s on port %s" % [@host, @port]
-                            #Puppet.err msg
-                            raise NetworkClientError, msg
-                        rescue SocketError => detail
-                            Puppet.err "Could not find server %s" % @puppetserver
-                            exit(12)
-                        rescue => detail
-                            Puppet.err "Could not call %s.%s: %s" %
-                                [namespace, method, detail.inspect]
-                            #raise NetworkClientError.new(detail.to_s)
-                            if Puppet[:debug]
-                                puts detail.backtrace
-                            end
-                            raise
+            @clients = {}
+
+            # Create a netclient for each handler
+            def self.mkclients
+                # add the methods associated with each namespace
+                Puppet::Server::Handler.each { |handler|
+                    interface = handler.interface
+                    namespace = interface.prefix
+
+                    # Create a subclass for every client type.  This is
+                    # so that all of the methods are on their own class,
+                    # so that they namespaces can define the same methods if
+                    # they want.
+                    newclient = Class.new(self)
+
+                    #name = "Puppet::NetworkClient::" + handler.to_s.sub(/^.+::/, '')
+                    name = handler.to_s.sub(/^.+::/, '')
+                    const_set(name, newclient)
+                    @clients[namespace] = newclient
+
+                    interface.methods.each { |ary|
+                        method = ary[0]
+                        if public_method_defined?(method)
+                            raise Puppet::DevError, "Method %s is already defined" %
+                                method
                         end
+                        newclient.send(:define_method,method) { |*args|
+                            Puppet.debug "Calling %s.%s" % [namespace, method]
+                            #Puppet.info "peer cert is %s" % @http.peer_cert
+                            #Puppet.info "cert is %s" % @http.cert
+                            begin
+                                call("%s.%s" % [namespace, method.to_s],*args)
+                            rescue OpenSSL::SSL::SSLError => detail
+                                raise NetworkClientError,
+                                    "Certificates were not trusted: %s" % detail
+                            rescue XMLRPC::FaultException => detail
+                                #Puppet.err "Could not call %s.%s: %s" %
+                                #    [namespace, method, detail.faultString]
+                                #raise NetworkClientError,
+                                #    "XMLRPC Error: %s" % detail.faultString
+                                raise NetworkClientError, detail.faultString
+                            rescue Errno::ECONNREFUSED => detail
+                                msg = "Could not connect to %s on port %s" %
+                                    [@host, @port]
+                                raise NetworkClientError, msg
+                            rescue SocketError => detail
+                                Puppet.err "Could not find server %s" % @puppetserver
+                                exit(12)
+                            rescue => detail
+                                Puppet.err "Could not call %s.%s: %s" %
+                                    [namespace, method, detail.inspect]
+                                #raise NetworkClientError.new(detail.to_s)
+                                if Puppet[:debug]
+                                    puts detail.backtrace
+                                end
+                                raise
+                            end
+                        }
                     }
                 }
-            }
+            end
+
+            def self.netclient(namespace)
+                if @clients.empty?
+                    self.mkclients()
+                end
+
+                @clients[namespace]
+            end
 
             def ca_file=(cafile)
                 @http.ca_file = cafile
@@ -113,13 +136,17 @@ module Puppet
                     nil, # proxy_port
                     nil, # user
                     nil, # password
-                    true # use_ssl
+                    true, # use_ssl
+                    120 # a two minute timeout, instead of 30 seconds
                 )
 
                 if hash[:Certificate]
                     self.cert = hash[:Certificate]
                 else
-                    Puppet.err "No certificate; running with reduced functionality."
+                    unless defined? $nocertwarned
+                        Puppet.err "No certificate; running with reduced functionality."
+                        $nocertwarned = true
+                    end
                 end
 
                 if hash[:Key]
@@ -145,4 +172,4 @@ module Puppet
     end
 end
 
-# $Id: networkclient.rb 914 2006-02-15 21:04:14Z luke $
+# $Id: networkclient.rb 1385 2006-07-11 17:36:32Z luke $

data/lib/puppet/parameter.rb

@@ -19,6 +19,48 @@ module Puppet
                 end
             end
 
+            # Return a documentation string.  If there are valid values,
+            # then tack them onto the string.
+            def doc
+                @doc ||= ""
+
+                unless defined? @addeddocvals
+                    unless values.empty?
+                        if @aliasvalues.empty?
+                            @doc += "  Valid values are ``" +
+                                values.join("``, ``") + "``."
+                        else
+                            @doc += "  Valid values are "
+
+                            @doc += values.collect do |value|
+                                ary = @aliasvalues.find do |name, val|
+                                    val == value
+                                end
+                                if ary
+                                    "``%s`` (also called ``%s``)" % [value, ary[0]]
+                                else
+                                    "``#{value}``"
+                                end
+                            end.join(", ") + "."
+                        end
+                    end
+
+                    if defined? @parameterregexes and ! @parameterregexes.empty?
+                        regs = @parameterregexes
+                        if @parameterregexes.is_a? Hash
+                            regs = @parameterregexes.keys
+                        end
+                        unless regs.empty?
+                            @doc += "  Values can also match ``" +
+                                regs.join("``, ``") + "``."
+                        end
+                    end
+                    @addeddocvals = true
+                end
+
+                @doc
+            end
+
             def nodefault
                 if public_method_defined? :default
                     undef_method :default
@@ -187,7 +229,9 @@ module Puppet
         # Just a simple method to proxy instance methods to class methods
         def self.proxymethods(*values)
             values.each { |val|
-                eval "def #{val}; self.class.#{val}; end"
+                define_method(val) do
+                    self.class.send(val)
+                end
             }
         end
 
@@ -324,6 +368,10 @@ module Puppet
             end
         end
 
+        def remove
+            @parent = nil
+        end
+
         # This should only be called for parameters, but go ahead and make
         # it possible to call for states, too.
         def value

data/lib/puppet/parsedfile.rb

@@ -4,35 +4,55 @@
 require 'puppet'
 
 module Puppet
+    class NoSuchFile < Puppet::Error; end
     class ParsedFile
         attr_reader :file
 
+        # Provide a hook for setting the timestamp during testing, so we don't
+        # have to depend on the granularity of the filesystem.
+        attr_writer :tstamp
+
+        Puppet.config.setdefaults(:puppet,
+            :filetimeout => [ 15,
+                "The minimum time to wait between checking for updates in
+                configuration files."
+            ]
+        )
+
         # Determine whether the file has changed and thus whether it should
         # be reparsed
         def changed?
-            tmp = self.stamp
-            retval = false
-            if tmp != @stamp
-                retval = true
-                @stamp = tmp
-            end
-            @statted = Time.now
+            # Don't actually stat the file more often than filetimeout.
+            if Time.now - @statted >= Puppet[:filetimeout]
+                tmp = stamp()
 
-            return retval
+                if tmp == @tstamp
+                    return false
+                else
+                    @tstamp = tmp
+                    return true
+                end
+            else
+                return false
+            end
         end
 
         # Create the file.  Must be passed the file path.
         def initialize(file)
             @file = file
             unless FileTest.exists?(@file)
-                raise Puppet::DevError, "Can not use a non-existent file for parsing"
+                raise Puppet::NoSuchFile, "Can not use a non-existent file for parsing"
             end
-            @stamp = self.stamp
-            @statted = Time.now
+            @tstamp = stamp()
         end
 
+        private
+
         def stamp
-            File.stat(@file).ctime
+            @statted = Time.now
+            return File.stat(@file).ctime
         end
     end
 end
+
+# $Id: parsedfile.rb 1422 2006-07-22 03:32:56Z luke $