* Fixed several display issues in scan-storcli.

* Updated anvil-generate-iso to pull tc4. Signed-off-by: Digimer <[email protected]>
ClusterLabs · Oct 7, 2016 · 06436c0 · 06436c0
1 parent 63ee24e
commit 06436c0
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 22 deletions.
diff --git a/ScanCore/agents/scan-clustat/scan-clustat.xml b/ScanCore/agents/scan-clustat/scan-clustat.xml
@@ -25,7 +25,7 @@ all strings with 'scan_clustat_'.
 		<key name="scan_clustat_note_0003">It appears that the server: [#!variable!service!#] was deleted.</key>
 		<key name="scan_clustat_note_0004">The new node: [#!variable!node!#] has appeared.</key>
 		<key name="scan_clustat_note_0005">It looks like 'rgmanager' (the cluster's resource manager) was stopped on the node: [#!variable!node!#]. It is still an #!string!brand_0004!# member, but it can no longer recover lost servers.</key>
-		<key name="scan_clustat_note_0006">The node has joined the cluster: [#!variable!cluster!#].</key>
+		<key name="scan_clustat_note_0006">The node has joined the cluster stack: [#!variable!cluster!#].</key>
 		<key name="scan_clustat_note_0007">The cluster manager was stopped on the node: [#!variable!node!#]. The node is no longer participating in the #!string!brand_0004!#.</key>
 		<key name="scan_clustat_note_0008">The node: [#!variable!node!#] has rejoined the #!string!brand_0004!#, but it is not yet able to take over lost servers. It should be ready in the next minute or so.</key>
 		<key name="scan_clustat_note_0009">The node: [#!variable!node!#] is now a full member of #!string!brand_0004!#. As soon as its storage is 'UpToDate', it will be ready to take over servers.</key>

diff --git a/ScanCore/agents/scan-storcli/scan-storcli b/ScanCore/agents/scan-storcli/scan-storcli
@@ -2865,8 +2865,6 @@ sub process_physical_disks
 	foreach my $storcli_physical_drive_uuid (keys %{$an->data->{sql}{storcli_physical_drives}{storcli_physical_drive_uuid}})
 	{
 		# Physical Disk vanished!
-		die "$THIS_FILE ".__LINE__."; sql::storcli_physical_drives::storcli_physical_drive_uuid::${storcli_physical_drive_uuid}::storcli_physical_drive_model is not defined!\n" if not defined $an->data->{sql}{storcli_physical_drives}{storcli_physical_drive_uuid}{$storcli_physical_drive_uuid}{storcli_physical_drive_model};
-
 		my $old_physical_disk_serial_number = $an->data->{sql}{storcli_physical_drives}{storcli_physical_drive_uuid}{$storcli_physical_drive_uuid}{storcli_physical_drive_serial_number};
 		my $old_controller_uuid             = $an->data->{sql}{storcli_physical_drives}{storcli_physical_drive_uuid}{$storcli_physical_drive_uuid}{storcli_physical_drive_controller_uuid};
 		my $old_model                       = $an->data->{sql}{storcli_physical_drives}{storcli_physical_drive_uuid}{$storcli_physical_drive_uuid}{storcli_physical_drive_model};
@@ -2895,7 +2893,7 @@ sub process_physical_disks
 			alert_sort		=>	$an->data->{sys}{alert_sort},
 			alert_header		=>	"TRUE",
 			alert_title_key		=>	"an_alert_title_0004",
-			alert_message_key	=>	"scan_storcli_warning_0016",
+			alert_message_key	=>	"scan_storcli_warning_0035",
 			alert_message_variables	=>	{
 				physical_disk_serial_number =>	$old_physical_disk_serial_number, 
 				controller_serial_number =>	$old_controller_serial_number, 
@@ -5155,7 +5153,7 @@ INSERT INTO
 						alert_title_key		=>	"an_alert_title_0004",
 						alert_message_key	=>	"scan_storcli_warning_0040",
 						alert_message_variables	=>	{
-							controller		=>	$cachevault_serial_number,
+							serial_number		=>	$cachevault_serial_number,
 							name			=>	$variable,
 						},
 					});
@@ -5217,7 +5215,7 @@ WHERE
 			alert_sort		=>	$an->data->{sys}{alert_sort},
 			alert_header		=>	"TRUE",
 			alert_title_key		=>	"an_alert_title_0004",
-			alert_message_key	=>	"cachevault_serial_number",
+			alert_message_key	=>	"scan_storcli_warning_0042",
 			alert_message_variables	=>	{
 				cachevault_serial_number =>	$old_cachevault_serial_number, 
 				controller_serial_number =>	$old_controller_serial_number, 
@@ -6364,9 +6362,9 @@ INSERT INTO
 						alert_sort		=>	$an->data->{sys}{alert_sort},
 						alert_header		=>	$main_table_changed ? "FALSE" : "TRUE",
 						alert_title_key		=>	"an_alert_title_0004",
-						alert_message_key	=>	"scan_storcli_warning_0007",
+						alert_message_key	=>	"scan_storcli_warning_0014",
 						alert_message_variables	=>	{
-							controller		=>	$bbu_serial_number,
+							serial_number		=>	$bbu_serial_number,
 							name			=>	$variable,
 						},
 					});
@@ -7431,7 +7429,7 @@ AND
 								alert_title_key		=>	$title_key,
 								alert_message_key	=>	$message_key,
 								alert_message_variables	=>	{
-									controller		=>	$serial_number,
+									serial_number		=>	$serial_number,
 									name			=>	$variable,
 									old_value		=>	$old_variable_value ? $old_variable_value : "--",
 									new_value		=>	$new_variable_value,
@@ -7546,7 +7544,7 @@ INSERT INTO
 						alert_title_key		=>	"an_alert_title_0004",
 						alert_message_key	=>	"scan_storcli_warning_0007",
 						alert_message_variables	=>	{
-							controller		=>	$serial_number,
+							serial_number		=>	$serial_number,
 							name			=>	$variable,
 						},
 					});

diff --git a/ScanCore/agents/scan-storcli/scan-storcli.xml b/ScanCore/agents/scan-storcli/scan-storcli.xml
@@ -326,7 +326,7 @@ The temperature of the Battery Backup Unit (BBU): [#!variable!serial_number!#] h
 		<key name="scan_storcli_note_0064">- The temperature of the physical drive: [#!variable!serial_number!#] has changed: [#!variable!old_value!# °C] -> [#!variable!new_value!# °C]</key>
 		<key name="scan_storcli_note_0065">- The temperature of the Cachevault (FBU): [#!variable!serial_number!#] has changed: [#!variable!old_value!# °C] -> [#!variable!new_value!# °C]</key>
 		<key name="scan_storcli_note_0066">- The temperature of the BBU: [#!variable!serial_number!#] has changed: [#!variable!old_value!# °C] -> [#!variable!new_value!# °C]</key>
-		<key name="scan_storcli_note_0067">- The temperature of the controller: [#!variable!controller!#] has changed: [#!variable!old_value!# °C] -> [#!variable!new_value!# °C]</key>
+		<key name="scan_storcli_note_0067">- The temperature of the controller: [#!variable!serial_number!#] has changed: [#!variable!old_value!# °C] -> [#!variable!new_value!# °C]</key>
 
 
 		<!-- Warnings -->
@@ -337,11 +337,11 @@ The temperature of the Battery Backup Unit (BBU): [#!variable!serial_number!#] h
 - Cache Size: .. [#!variable!old_say_cache_size!#] -> [#!variable!new_say_cache_size!#]
 - Alarm State: . [#!variable!old_alarm_state!#] -> [#!variable!new_alarm_state!#]
 </key>
-		<key name="scan_storcli_warning_0003">- Controller: [#!variable!controller!#]: '#!variable!name!#' changed: [#!variable!old_value!#] -> [#!variable!new_value!#]</key>
-		<key name="scan_storcli_warning_0004">- Controller: [#!variable!controller!#]: New variable found; #!variable!name!#: [#!variable!value!#]</key>
-		<key name="scan_storcli_warning_0005">- Controller: [#!variable!controller!#]: Old variable lost; #!variable!name!#: [#!variable!old_value!#]</key>
-		<key name="scan_storcli_warning_0006">- Controller: [#!variable!controller!#]: '#!variable!name!#' has returned: [#!variable!new_value!#]</key>
-		<key name="scan_storcli_warning_0007">- Controller: [#!variable!controller!#]: '#!variable!name!#' has vanished!</key>
+		<key name="scan_storcli_warning_0003">- Controller: [#!variable!serial_number!#]: '#!variable!name!#' changed: [#!variable!old_value!#] -> [#!variable!new_value!#]</key>
+		<key name="scan_storcli_warning_0004">- Controller: [#!variable!serial_number!#]: New variable found; #!variable!name!#: [#!variable!value!#]</key>
+		<key name="scan_storcli_warning_0005">- Controller: [#!variable!serial_number!#]: Old variable lost; #!variable!name!#: [#!variable!old_value!#]</key>
+		<key name="scan_storcli_warning_0006">- Controller: [#!variable!serial_number!#]: '#!variable!name!#' has returned: [#!variable!new_value!#]</key>
+		<key name="scan_storcli_warning_0007">- Controller: [#!variable!serial_number!#]: '#!variable!name!#' has vanished!</key>
 		<key name="scan_storcli_warning_0008">The controller: [#!variable!model!#] with the serial number: [#!variable!serial_number!#] has vanished!</key>
 		<key name="scan_storcli_warning_0009">The RAID controller has returned:
 - Model: ....... [#!variable!new_model!#]
@@ -373,7 +373,7 @@ The temperature of the Battery Backup Unit (BBU): [#!variable!serial_number!#] h
 		<key name="scan_storcli_warning_0013">- The BBU: [#!variable!serial_number!#]: '#!variable!name!#' has returned: [#!variable!new_value!#]</key>
 		<key name="scan_storcli_warning_0014">- The BBU: [#!variable!serial_number!#]: '#!variable!name!#' has vanished!</key>
 		<key name="scan_storcli_warning_0015">- A new variable was found on the BBU: [#!variable!serial_number!#]; #!variable!name!#: [#!variable!value!#]</key>
-		<key name="scan_storcli_warning_0016">- The BBU: [#!variable!bbu_serial_number!#]; on the RAID controller: [#!variable!controller_serial_number!#] has vanished!</key>
+		<key name="scan_storcli_warning_0016">- The BBU: [#!variable!bbu_serial_number!#] on the RAID controller: [#!variable!controller_serial_number!#] has vanished!</key>
 		<key name="scan_storcli_warning_0017">The RAID controller's Virtual Drive (VD) properties have changed:
 - On Controller: .... [#!variable!old_on_controller!#] -> [#!variable!new_on_controller!#]
 - ID String: ........ [#!variable!old_id_string!#] -> [#!variable!new_id_string!#]
@@ -406,7 +406,7 @@ The temperature of the Battery Backup Unit (BBU): [#!variable!serial_number!#] h
 		<key name="scan_storcli_warning_0020">- The Virtual Drive: [#!variable!id_string!#]: '#!variable!name!#' has returned: [#!variable!new_value!#]</key>
 		<key name="scan_storcli_warning_0021">- The Virtual Drive: [#!variable!id_string!#]: '#!variable!name!#' has vanished!</key>
 		<key name="scan_storcli_warning_0022">- A new variable was found on the Virtual Drive: [#!variable!id_string!#]; #!variable!name!#: [#!variable!value!#]</key>
-		<key name="scan_storcli_warning_0023">The Virtual Drive: [#!variable!id_string!#]; on the RAID controller: [#!variable!controller_serial_number!#] has vanished!</key>
+		<key name="scan_storcli_warning_0023">The Virtual Drive: [#!variable!id_string!#] on the RAID controller: [#!variable!controller_serial_number!#] has vanished!</key>
 		<key name="scan_storcli_warning_0024">The RAID controller's Drive Group (DG) properties have changed:
 - ID String: ................. [#!variable!old_id_string!#] -> [#!variable!new_id_string!#]
 - Access: .................... [#!variable!old_access!#] -> [#!variable!new_access!#]
@@ -464,7 +464,7 @@ The temperature of the Battery Backup Unit (BBU): [#!variable!serial_number!#] h
 		<key name="scan_storcli_warning_0032">- The Physical Drive (PD): [#!variable!serial_number!#]: '#!variable!name!#' has returned: [#!variable!new_value!#]</key>
 		<key name="scan_storcli_warning_0033">- A new variable was found on the Physical Drive (PD): [#!variable!serial_number!#]; #!variable!name!#: [#!variable!value!#]</key>
 		<key name="scan_storcli_warning_0034">- Physical Drive: [#!variable!serial_number!#]: '#!variable!name!#' has vanished!</key>
-		<key name="scan_storcli_warning_0035">- The Physical Drive: [#!variable!physical_disk_serial_number!#]; on the RAID controller: [#!variable!controller_serial_number!#] has vanished!</key>
+		<key name="scan_storcli_warning_0035">- The Physical Drive: [#!variable!physical_disk_serial_number!#] on the RAID controller: [#!variable!controller_serial_number!#] has vanished!</key>
 		<key name="scan_storcli_warning_0036">The RAID controller's Cachevault (FBU) properties have changed:
 - On Controller: .... [#!variable!old_on_controller!#] -> [#!variable!new_on_controller!#]
 - Model: ............ [#!variable!old_model!#] -> [#!variable!new_model!#]
@@ -489,8 +489,8 @@ The temperature of the Battery Backup Unit (BBU): [#!variable!serial_number!#] h
 		<key name="scan_storcli_warning_0039">- The Cachevault (FBU): [#!variable!serial_number!#]: '#!variable!name!#' has returned: [#!variable!new_value!#]</key>
 		<key name="scan_storcli_warning_0040">- The Cachevault (FBU): [#!variable!serial_number!#]: '#!variable!name!#' has vanished!</key>
 		<key name="scan_storcli_warning_0041">- A new variable was found on the Cachevault (FBU): [#!variable!serial_number!#]; #!variable!name!#: [#!variable!value!#]</key>
-		<key name="scan_storcli_warning_0042">- The Cachevault (FBU): [#!variable!cachevault_serial_number!#]; on the RAID controller: [#!variable!controller_serial_number!#] has vanished!</key>
-		<key name="scan_storcli_warning_0043">- The Cachevault (FBU): [#!variable!cachevault_serial_number!#]; on the RAID controller: [#!variable!controller_serial_number!#] has vanished!</key>
+		<key name="scan_storcli_warning_0042">- The Cachevault (FBU): [#!variable!cachevault_serial_number!#] on the RAID controller: [#!variable!controller_serial_number!#] has vanished!</key>
+		<key name="scan_storcli_warning_0043">- The Cachevault (FBU): [#!variable!cachevault_serial_number!#] on the RAID controller: [#!variable!controller_serial_number!#] has vanished!</key>
 		<key name="scan_storcli_warning_0044">
 - The Physical Drive (PD): [#!variable!serial_number!#]: '#!variable!name!#' changed: [#!variable!old_value!#] -> [#!variable!new_value!#]
   If this ticks up by '1', and this hasn't changed recently before, it is generally safe to ignore. 

diff --git a/tools/anvil-generate-iso b/tools/anvil-generate-iso
@@ -209,7 +209,7 @@ my $conf = {
 		# git 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		=>	"https://github.com/ClusterLabs/striker.git",
-		striker_default	=>	"https://github.com/ClusterLabs/striker/archive/2.0.0b-tc3.zip",
+		striker_default	=>	"https://github.com/ClusterLabs/striker/archive/2.0.0b-tc4.zip",
 		striker_latest	=>	"https://alteeve.ca/striker_latest.txt",
 		striker_master	=>	"https://codeload.github.com/ClusterLabs/striker/zip/master",
 		striker_zip_file =>	"striker.zip",