Merge lp:~thomir-deactivatedaccount/charms/trusty/tanuki-result-enum-api/trunk-revert-changes into lp:~tanuki/charms/trusty/tanuki-result-enum-api/trunk

[Thomi Richards]

Revert revnos 22..20.

Revert revnos 22..20.

[Samuele Pedroni (pedronis)]

approving

review: Approve

=== removed file 'files/check_upstart_status.pl'
--- files/check_upstart_status.pl	2015-09-28 01:17:48 +0000
+++ files/check_upstart_status.pl	1970-01-01 00:00:00 +0000
@@ -1,157 +0,0 @@
-#! /usr/bin/perl -w
-#
-#  check_upstart_status.pl
-#  by Jeremy Goldstein
-#
-#  This nagios check checks the status of upstart jobs
-#
-# Copyright (c) 2012 Jeremy Goldstein
-#
-# 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; either version 2 of the License, or
-# (at your option) any later version.
-#
-# 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-#
-#
-# 0 = ok
-# 1 = warn
-# 2 = crit
-# 3 = unknown
-
-#configurable options:
-my $debug = 0;
-
-# No changes below, unless you want to change exit codes
-use lib "/usr/lib/nagios/plugins";
-use Getopt::Std;
-use strict;
-use warnings;
-use utils qw( %ERRORS);
-
-%ERRORS=('OK'=>0,'WARNING'=>1,'CRITICAL'=>2,'UNKNOWN'=>3);
-my $exit_value = $ERRORS{'UNKNOWN'} ;
-
-my %options=();
-
-getopts("j:", \%options);
-
-if (scalar(keys(%options))<1 )
-{
-	show_usage();
-}
-
-my $jobName = $options{'j'};
-my $exit_value_human="";
-my $retval;
-my $goal;
-my $state;
-
-#Run command and get result
-my $cmd = "status $jobName";
-$retval = `$cmd`;
-
-#Get return code
-my $retnum = $?>>8;
-
-#Check return code to see if job was found
-if ($retnum > 0)
-{
-	$exit_value = $ERRORS{'UNKNOWN'};
-	$retval = 'Error - Job name may not have been found';
-}
-else
-{
-	#Remove trailing \n and replace with trailing comma as quick hack
-	$retval =~ s/\n/,/;
-
-	if ($retval =~ m/$jobName (.*)\/.*/)
-	{
-		$goal = $1;
-	}
-
-	if ($retval =~ m/.*\/(.*),/)
-	{
-		$state = $1;
-	}
-
-	if ($debug)
-	{
-		print "Command run: $cmd\n";
-		print "Result: $retval\n";
-	} 
-
-	if ($goal eq "stop")
-	{
-		$exit_value = $ERRORS{'CRITICAL'};
-	}
-	elsif ($state eq "pre-stop")
-	{
-		$exit_value = $ERRORS{'WARNING'};
-	}
-	elsif ($state eq "stopping")
-	{
-		$exit_value = $ERRORS{'WARNING'};
-	}
-	elsif ($state eq "killed")
-	{
-		$exit_value = $ERRORS{'WARNING'};
-	}
-	elsif ($state eq "post-stop")
-	{
-		$exit_value = $ERRORS{'WARNING'};
-	}
-	else
-	{
-		$exit_value = $ERRORS{'OK'};
-	}
-}
-
-if ($exit_value == 0)
-{
-	$exit_value_human = "OK";    
-}
-elsif ($exit_value == 1)
-{
-	$exit_value_human = "WARNING";    
-}
-elsif ($exit_value == 2)
-{
-	$exit_value_human = "CRITICAL";    
-}
-elsif ($exit_value == 3)
-{
-	$exit_value_human = "UNKNOWN";    
-}
-
-#Remove trailing comma hack
-$retval =~ s/,$//;
-
-print $retval . ". STATUS: $exit_value_human\n";
-exit $exit_value;
-		
-sub show_usage
-{
-	print "\n\n";
-	print "check_upstart_status.pl\n";
-	print "by Jeremy Goldstein\n";
-	print "\n";
-	print "This nagios check checks the status of upstart jobs\n";
-	print "and alerts when the job is not running.\n";
-	print "\n";
-	print "usage:\n";
-	print "./check_upstart_status.pl -j jobName\n";
-	print "\n";
-	print "-j jobName\t\t The name of the upstart job you want to check\n";
-	print "\n\n";
-
-	exit $exit_value;
-}

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-09-28 22:39:48 +0000
+++ hooks/actions.py	2015-10-06 00:44:59 +0000
@@ -2,8 +2,6 @@
 import configparser
 import os
 import os.path
-import shutil
-import stat
 import subprocess
 
 from charmhelpers import fetch
@@ -201,25 +199,12 @@
 
 def nrpe_external_master_relation(service_name):
     ''' Configure the nrpe-external-master relation '''
-    filename = 'check_upstart_status.pl'
-    src = os.path.join(
-        os.path.dirname(__file__),
-        '..',
-        'files',
-        filename
-    )
-    dst = os.path.join('/usr/lib/nagios/plugins', filename)
-    dst_dir = os.path.dirname(dst)
-    if not os.path.exists(dst_dir):
-        os.makedirs(dst_dir)
-    shutil.copy(src, dst)
-    os.chmod(dst, 0o755)
     nrpe_compat = nrpe.NRPE()
 
     nrpe_compat.add_check(
-        shortname="check_job_running",
-        description="Check that the upstart Job is running",
-        check_cmd="{} -j 'result-enum-api'".format(dst),
-    )
+        shortname="check_app_http",
+        description="App or app mongodb connection check",
+        check_cmd="/usr/lib/nagios/plugins/check_http -I 127.0.0.1 -p 8000 -e ' 200 OK' -u '/nagios/mongodb'",
+        )
 
     nrpe_compat.write()