SF.net SVN: logwatch:[65] scripts/services

[email protected]
Newsgroups gmane.comp.log.logwatch.devel
Message-ID <[email protected]>
Revision: 65
          http://logwatch.svn.sourceforge.net/logwatch/?rev=65&view=rev
Author:   stefjakobs
Date:     2011-07-17 11:33:03 +0000 (Sun, 17 Jul 2011)

Log Message:
-----------
puppet: report added, changed and removed lines and installed and
removed packages. Patch by Nathan Crawford
dhcpd:  ignore 'xid mismatch' and report 'Load balance'. Patch by
Anonymous
named:  report expired zones

Modified Paths:
--------------
    scripts/services/dhcpd
    scripts/services/named
    scripts/services/puppet

Modified: scripts/services/dhcpd
===================================================================
--- scripts/services/dhcpd	2011-07-06 19:34:42 UTC (rev 64)
+++ scripts/services/dhcpd	2011-07-17 11:33:03 UTC (rev 65)
@@ -56,6 +56,7 @@
       # Remove host declaration host_name or remove 10.0.0.199
       ($line =~ /^from the dynamic address pool for/) or
       ($line =~ /^parse_option_buffer: option [\w-]+ \(\d+\) larger than buffer/) or
+      ($line =~ /xid mismatch/) or
       ($line =~ /^BOOTREQUEST/) or
       ($line =~ /^DHCPACK/) or
       ($line =~ /^DHCPNAK/) or
@@ -196,6 +197,8 @@
       $data{'No Free Leases'}{$1}++;
    } elsif ($line =~ /^DHCPDISCOVER from .* via (\S+): unknown network segment/) {
       $data{'Unknown Network Segments'}{$1}++;
+   } elsif ($line =~ /^DHCPDISCOVER from .* via (\S+): load balance to peer/) {
+      $data{'Load balance to peer'}{$1}++
    } elsif ($line =~ /^ICMP Echo Reply for ([\da-fA-F\.:]+) late or spurious/) {
       $data{'Late or spurious Echo Reply for'}{$1}++;
    } elsif ($line =~ /^ICMP Echo reply while lease ([\da-fA-F\.:]+) valid/) {

Modified: scripts/services/named
===================================================================
--- scripts/services/named	2011-07-06 19:34:42 UTC (rev 64)
+++ scripts/services/named	2011-07-17 11:33:03 UTC (rev 65)
@@ -287,6 +287,8 @@
       $ZoneLoaded{"secondary $Zone"}++;
    } elsif ( ($Zone) = ( $ThisLine =~ /slave zone \"(.+)\" .* loaded/ ) ) {
       $ZoneLoaded{"secondary $Zone"}++;
+   } elsif ( ($Zone) = ( $ThisLine =~ /zone (.+)\/IN\: expired/ ) ) {
+      $ZoneExpired{$Zone}++;
    } elsif ( ($Zone) = ( $ThisLine =~ /zone (.+)\: loaded serial/ ) ) {
       $ZoneLoaded{$Zone}++;
    } elsif ( (undef,$Addr,undef,$Server) = ( $ThisLine =~ /ame server (on|resolving) '(.+)' \(in .+\):\s+(\[.+\]\.\d+)?\s*'?(.+)'?:?/ ) ) {
@@ -592,6 +594,13 @@
    }
 }
 
+if ( keys %ZoneExpired ) {
+   print "\nZones expired:\n";
+   foreach $ThisOne (sort {$a cmp $b} keys %ZoneExpired) {
+      print "   $ThisOne: $ZoneExpired{$ThisOne} Time(s)\n";
+   }
+}
+
 if ( ( $Detail >= 5 ) and (keys %ZoneUpdates) ) {
    print "\nZone Updates:\n";
    foreach $ThisOne (sort {$a cmp $b} keys %ZoneUpdates) {

Modified: scripts/services/puppet
===================================================================
--- scripts/services/puppet	2011-07-06 19:34:42 UTC (rev 64)
+++ scripts/services/puppet	2011-07-17 11:33:03 UTC (rev 65)
@@ -35,6 +35,7 @@
       ($ThisLine =~ /Caching catalog for /) or
       ($ThisLine =~ /Caching node for /) or
       ($ThisLine =~ /Caught TERM; calling stop/) or
+      ($ThisLine =~ /[sS]hutting down/) or
       ($ThisLine =~ /Reopening log files/) or
       ($ThisLine =~ /Starting Puppet client version /) or
       ($ThisLine =~ /Restarting with.+puppetd/) or
@@ -61,18 +62,26 @@
       $ChangedFiles{$1}++;
    } elsif ($ThisLine =~ /File\[.+\].+created/) {
       $ThisLine =~ /File\[(.+)\].+created/;
-      $ChangedFiles{$1}++;
+      $CreatedFiles{$1}++;
    } elsif ($ThisLine =~ /File\[.+\].+removed/) {
       $ThisLine =~ /File\[(.+)\].+removed/;
-      $ChangedFiles{$1}++;
-   } elsif ($ThisLine =~ /Failed to retrieve current state of resource/) {
+      $RemovedFiles{$1}++;
+   } elsif (
+      ($ThisLine =~ /Failed to retrieve current state of resource/) or
+      ($ThisLine =~ /Package.+ensure.+Could not find package/) or
+      ($ThisLine =~ /File\[.+\].+ Could not describe /) or
+      ($ThisLine =~ /File\[.+\].+ No specified sources exist/)
+   ) {
       $ResourceFailures++;
    } elsif ($ThisLine =~ /Package\[.+\].+ensure changed/) {
       $ThisLine =~ /Package\[(.+)\].+ensure changed/;
       $ChangedPackages{$1}++;
    } elsif ($ThisLine =~ /Package\[.+\].+ensure\) created/) {
       $ThisLine =~ /Package\[(.+)\].+ensure\) created/;
