Minor update that tunes some alert levels and bumps the release to 2.…

…0.2. Signed-off-by: Digimer <[email protected]>
ClusterLabs · Jul 9, 2017 · 3c5fd5d · 3c5fd5d
1 parent 1249a82
commit 3c5fd5d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/ScanCore/agents/scan-apc-pdu/scan-apc-pdu b/ScanCore/agents/scan-apc-pdu/scan-apc-pdu
@@ -995,12 +995,13 @@ WHERE
 					}
 					else
 					{
-						# It's rebooted. This is warning level
+						# It's rebooted. This is notice level as it's generally just 
+						# the NIC rebooting and doesn't interfere with power.
 						$an->Alert->register_alert({
-							alert_level		=>	"warning", 
+							alert_level		=>	"notice", 
 							alert_sort		=>	$an->data->{sys}{alert_sort}++,
 							alert_agent_name	=>	$THIS_FILE,
-							alert_title_key		=>	"an_alert_title_0008",
+							alert_title_key		=>	"an_alert_title_0003",
 							alert_message_key	=>	"scan_apc_pdu_message_0014",
 							alert_message_variables	=>	{
 								name			=>	$pdu_host_name,

diff --git a/ScanCore/agents/scan-storcli/scan-storcli b/ScanCore/agents/scan-storcli/scan-storcli
@@ -5904,8 +5904,8 @@ WHERE
 						# an alert from the start, but will only actually send if 
 						# something has changed.
 						my $message_key       = "scan_storcli_warning_0012";
-						my $alert_level       = "notice";
-						my $title_key         = "an_alert_title_0003";
+						my $alert_level       = "info";
+						my $title_key         = "an_alert_title_0002";
 						my $temperature_state = "ok";
 						my $temperature_is    = "nominal";
 						if ($type eq "temperature")

diff --git a/tools/anvil-generate-iso b/tools/anvil-generate-iso
@@ -151,7 +151,7 @@ my $conf = {
 			release		=>	"6.8",
 			suffix		=>	"",
 			mark		=>	"m2",
-			version		=>	"2.0.1",
+			version		=>	"2.0.2",
 		},
 		# This is will be set to '1' if the source ISO is not mounted.
 		use_isoread	=>	0,
@@ -205,7 +205,7 @@ my $conf = {
 		# access that file, we'll use 'striker_default'. Optionally, the user can request the latest
 		# master with '--master', in which case we will download the 'striker_master' URL. In all
 		# cases, the downloaded file will be saved as 'striker_zip_file'.
-		striker_default	=>	"https://github.com/ClusterLabs/striker/archive/v2.0.1.zip",
+		striker_default	=>	"https://github.com/ClusterLabs/striker/archive/v2.0.2.zip",
 		striker_latest	=>	"https://www.alteeve.com/an-repo/striker_latest.txt",
 		striker_master	=>	"https://codeload.github.com/ClusterLabs/striker/zip/master",
 		striker_zip_file =>	"striker.zip",

diff --git a/tools/striker-update b/tools/striker-update
@@ -138,7 +138,7 @@ my $an = AN::Tools->new({
 			# access that file, we'll use 'striker_default'. Optionally, the user can request the latest
 			# master with '--master', in which case we will download the 'striker_master' URL. In all
 			# cases, the downloaded file will be saved as 'striker_zip_file'.
-			striker_default		=>	"https://github.com/ClusterLabs/striker/archive/v2.0.1.zip",
+			striker_default		=>	"https://github.com/ClusterLabs/striker/archive/v2.0.2.zip",
 			striker_latest		=>	"https://www.alteeve.com/an-repo/striker_latest.txt",
 			striker_master		=>	"https://codeload.github.com/ClusterLabs/striker/zip/master",
 			support			=>	"https://alteeve.com/w/Support",
@@ -4062,7 +4062,6 @@ sub rsync_data
 		name2 => "destination", value2 => $destination, 
 	}, file => $THIS_FILE, line => __LINE__});
 
-	#rsync -av striker-update/temp/striker-2.0.0b-rc8/* striker-update/source
 	my $copy_count = 0;
 	my $shell_call = $an->data->{path}{rsync}." -avAX $source $destination";
 	$an->Log->entry({log_level => 2, message_key => "an_variables_0001", message_variables => {