X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=aptcheck%2Faptcheck.pl;h=2b769f22c9860c2ac2bf6610b06844a5046e6ba5;hb=69a6a467da589cfa124afba38c964635d38396e8;hp=7c9245b8b81dc0e36f9a0cb47dc95a6da936997c;hpb=f7453cc9f36971a2a5c305fc44f52767f363e472;p=git-tools-moved-to-github.git
diff --git a/aptcheck/aptcheck.pl b/aptcheck/aptcheck.pl
index 7c9245b..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;
@@ -36,6 +41,7 @@ my %hostcomments = (
"bellone" => "Niels Erik does the manual upgrades",
"cfrepous" => "Wolfram does the manual upgrades",
"leopard" => "Wolfram does the manual upgrades",
+ "lsd" => "Heikki takes care of all upgrades",
);
@@ -70,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;
@@ -105,6 +111,7 @@ my $sectot = 0;
my $owntot = 0;
my $mantot = 0;
my $normtot = 0;
+my %updlinks;
my $table = "\n";
@@ -118,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 .= "| |
\n";
@@ -145,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++;
@@ -221,13 +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 .= " Upd";
$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";
@@ -239,6 +248,9 @@ 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;
@@ -255,7 +267,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 "";
@@ -270,7 +283,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 "";
@@ -285,7 +300,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 "";
@@ -300,7 +317,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 "";
@@ -314,20 +333,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".
+ "![](http://nagios.indexdata.com/" .
+ "cgi-bin/nagios3/rrd2-system.cgi?" .
+ "host=nagios&service=Apt%20Summary&" .
+ "start=-$secs&" .
+ "width=800&height=100&type=AVERAGE)
".
+ "" .
+ "
\n";
# The host table
print F $table;