[Qa-jenkins-scm] [jenkins.debian.net] 04/05: remove local copy of the munin_stats plugin, as the bug it meant to fix is fixed in debian proper now

Mattia Rizzolo mattia at debian.org
Sat Apr 7 19:26:09 UTC 2018


This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository jenkins.debian.net.

commit 6a361cadfe38442bf9cb90d252faa8bb7b6fc032
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Sat Apr 7 21:18:19 2018 +0200

    remove local copy of the munin_stats plugin, as the bug it meant to fix is fixed in debian proper now
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 TODO                                        |   1 -
 hosts/jenkins/etc/munin/plugins/munin_stats | 112 ----------------------------
 2 files changed, 113 deletions(-)

diff --git a/TODO b/TODO
index 7251beb..f574e47 100644
--- a/TODO
+++ b/TODO
@@ -80,7 +80,6 @@ See link:https://jenkins.debian.net/userContent/about.html["about jenkins.debian
 
 === To be done once bugs are fixed
 
-* link:https://bugs.debian.org/767032[#767032] manual fix in etc/munin/plugins/munin_stats
 * link:https://bugs.debian.org/767100[#767100] work in progress in etc/munin/plugins/cpu
 * link:https://bugs.debian.org/767018[#767018] work in progress in etc/munin/plugins/iostat_ios
 * link:https://bugs.debian.org/774685[#774685] workaround in bin/reproducible_create_meta_pkg_sets.sh
diff --git a/hosts/jenkins/etc/munin/plugins/munin_stats b/hosts/jenkins/etc/munin/plugins/munin_stats
deleted file mode 100755
index 8c7c82a..0000000
--- a/hosts/jenkins/etc/munin/plugins/munin_stats
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/usr/bin/perl
-# -*- perl -*-
-# Copyright (C) 2006-2009 Rodolphe Quiedeville <rodolphe at quiedeville.org>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; version 2 dated June,
-# 1991.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# $Id$
-#
-# Magic markers (used by munin-node-configure and some installation scripts):
-#%# family=auto
-#%# capabilities=autoconf
-
-use strict;
-use warnings;
-
-use Munin::Plugin;
-
-my @logs = qw/update html limits/;
-use Munin::Master::GraphOld;
-my $conffile = "$Munin::Common::Defaults::MUNIN_CONFDIR/munin.conf";
-if (! graph_check_cron() ) {
-    push  (@logs, "graph");
-}
-
-my $logdir = ($ENV{'logdir'} || $ENV{'MUNIN_LOGDIR'} || '/var/log/munin');
-
-if ($ARGV[0] and $ARGV[0] eq 'autoconf') {
-    my $munin_update_location = 
-                "$Munin::Common::Defaults::MUNIN_LIBDIR/munin-update";
-
-    if (! -e $munin_update_location) {
-        print "no (munin-update was not found at $munin_update_location)\n";
-        exit 0;
-   }
-
-   if (! -x $munin_update_location) {
-        print "no ($munin_update_location was found, but is not executable)\n";
-        exit 0;
-   } 
-   else {
-        print "yes\n";
-        exit 0;
-   }
-}
-
-if ($ARGV[0] and $ARGV[0] eq "config") {
-    print "graph_title Munin processing time\n";
-    if (! graph_check_cron() ) {
-        print  "graph_info This graph shows the run time of the four different processes making up a munin-master run.  Munin-master is run from cron every 5 minutes and we want each of the programmes in munin-master to complete before the next instance starts.  Especially munin-update and munin-graph are time consuming and their run time bears watching. If munin-update uses too long time to run please see the munin-update graph to determine which host is slowing it down.  If munin-graph [...]
-    } else {
-        print  "graph_info This graph shows the run time of the thre different processes making up a munin-master run.  Munin-master is run from cron every 5 minutes and we want each of the programmes in munin-master to complete before the next instance starts.  Especially munin-update is time consuming and its run time bears watching. If munin-update uses too long time to run please see the munin-update graph to determine which host is slowing it down.\n";
-    }
-    print "graph_args --base 1000 -l 0\n",
-          "graph_scale yes\n",
-          "graph_vlabel seconds\n",
-          "graph_category munin\n";
-    foreach my $log (@logs) {
-        print "$log.label munin $log\n";
-        print "$log.draw AREASTACK\n";
-    }
-    print "update.warning 240\n";
-    print "update.critical 285\n";
-    if (! graph_check_cron() ) {
-        print "graph.warning 240\n";
-        print "graph.critical 285\n";
-    }
-    exit 0;
-}
-
-my %positions = restore_state();
-my %times;
-
-foreach my $log (@logs) {
-    my $logfile = "$logdir/munin-$log.log";
-    my $time = 'U';
-
-    if (! -r $logfile) {
-        print "$log.extinfo Can't open $logfile for reading\n";
-        print "$log.value $time\n";
-        next;
-    }
-
-    if (exists $positions{$log}) {
-        my ($LOGFILE, undef) = tail_open($logfile, $positions{$log});
-        while (<$LOGFILE>) {
-                $time = $1 if (/finished \((\d+\.\d+)\ssec\)$/);
-        }
-        $positions{$log} = tail_close($LOGFILE);
-    }
-    else {
-        # Do nothing on first run except find the current file end.
-        $positions{$log} = (stat $logfile)[7];
-    }
-
-    print "$log.value $time\n";
-}
-
-save_state(%positions);
-
-# vim: ft=perl : ts=4 : expandtab

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git



More information about the Qa-jenkins-scm mailing list