) {
+ chop();
+ my ($pkg, $date) = split;
+ next unless $pkg; # skip empty lines
+ $olddates{$pkg} = $date;
+ print "Date for '$pkg' is '$date' \n" if $debug;
+ }
+ close F;
+ $thisdate = `date +%F`;
+ chomp($thisdate);
+} else {
+ print "No datefile $datefilename found, starting from scratch\n";
+}
+
my $table = "\n";
-for my $hline ( split("\n",$hostlist) ) {
+#for my $hline ( split("\n",$hostlist) ) {
+for my $hline ( sort( split("\n",$hostlist) ) ) {
next unless ( $hline =~ /\/([a-z0-9-]+)\.cfg$/ );
my $H = $1;
next if ($H =~ /^commands/ );
next if ($H =~ /^servicegroups/ );
print "Checking $H\n" if $debug;
$allhosts{$H}=1;
+ my $cmd0 = "cat /etc/debian_version";
my $cmd1 = "apt-cache -q policy " . join(" ",sort(keys(%restrpkgs)));
my $cmd2 = "apt-get upgrade -s -o 'Debug::NoLocking=true' ";
# Note, do not append -qq, we want some output even when nothing to do
- my $apt = `ssh -q $H "$cmd1 ; $cmd2 " 2>/dev/null`;
+ print "ssh -q $H \"$cmd0; $cmd1 ; $cmd2 \" 2>/dev/null \n" if ($debug>1);
+ my $apt = `ssh -q $H "$cmd0; $cmd1 ; $cmd2 " 2>/dev/null`;
if ( !$apt ) {
$table .= " |
\n";
$table .= "$H (skipped)\n";
@@ -125,7 +178,18 @@ for my $hline ( split("\n",$hostlist) ) {
my $restrname = "";
my $restrinst = "";
my $restrcand = "";
+ my $debver = 0;
for my $p ( split("\n",$apt) ) {
+ if ( !$debver ) { # first line
+ $debver = 1;
+ $p =~ s/(5[0-9.]+)/$1 LENNY !!!/;
+ $p =~ s/(6[0-9.]+)/$1 squeeze/;
+ $p =~ s/(7[0-9.]+)/$1 wheezy/;
+ $p = " Debian $p";
+ $debversions{$H} = $p;
+ print "Deb version for $H is $p\n" if ($debug>1);
+ next;
+ }
# parse apt-cache output
$restrname = $1 if $p =~ /^(\S+):$/;
$restrinst = $1 if $p =~ /^\s+Installed:\s+(\S+)$/;
@@ -136,7 +200,7 @@ for my $hline ( split("\n",$hostlist) ) {
( $restrinst ne $bver ) ) {
# if different, it is a regular apt upgrade, and will be seen
# later. AND we want to have a different version in our repo
- `dpkg --compare-versions $bver lt $restrinst`;
+ `dpkg --compare-versions "$bver" lt "$restrinst" 2>/dev/null`;
if ( $? ) { # It was not a downgrade
# manual packages may be ahead of the repo!
$mantot++;
@@ -145,14 +209,22 @@ for my $hline ( split("\n",$hostlist) ) {
$manhosts{$H} = 1;
$manpkgs{$restrname} = 1;
$det .= " |
";
- $det .= " $restrname (M) | ";
+ $det .= " $restrname (M) | ";
$det .= "". strdiff($bver,$restrinst)." | ";
$det .= "". strdiff($restrinst,$bver)." | ";
+ my $datekey = "$H:$restrname";
+ if ( $olddates{$datekey} ) {
+ $newdates{$datekey} = $olddates{$datekey};
+ } else {
+ $newdates{$datekey} = $thisdate;
+ }
+ $det .= "" . $newdates{$datekey} . " | ";
$det .= "
\n";
- if ( !$summary{$restrname} ) {
- $summary{$restrname} = "";
+ my $key = "$restrname";
+ if ( !$summary{$key} ) {
+ $summary{$key} = "";
}
- $summary{$restrname} .= "$H ";
+ $summary{$key} .= "$H ";
}
}
$restrname = ""; # clear for next round
@@ -193,10 +265,18 @@ for my $hline ( split("\n",$hostlist) ) {
$det .= " ";
$det .= "$cur | ";
$det .= "$new | ";
+ my $datekey = "$H:$pkg";
+ if ( $olddates{$datekey} ) {
+ $newdates{$datekey} = $olddates{$datekey};
+ } else {
+ $newdates{$datekey} = $thisdate;
+ }
+ $det .= "" . $newdates{$datekey} . " | ";
$det .= "\n";
+
}
- $table .= " |
\n";
- $table .= "$H \n";
+ $table .= " |
|
\n";
+ $table .= "$H \n";
if ( $pkgs ) {
$table .= "$pkgs packages to upgrade. ";
$table .= "$secs security. " if $secs;
@@ -211,14 +291,28 @@ for my $hline ( split("\n",$hostlist) ) {
# Mostly because the host names would not make proper WikiWords
$updlink =~ s/Bugzilla3Updates/BugzillaUpdates/;
$updlink =~ s/Opencontent-solrUpdates/OpenContentSolrUpdates/;
+ $updlinks{$H} = $updlink;
$table .= " Upd";
+ $table .= " " . $debversions{$H};
$table .= " |
\n";
+ $table .= "$hostcomments{$H} |
\n"
+ if ( $hostcomments{$H} );
$table .= $det if $pkgs;
print "\n$table\n" if $debug>2;
- last if $H =~/dart/ && $debug;
+ last if $H =~/diane/ && $debug;
}
$table .= "
\n";
+# Save the date file
+`mv -f $datefilename $dateoldfilename`;
+open F, ">$datefilename" or die "Could not open date file $datefilename for writing";
+for my $k (sort(keys(%newdates)) ) {
+ print F "$k " . $newdates{$k}. "\n";
+ print "date for '$k' '" . $newdates{$k}. "'\n" if $debug;
+}
+close F
+ or die "Could not close date file $datefilename: $!";
+
# Page header
my $outfile = "/tmp/aptcheck.html";
open F, ">$outfile"
@@ -227,6 +321,11 @@ print F "\n";
print F "Apt upgrade status\n";
print F "\n";
print F "Apt package status
\n";
+print F "" . ( $sectot + $owntot + $mantot + $normtot ) .
+ " packages pending ($sectot critical) \n";
+
+print F "Debug run, many hosts missing!
\n"
+ if $debug;
# Summary table: one row for per host group
@@ -241,7 +340,8 @@ if ( $sectot ) {
" / " . scalar(keys(%secpkgs)) . " / $sectot \n" ;
print F "";
for my $HH ( sort(keys(%sechosts)) ) {
- print F "$HH ";
+ my $upd = $updlinks{$HH} || "#" ;
+ print F "$HH, ";
}
print F " | ";
print F "";
@@ -256,7 +356,9 @@ if ( $owntot ) {
" / " . scalar(keys(%ownpkgs)) . " / $owntot | \n" ;
print F "";
for my $HH ( sort(keys(%ownhosts)) ) {
- print F "$HH ";
+ my $upd = $updlinks{$HH} || "#" ;
+ print F "$HH, ";
+ #print F "$HH ";
}
print F " | ";
print F "";
@@ -271,7 +373,9 @@ if ( $mantot ) {
" / " . scalar(keys(%manpkgs)) . " / $mantot | \n" ;
print F "";
for my $HH ( sort(keys(%manhosts)) ) {
- print F "$HH ";
+ my $upd = $updlinks{$HH} || "#" ;
+ print F "$HH, ";
+ #print F "$HH ";
}
print F " | ";
print F "";
@@ -286,7 +390,9 @@ if ( $normtot ) {
" / " . scalar(keys(%normpkgs)) . " / $normtot | \n" ;
print F "";
for my $HH ( sort(keys(%normhosts)) ) {
- print F "$HH ";
+ my $upd = $updlinks{$HH} || "#" ;
+ print F "$HH, ";
+ #print F "$HH ";
}
print F " | ";
print F "";
@@ -300,20 +406,43 @@ if ( %skiphosts ) {
print F " | Skipped " . scalar(keys(%skiphosts)) . " | \n";
print F "";
for my $HH ( sort(keys(%skiphosts)) ) {
- print F "$HH ";
+ my $upd = $updlinks{$HH} ||
+ $wikilink . ucfirst($HH) . "Updates" . $year;
+ print F "$HH, ";
+ #print F "$HH ";
}
print F " |
\n";
}
-if ( %okhosts ) {
+#if ( %okhosts ) {
+if ( 1 ) {
print F "Ok " . scalar(keys(%okhosts)) . " | \n";
print F "";
for my $HH ( sort(keys(%okhosts)) ) {
- print F "$HH ";
+ my $upd = $updlinks{$HH} || "#" ;
+ print F "$HH, ";
+ #print F "$HH ";
+ }
+ if ( !%okhosts ) {
+ print F "None at all!";
}
print F " |
\n";
}
print F "\n";
+# Graph
+#my $secs = 60*60*24 * 7 * 2; # 2 weeks in secods
+#my $secs = "1m"; # one month, let nagios do the math
+my $secs = "45d";
+print F "" .
+ "\n".
+ " ".
+ "" .
+ "
\n";
# The host table
print F $table;
@@ -323,8 +452,9 @@ print F "Packages\n";
print F "\n";
for my $P ( sort(keys(%summary)) ) {
my $PN = $P;
- $PN = "$P (s)" if ($secpkgs{$P});
- $PN = "$P (id)" if ($ownpkgs{$P});
+ $PN = "$P (s)" if ($secpkgs{$P});
+ $PN = "$P (id)" if ($ownpkgs{$P});
+ $PN = "$P (M)" if ($manpkgs{$P});
print F "$PN | \n";
print F "";
for my $HH ( split(' ',$summary{$P} )) {
|