1 files changed, 77 insertions, 17 deletions

diff --git a/contrib/nagios_blocker_checker.pl b/contrib/nagios_blocker_checker.pl
index bbc08b629..0e292c8c9 100755
--- a/contrib/nagios_blocker_checker.pl
+++ b/contrib/nagios_blocker_checker.pl
@@ -16,35 +16,95 @@ use lib "$Bin/../lib";
 
 use Bugzilla;
 use Bugzilla::Constants;
-use Bugzilla::User qw(login_to_id);
+use Bugzilla::Product;
+use Bugzilla::User;
+use Getopt::Long;
 
 Bugzilla->usage_mode(USAGE_MODE_CMDLINE);
 
-# Time in hours to wait before paging/warning
 
-use constant ALERT_TIMES => {
-    'major.alarm'       => 24,
-    'major.warn'        => 20,
-    'critical.alarm'    => 8,
-    'critical.warn'     => 5,
-    'blocker.alarm'     => 0,
-    'blocker.warn'      => 0,
+my $config = {
+    # Filter by assignee or product
+    assignee        => '',
+    product         => '',
+    unassigned      => 'nobody@mozilla.org',
+    # Time in hours to wait before paging/warning
+    major_alarm     => 24,
+    major_warn      => 20,
+    critical_alarm  => 8,
+    critical_warn   => 5,
+    blocker_alarm   => 0,
+    blocker_warn    => 0,
 };
 
+my $usage = <<EOF;
+FILTERS
+
+  the filter determines which bugs to check, either by assignee or product.
+  for backward compatibility, if just an email address is provided, it will be
+  used as the assignee.
+
+  --assignee <email>    filter bugs by assignee
+  --product <name>      filter bugs by product name
+  --unassigned <email>  set the unassigned user (default: $config->{unassigned})
+
+TIMING
+
+  time in hours to wait before paging or warning
+
+  --major_alarm <hours> (default: $config->{major_alarm})
+  --major_warn  <hours> (default: $config->{major_warn})
+  --critical_alarm <hours> (default: $config->{critical_alarm})
+  --critical_warn  <hours> (default: $config->{critical_warn})
+  --blocker_alarm <hours> (default: $config->{blocker_alarm})
+  --blocker_warn  <hours> (default: $config->{blocker_warn})
+
+EXAMPLES
+
+  nagios_blocker_checker.pl --assignee server-ops\@mozilla-org.bugs
+  nagios_blocker_checker.pl server-ops\@mozilla-org.bugs
+  nagios_blocker_checker.pl --product 'mozilla developer network'
+EOF
+
+die($usage) unless GetOptions(
+    'assignee=s'        => \$config->{assignee},
+    'product=s'         => \$config->{product},
+    'major_alarm=i'     => \$config->{major_alarm},
+    'major_warn=i'      => \$config->{major_warn},
+    'critical_alarm=i'  => \$config->{critical_alarm},
+    'critical_warn=i'   => \$config->{critical_warn},
+    'blocker_alarm=i'   => \$config->{blocker_alarm},
+    'blocker_warn=i'    => \$config->{blocker_warn},
+    'help|?'            => \$config->{help},
+);
+$config->{assignee} = $ARGV[0] if !$config->{assignee} && @ARGV;
+die $usage if
+    $config->{help}
+    || !($config->{assignee} || $config->{product})
+    || ($config->{assignee} && $config->{product});
+
+#
+
 use constant NAGIOS_OK          => 0;
 use constant NAGIOS_WARNING     => 1;
 use constant NAGIOS_CRITICAL    => 2;
 use constant NAGIOS_NAMES       => [qw( OK WARNING CRITICAL )];
 
-my $assignee = shift
-    || die "Syntax: $0 assignee\neg.  $0 server-ops\@mozilla-org.bugs\n";
-login_to_id($assignee, 1);
+my($where, @values);
+
+if ($config->{assignee}) {
+    $where = 'bugs.assigned_to = ?';
+    push @values, Bugzilla::User->check({ name => $config->{assignee} })->id;
+} else {
+    $where = 'bugs.product_id = ? AND bugs.assigned_to = ?';
+    push @values, Bugzilla::Product->check({ name => $config->{product} })->id;
+    push @values, Bugzilla::User->check({ name => $config->{unassigned} })->id;
+}
 
 my $sql = <<EOF;
     SELECT bug_id, bug_severity, UNIX_TIMESTAMP(bugs.creation_ts) AS ts
       FROM bugs
-           INNER JOIN profiles map_assigned_to ON bugs.assigned_to = map_assigned_to.userid
-     WHERE map_assigned_to.login_name = ?
+     WHERE $where
            AND COALESCE(resolution, '') = ''
            AND bug_severity IN ('blocker', 'critical', 'major')
 EOF
@@ -58,15 +118,15 @@ my $current_state = NAGIOS_OK;
 my $current_time = time;
 
 my $dbh = Bugzilla->switch_to_shadow_db;
-foreach my $bug (@{ $dbh->selectall_arrayref($sql, { Slice => {} }, $assignee) }) {
+foreach my $bug (@{ $dbh->selectall_arrayref($sql, { Slice => {} }, @values) }) {
     my $severity = $bug->{bug_severity};
     my $age = ($current_time - $bug->{ts}) / 3600;
 
-    if ($age > ALERT_TIMES->{"$severity.alarm"}) {
+    if ($age > $config->{"${severity}_alarm"}) {
         $current_state = NAGIOS_CRITICAL;
         push @{$bugs->{$severity}}, "https://bugzil.la/" . $bug->{bug_id};
 
-    } elsif ($age > ALERT_TIMES->{"$severity.warn"}) {
+    } elsif ($age > $config->{"${severity}_warn"}) {
         if ($current_state < NAGIOS_WARNING) {
             $current_state = NAGIOS_WARNING;
         }