X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=aptcheck%2Faptcheck.pl;h=b6353002b7b7128cc8c18268fe2442db7ea7aabd;hb=12ca199577b3174589205147fe1b2365d231ab85;hp=3866de92cb83b6e87350accd93fcdfdb2a565bdc;hpb=d055bbb75daddec96238f568e436d0c336dfa76f;p=git-tools-moved-to-github.git diff --git a/aptcheck/aptcheck.pl b/aptcheck/aptcheck.pl index 3866de9..b635300 100755 --- a/aptcheck/aptcheck.pl +++ b/aptcheck/aptcheck.pl @@ -19,20 +19,21 @@ # 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 +# 21-May-2012 Heikki: Added a date since when a package has been pending +# 31-May-2012 Heikki: Pointing to the new wiki +# 01-Jan-2013 Heikki: Get hosts from nagios-us as well. # # 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; my $debug= $ARGV[0] || 0; # 0=none, 1=some, 2=more, 3=much my $year =`date +%Y`; -my $wikilink = 'http://twiki.indexdata.dk/cgi-bin/twiki/view/ID/'; +#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"; #### Host comments @@ -49,10 +50,15 @@ my %hostcomments = ( # 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 # checking, they have a command to check apts! +print "Getting hostlist from nagios\n" if $debug; +my $hostlist1 = `ssh nagios grep -l Apt /etc/nagios3/indexdata-conf.d/*.cfg` + or die "Could not get host list from nagios (dk)"; -my $hostlist = `ssh nagios grep -l Apt /etc/nagios3/indexdata-conf.d/*.cfg` - or die "Could not get host list"; +print "Getting hostlist from nagios-us\n" if $debug; +my $hostlist2 = `ssh nagios-us grep -l Apt /etc/nagios3/indexdata-conf.d/*.cfg` + or die "Could not get host list from nagios (dk)"; +my $hostlist = $hostlist1 . $hostlist2; print "Got list:\n$hostlist\n" if $debug>2; ###### Get list of packages that can be manually maintained @@ -76,7 +82,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" 2>/dev/null `; if ( ! $? ) { print "found $pname, better version $pver (better than $bver)\n" if $debug>1; @@ -112,6 +118,7 @@ my $owntot = 0; my $mantot = 0; my $normtot = 0; my %updlinks; +my %debversions; # Pending modification dates my %olddates; # Read in from the file @@ -119,6 +126,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: $!"; @@ -132,6 +141,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"; } @@ -139,18 +151,20 @@ if ( -f $datefilename ) { my $table = "
$H (skipped)\n"; @@ -166,7 +180,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+)$/; @@ -177,7 +202,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++; @@ -195,7 +220,12 @@ for my $hline ( split("\n",$hostlist) ) { } else { $newdates{$datekey} = $thisdate; } - $det .= " | " . $newdates{$datekey} . " | "; + my $dispdate = $newdates{$datekey}; + # if ( $dispdate lt $warndate ) { + if ( 0 ) { # manual packages don't need to be highlighted + $dispdate = "$dispdate !"; + } + $det .= "" . $dispdate . " | "; $det .= "" . $newdates{$datekey} . " | "; + my $dispdate = $newdates{$datekey}; + if ( ( $dispdate lt $warndate ) && ( $src =~ /Security/) ) { + $dispdate = "$dispdate !"; + } + $det .= "" . $dispdate . " | "; $det .= "\n"; } - $table .= "
$H \n"; + $table .= " | ||||
$H \n"; if ( $pkgs ) { $table .= "$pkgs packages to upgrade. "; $table .= "$secs security. " if $secs; @@ -270,6 +304,7 @@ for my $hline ( split("\n",$hostlist) ) { $updlink =~ s/Opencontent-solrUpdates/OpenContentSolrUpdates/; $updlinks{$H} = $updlink; $table .= " Upd"; + $table .= " " . $debversions{$H}; $table .= " | ||||
$hostcomments{$H} |