X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=aptcheck%2Faptcheck.pl;h=2b769f22c9860c2ac2bf6610b06844a5046e6ba5;hb=69a6a467da589cfa124afba38c964635d38396e8;hp=000bb67392bf36980743500b5341dcdcd991bbf0;hpb=daff3cb4e018b74d0ead0f6fb917912c5ba6eb45;p=git-tools-moved-to-github.git

diff --git a/aptcheck/aptcheck.pl b/aptcheck/aptcheck.pl
index 000bb67..2b769f2 100755
--- a/aptcheck/aptcheck.pl
+++ b/aptcheck/aptcheck.pl
@@ -18,10 +18,15 @@
 #
 # 11-Mar-2011 Heikki: Started this
 # 22-Mar-2011 Heikki: Adding manually maintained packages
+# 15-Aug-2011 Heikki: Adding a total in the headline, for nagiosgrapher
 #
 # TODO: Assumes that we release our restricted packages for all versions
 # 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;
@@ -30,6 +35,16 @@ my $year =`date +%Y`;
 my $wikilink = 'http://twiki.indexdata.dk/cgi-bin/twiki/view/ID/';
 my $restrictedpackages = "ssh -q kebab cat /home/ftp/pub/debian/dists/*/restricted/*/Packages";
 
+#### Host comments
+my %hostcomments = (
+      "ariel"    => "<i>Niels Erik</i> does the manual upgrades",
+      "bellone"  => "<i>Niels Erik</i> does the manual upgrades",
+      "cfrepous" => "<i>Wolfram</i> does the manual upgrades",
+      "leopard"  => "<i>Wolfram</i> does the manual upgrades",
+      "lsd"      => "<i>Heikki</i> takes care of all upgrades",
+      );
+      
+
 #### Get list of hosts
 # I could use a hard-coded list, but I would forget to maintain it.
 # Nagios knows most of our hosts. It even knows which are worth 
