More visible upd links.

[git-tools-moved-to-github.git] / aptcheck / aptcheck.pl

diff --git a/aptcheck/aptcheck.pl b/aptcheck/aptcheck.pl
index d49e41b..3121946 100755 (executable)
--- a/aptcheck/aptcheck.pl
+++ b/aptcheck/aptcheck.pl
@@ -27,9 +27,6 @@
 # and architectures at the same time. Gets only the highest version from
 # all, and reports anything less than this. Good enough for now.
 #
-# TODO: Get the dates from ls --full-time /var/cache/apt/archives/
-# and display next to the packages, so we can see how long they have
-# been lingering. Boldface them if older than some limit
 
 #### Init
 use strict;
@@ -38,6 +35,7 @@ my $year =`date +%Y`;
 #my $wikilink = 'http://twiki.indexdata.dk/cgi-bin/twiki/view/ID/';
 my $wikilink = 'https://twiki.indexdata.com/twiki/bin/view/ID/';
 my $restrictedpackages = "ssh -q kebab cat /home/ftp/pub/debian/dists/*/restricted/*/Packages";
+my $updlink="<i>-u</i>"; # to display after a name, liking to the upd page
 
 #### Host comments
 my %hostcomments = (
@@ -129,6 +127,8 @@ my %newdates;  # To be written in the new version of the file
 my $datefilename = "aptcheck.data";
 my $dateoldfilename = "aptcheck.old";
 my $thisdate = "*"; # indicates really old stuff
+my $warndate; # Older than this will be boldfaced
+
 if ( -f $datefilename ) {
   print "Reading dates from $datefilename\n" if $debug;
   open F, $datefilename or die "Could not open date file $datefilename: $!";
@@ -142,6 +142,9 @@ if ( -f $datefilename ) {
   close F;
   $thisdate = `date +%F`;
   chomp($thisdate);
+  $warndate = `date +%F -d "30 days ago"` ; ;
+  chomp($warndate);
+  print "Dates: now: '$thisdate' warn: '$warndate'\n" if $debug;
 } else {
   print "No datefile $datefilename found, starting from scratch\n";
 }
@@ -218,7 +221,12 @@ for my $hline ( sort( split("\n",$hostlist) ) ) {
                     } else {
                         $newdates{$datekey} = $thisdate;
                     }
-                    $det .= "<td>" . $newdates{$datekey} . "</td>";
+                    my $dispdate = $newdates{$datekey};
+                    # if ( $dispdate lt $warndate ) {
+                    if ( 0 ) { # manual packages don't need to be highlighted
+                        $dispdate = "<b>$dispdate !</b>";
+                    }
+                    $det .= "<td>" . $dispdate . "</td>";
                     $det .= "</tr>\n";
                     my $key = "$restrname";
                     if ( !$summary{$key} ) {
@@ -271,7 +279,11 @@ for my $hline ( sort( split("\n",$hostlist) ) ) {
         } else {
             $newdates{$datekey} = $thisdate;
         }
-        $det .= "<td>" . $newdates{$datekey} . "</td>";
+        my $dispdate = $newdates{$datekey};
+        if ( ( $dispdate lt $warndate ) && ( $src =~ /Security/) ) {
+            $dispdate = "<b>$dispdate !</b>";
+        }
+        $det .= "<td>" . $dispdate . "</td>";
         $det .= "</tr>\n";
 
     }
@@ -304,14 +316,18 @@ for my $hline ( sort( split("\n",$hostlist) ) ) {
 $table .= "</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;
+if ( ! $debug ) {
+    `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: $!";
+} else {
+    print "Not updating the date file, this is a debug run\n";
 }
-close F
-  or die "Could not close date file $datefilename: $!";
 
 # Page header
 my $outfile = "/tmp/aptcheck.html";
@@ -341,7 +357,7 @@ if ( $sectot ) {
     print F "<td>";
     for my $HH ( sort(keys(%sechosts)) ) {
         my $upd = $updlinks{$HH} || "#" ;
-        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
+        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>$updlink</a> ";
     }
     print F "</td>";
     print F "<td>";
@@ -357,7 +373,7 @@ if ( $owntot ) {
     print F "<td>";
     for my $HH ( sort(keys(%ownhosts)) ) {
         my $upd = $updlinks{$HH} || "#" ;
-        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
+        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>$updlink</a> ";
         #print F "<a href='#$HH'><b>$HH</b></a> ";
     }
     print F "</td>";
@@ -374,7 +390,7 @@ if ( $mantot ) {
     print F "<td>";
     for my $HH ( sort(keys(%manhosts)) ) {
         my $upd = $updlinks{$HH} || "#" ;
-        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
+        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>$updlink</a> ";
         #print F "<a href='#$HH'><b>$HH</b></a> ";
     }
     print F "</td>";
@@ -391,7 +407,7 @@ if ( $normtot ) {
     print F "<td>";
     for my $HH ( sort(keys(%normhosts)) ) {
         my $upd = $updlinks{$HH} || "#" ;
-        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
+        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>$updlink</a> ";
         #print F "<a href='#$HH'><b>$HH</b></a> ";
     }
     print F "</td>";
@@ -408,18 +424,18 @@ if ( %skiphosts ) {
     for my $HH ( sort(keys(%skiphosts)) ) {
         my $upd = $updlinks{$HH} ||
                   $wikilink . ucfirst($HH) . "Updates" . $year;
-        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
+        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>$updlink</a> ";
         #print F "<a href='#$HH'><b>$HH</b></a> ";
     }
     print F "</td></tr>\n";
 }
-#if ( %okhosts ) {
 if ( 1 ) {
-    print F "<tr><td>Ok " . scalar(keys(%okhosts)) . "</td>\n";
+    print F "<tr><td>Ok <br/>" . scalar(keys(%okhosts)) .
+           " of " . scalar(keys(%allhosts)) . "</td>\n";
     print F "<td colspan='2'>";
     for my $HH ( sort(keys(%okhosts)) ) {
         my $upd = $updlinks{$HH} || "#" ;
-        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
+        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>$updlink</a> ";
         #print F "<a href='#$HH'><b>$HH</b></a> ";
     }
     if ( !%okhosts ) {
@@ -429,6 +445,9 @@ if ( 1 ) {
 }
 print F "</table>\n";
 
+print F "<p/><b>" .  ( $sectot + $owntot + $mantot + $normtot ) . 
+        "</b> packages pending (<b>$sectot</b> critical) \n";
+
 # Graph 
 #my $secs = 60*60*24 * 7 * 2; # 2 weeks in secods
 #my $secs = "1m"; # one month, let nagios do the math