Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/US307-network-map:9691
+ /branches/DEV-capside/release-3.9.0:6365-6370
/branches/DEV-extra-notification-data:6734-6746
/branches/DEV-odw-calculations:9016-9160
/branches/DEV-restapi-monitoringservers:9778
/branches/DEV-snmp-multi:7324-7376
/branches/US187:9403-9479
/branches/US198b:8875-8994
/branches/enterprise/BRAN-3.14:6874,6882,6956
/branches/enterprise/DEV-professional:6494-8475,8477-8478,8486,8490,8492,8494,8499-8500,8515,8518-8519,8524,8527-8529,8531-8532,8536,8538,8540-8544,8547-8552,8554,8557,8600-8601,8637,8749,8772,8897,8917,8944-8945,8947,8950-8952,8967,8969,8979,8982,8987,8998,9006,9008,9011,9013,9026,9033-9036,9038,9040,9042,9044,9048,9050-9053,9062,9064-9065,9069,9078,9081,9088,9096,9099-9101,9103,9105,9115,9118,9347,9353-9354,9411,9432,9445,9486,9538-9550,9569-9571,9620,9635,9637-9638,9645-9647
/branches/us168:8759,8762-8763,8766-8768,8770,8774-8777,8794,8798-8799,8801-8803,8821-8822,8834,8837-8838,8932,8937,8947,8969,8977,8981,9004,9007,9009-9010,9012,9024,9049
/commercial/branches/US307-network-map:9691
Modified: trunk/opsview-core/nagios-plugins/check_aws_ec2
===================================================================
--- trunk/opsview-core/nagios-plugins/check_aws_ec2 2012-08-09 12:51:52 UTC (rev 9779)
+++ trunk/opsview-core/nagios-plugins/check_aws_ec2 2012-08-09 12:55:37 UTC (rev 9780)
@@ -114,8 +114,11 @@
#print dump($running_instances{owner_id});
#API return error message as HASH if authorisation failed
-if ( $running_instances->isa('Net::Amazon::EC2::Errors') ) {
- $np->nagios_exit( UNKNOWN, "Authorisation failed - check access keys" );
+if ( ref($running_instances) eq 'Net::Amazon::EC2::Errors' ) {
+ $np->nagios_exit( UNKNOWN,
+ "Authorisation failed - check access keys: "
+ . $running_instances->{errors}->[0]->{message}
+ );
}
if ( !$np->opts->indexk ) {
my @index_list;
Modified: trunk/opsview-core/nagios-plugins/check_aws_ec2_instances
===================================================================
--- trunk/opsview-core/nagios-plugins/check_aws_ec2_instances 2012-08-09 12:51:52 UTC (rev 9779)
+++ trunk/opsview-core/nagios-plugins/check_aws_ec2_instances 2012-08-09 12:55:37 UTC (rev 9780)
@@ -93,8 +93,11 @@
}
#API return error message as HASH if authorisation failed
-if ( $running_instances->isa('Net::Amazon::EC2::Errors') ) {
- $np->nagios_exit( UNKNOWN, "Authorisation failed - check access keys" );
+if ( ref($running_instances) eq 'Net::Amazon::EC2::Errors' ) {
+ $np->nagios_exit( UNKNOWN,
+ "Authorisation failed - check access keys: "
+ . $running_instances->{errors}->[0]->{message}
+ );
}
my @index_list;
my @instance_details;