@@ -61,7 +76,7 @@ for my $pline ( split("\n",$restplines) ) {
             print "found $pname, first version $pver\n" if $debug>1;
         } else {
             my $bver = $restrpkgs{$pname};
-            `dpkg --compare-versions $bver lt $pver`;
+            `dpkg --compare-versions "$bver" lt "$pver" `;
             if ( ! $? ) {
                 print "found $pname, better version $pver (better than $bver)\n"
                     if $debug>1;
@@ -96,6 +111,7 @@ my $sectot = 0;
 my $owntot = 0;
 my $mantot = 0;
 my $normtot = 0;
+my %updlinks;
 
 my $table = "<table>\n";
 
@@ -109,6 +125,7 @@ for my $hline ( split("\n",$hostlist) ) {
     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
+    print "ssh -q $H \"$cmd1 ; $cmd2 \" 2>/dev/null" if ($debug>1);
     my $apt = `ssh -q $H "$cmd1 ; $cmd2 " 2>/dev/null`;
     if ( !$apt ) {
         $table .= "<tr><td colspan='3'>&nbsp;</td></tr>\n";
@@ -136,7 +153,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" `;
                 if ( $? ) { # It was not a downgrade 
                             # manual packages may be ahead of the repo!
                     $mantot++;
@@ -145,11 +162,11 @@ for my $hline ( split("\n",$hostlist) ) {
                     $manhosts{$H} = 1;
                     $manpkgs{$restrname} = 1;
                     $det .= "<tr>";
-                    $det .= "<td>&nbsp;&nbsp;<b>$restrname (M)</b></td>";
+                    $det .= "<td>&nbsp;&nbsp;$restrname <b>(M)</b></td>";
                     $det .= "<td>". strdiff($bver,$restrinst)."</td>";
                     $det .= "<td>". strdiff($restrinst,$bver)."</td>";
                     $det .= "</tr>\n";
-                    my $key = "$restrname (M)";
+                    my $key = "$restrname";
                     if ( !$summary{$key} ) {
                         $summary{$key} = "";
                     }
@@ -212,11 +229,14 @@ 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 .= "&nbsp;<a href='$updlink' >Upd</a>";
     $table .= "</td></tr>\n";
+    $table .= "<tr><td>$hostcomments{$H}</td></tr>\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 .= "</table>\n";
 
@@ -228,6 +248,11 @@ print F "<html>\n";
 print F "<head><title>Apt upgrade status</title></head>\n";
 print F "<body>\n";
 print F "<H1>Apt package status</H1>\n";
+print F "<b>" .  ( $sectot + $owntot + $mantot + $normtot ) . 
+        "</b> packages pending (<b>$sectot</b> critical) \n";
+
+print F "<H2>Debug run, many hosts missing!</H2>\n"
+   if $debug;
 
 
 # Summary table: one row for per host group
@@ -242,7 +267,8 @@ if ( $sectot ) {
         "&nbsp;/&nbsp;" .  scalar(keys(%secpkgs)) . "&nbsp;/&nbsp;$sectot </td>\n" ;
     print F "<td>";
     for my $HH ( sort(keys(%sechosts)) ) {
-        print F "<a href='#$HH'><b>$HH</b></a> ";
+        my $upd = $updlinks{$HH} || "#" ;
+        print F "<a href='#$HH'><b>$HH</b></a><a href='$upd'>,</a> ";
     }
     print F "</td>";
     print F "<td>";
@@ -257,7 +283,9 @@ if ( $owntot ) {
         "&nbsp;/&nbsp;" .  scalar(keys(%ownpkgs)) . "&nbsp;/&nbsp;$owntot </td>\n" ;
     print F "<td>";
     for my $HH ( sort(keys(%ownhosts)) ) {
-        print F "<a href='#$HH'><b>$HH</b></a> ";
+        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> ";
     }
     print F "</td>";
     print F "<td>";
@@ -272,7 +300,9 @@ if ( $mantot ) {
         "&nbsp;/&nbsp;" .  scalar(keys(%manpkgs)) . "&nbsp;/&nbsp;$mantot </td>\n" ;
     print F "<td>";
     for my $HH ( sort(keys(%manhosts)) ) {
-        print F "<a href='#$HH'><b>$HH</b></a> ";
+        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> ";
     }
     print F "</td>";
     print F "<td>";
@@ -287,7 +317,9 @@ if ( $normtot ) {
         "&nbsp;/&nbsp;" .  scalar(keys(%normpkgs)) . "&nbsp;/&nbsp;$normtot </td>\n" ;
     print F "<td>";
     for my $HH ( sort(keys(%normhosts)) ) {
-        print F "<a href='#$HH'><b>$HH</b></a> ";
+        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> ";
     }
     print F "</td>";
     print F "<td>";
@@ -301,20 +333,43 @@ if ( %skiphosts ) {
     print F "<tr><td>Skipped " . scalar(keys(%skiphosts)) . "</td>\n";
     print F "<td colspan='2'>";
     for my $HH ( sort(keys(%skiphosts)) ) {
-        print F "<a href='#$HH'><b>$HH</b></a> ";
+        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> ";
     }
     print F "</td></tr>\n";
 }
-if ( %okhosts ) {
+#if ( %okhosts ) {
+if ( 1 ) {
     print F "<tr><td>Ok " . scalar(keys(%okhosts)) . "</td>\n";
     print F "<td colspan='2'>";
     for my $HH ( sort(keys(%okhosts)) ) {
-        print F "<a href='#$HH'><b>$HH</b></a> ";
+        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> ";
+    }
+    if ( !%okhosts ) {
+        print F "<b>None at all!</b>";
     }
     print F "</td></tr>\n";
 }
 print F "</table>\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 "<p/>" .
+        "<a href='http://nagios.indexdata.com/cgi-bin/nagios3/graphs.cgi?" .
+        "host=nagios&service=Apt%20Summary'>\n".
+        "<img src='http://nagios.indexdata.com/" .
+              "cgi-bin/nagios3/rrd2-system.cgi?" .
+              "host=nagios&service=Apt%20Summary&" .
+              "start=-$secs&" .
+              "width=800&height=100&type=AVERAGE' /> ".
+        "</a>" .
+        "<br/>\n";
 
 # The host table
 print F $table;
@@ -324,8 +379,9 @@ print F "<p/><b><u>Packages</u></b>\n";
 print F "<table>\n";
 for my $P ( sort(keys(%summary)) ) {
     my $PN = $P;
-    $PN = "<b>$P (s)</b>" if ($secpkgs{$P});
-    $PN = "$P (id)" if ($ownpkgs{$P});
+    $PN = "<b>$P&nbsp;(s)</b>" if ($secpkgs{$P});
+    $PN = "<i>$P&nbsp;(id)</i>" if ($ownpkgs{$P});
+    $PN = "$P&nbsp;<b>(M)</b>" if ($manpkgs{$P});
     print F "<tr><td><a name='$P'/>$PN</td>\n";
     print F "<td>";
     for my $HH ( split(' ',$summary{$P} )) {