-      $ChangedPackages{$1}++;
+      $InstalledPackages{$1}++;
+   } elsif ($ThisLine =~ /Package\[.+\].+ensure\) removed/) {
+      $ThisLine =~ /Package\[(.+)\].+ensure\) removed/;
+      $RemovedPackages{$1}++;
    } elsif ($ThisLine =~ /Exec\[.+\].+executed successfully/) {
       $ThisLine =~ /Exec\[(.+)\].+executed successfully/;
       $ExecRuns{$1}++;
@@ -85,7 +94,7 @@
    } elsif ($ThisLine =~ /Service\[.+\].+Triggering 'refresh' from [0-9]+ dependencies/) {
       $ThisLine =~ /Service\[(.+)\].+Triggering 'refresh' from [0-9]+ dependencies/;
       $ServiceStarts{$1}++;
-   } elsif ($ThisLine =~ /Dependency .+\[.+\].+ has [0-9]+ failure/) {
+   } elsif ($ThisLine =~ /Dependency .+\[.+\] has [0-9]+ failure/) {
       $DependencyFailures++;
    } else {
       # Report any unmatched entries...
@@ -95,12 +104,21 @@
 
 #######################################
 
-print "\nSuccessful runs: $SuccessfulRuns\n" if $Detail;
+if ($SuccessfulRuns > 0 && $Detail > 0) {
+   print "\nSuccessful runs: $SuccessfulRuns\n";
+}
 
 if ($FailedRuns > 0) {
    print "\nFailed runs: $FailedRuns\n";
 }
 
+if (keys %CreatedFiles) {
+   print "\nCreated files:\n";
+   foreach $ThisOne (keys %CreatedFiles) {
+      print "$ThisOne: $CreatedFiles{$ThisOne} Time(s)\n";
+   }
+}
+
 if (keys %ChangedFiles) {
    print "\nChanged files:\n";
    foreach $ThisOne (keys %ChangedFiles) {
@@ -108,6 +126,20 @@
    }
 }
 
+if (keys %RemovedFiles) {
+   print "\nRemoved files:\n";
+   foreach $ThisOne (keys %RemovedFiles) {
+      print "$ThisOne: $RemovedFiles{$ThisOne} Time(s)\n";
+   }
+}
+
+if (keys %InstalledPackages) {
+   print "\nInstalled packages:\n";
+   foreach $ThisOne (keys %InstalledPackages) {
+      print "$ThisOne: $InstalledPackages{$ThisOne} Time(s)\n";
+   }
+}
+
 if (keys %ChangedPackages) {
    print "\nChanged packages:\n";
    foreach $ThisOne (keys %ChangedPackages) {
@@ -115,6 +147,13 @@
    }
 }
 
+if (keys %RemovedPackages) {
+   print "\nRemoved packages:\n";
+   foreach $ThisOne (keys %RemovedPackages) {
+      print "$ThisOne: $RemovedPackages{$ThisOne} Time(s)\n";
+   }
+}
+
 if (keys %ExecRuns) {
    print "\nExec runs:\n";
    foreach $ThisOne (keys %ExecRuns) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

------------------------------------------------------------------------------
AppSumo Presents a FREE Video for the SourceForge Community by Eric 
Ries, the creator of the Lean Startup Methodology on "Lean Startup 
Secrets Revealed." This video shows you how to validate your ideas, 
optimize your ideas and identify your business strategy.
http://p.sf.net/sfu/appsumosfdev2dev
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.