Index: trunk/ippMonitor/raw/czartool_labels.php
===================================================================
--- trunk/ippMonitor/raw/czartool_labels.php	(revision 41677)
+++ trunk/ippMonitor/raw/czartool_labels.php	(revision 41678)
@@ -278,13 +278,17 @@
 createTableColumnHeader("Database");
 createTableColumnHeader("Status (sec behind master)");
-showDatabaseStatus($HOST_GPC1, $USER_GPC1, $PASSWORD_GPC1, $DBNAME_GPC1);
-showReplicationsStatus($REPL_HOST_GPC1, $REPL_USER_GPC1, $REPL_PASSWORD_GPC1, $REPL_DBNAME_GPC1);
-showReplicationsStatus($REPL_HOST_GPC1_SECONDARY, $REPL_USER_GPC1_SECONDARY, $REPL_PASSWORD_GPC1_SECONDARY, $REPL_DBNAME_GPC1_SECONDARY);
-showReplicationsStatus($REPL_HOST_GPC1_THIRD, $REPL_USER_GPC1_THIRD, $REPL_PASSWORD_GPC1_THIRD, $REPL_DBNAME_GPC1_THIRD);
-showDatabaseStatus($HOST_NEBULOUS, $USER_NEBULOUS, $PASSWORD_NEBULOUS, $DBNAME_NEBULOUS);
-showReplicationsStatus($REPL_HOST_NEBULOUS_SECONDARY, $REPL_USER_NEBULOUS_SECONDARY, $REPL_PASSWORD_NEBULOUS_SECONDARY, $REPL_DBNAME_NEBULOUS_SECONDARY);
-showReplicationsStatus($REPL_HOST_NEBULOUS_THIRD, $REPL_USER_NEBULOUS_THIRD, $REPL_PASSWORD_NEBULOUS_THIRD, $REPL_DBNAME_NEBULOUS_THIRD);
-showReplicationsStatus($REPL_HOST_NEBULOUS_FOURTH, $REPL_USER_NEBULOUS_FOURTH, $REPL_PASSWORD_NEBULOUS_FOURTH, $REPL_DBNAME_NEBULOUS_FOURTH);
-showReplicationsStatus($REPL_HOST_DATASTORE_SECONDARY, $REPL_USER_DATASTORE_SECONDARY, $REPL_PASSWORD_DATASTORE_SECONDARY, $REPL_DBNAME_DATASTORE_SECONDARY);
+// gpc dbs
+showDatabaseStatus($HOST_GPC1, $USER_GPC1, $PASSWORD_GPC1, $LABEL_GPC1);
+showReplicationsStatus($REPL_HOST_GPC1, $REPL_USER_GPC1, $REPL_PASSWORD_GPC1, $REPL_LABEL_GPC1);
+showReplicationsStatus($REPL_HOST_GPC1_SECONDARY, $REPL_USER_GPC1_SECONDARY, $REPL_PASSWORD_GPC1_SECONDARY, $REPL_LABEL_GPC1_SECONDARY);
+showReplicationsStatus($REPL_HOST_GPC1_TERTIARY, $REPL_USER_GPC1_TERTIARY, $REPL_PASSWORD_GPC1_TERTIARY, $REPL_LABEL_GPC1_TERTIARY);
+// nebulous dbs
+showDatabaseStatus($HOST_NEBULOUS, $USER_NEBULOUS, $PASSWORD_NEBULOUS, $LABEL_NEBULOUS);
+showReplicationsStatus($REPL_HOST_NEBULOUS, $REPL_USER_NEBULOUS, $REPL_PASSWORD_NEBULOUS, $REPL_LABEL_NEBULOUS);
+showReplicationsStatus($REPL_HOST_NEBULOUS_SECONDARY, $REPL_USER_NEBULOUS_SECONDARY, $REPL_PASSWORD_NEBULOUS_SECONDARY, $REPL_LABEL_NEBULOUS_SECONDARY);
+showReplicationsStatus($REPL_HOST_NEBULOUS_TERTIARY, $REPL_USER_NEBULOUS_TERTIARY, $REPL_PASSWORD_NEBULOUS_TERTIARY, $REPL_LABEL_NEBULOUS_TERTIARY);
+// other dbs
+showDatabaseStatus($HOST_PSTAMP, $USER_PSTAMP, $PASSWORD_PSTAMP, $LABEL_PSTAMP);
+showReplicationsStatus($REPL_HOST_DATASTORE, $REPL_USER_DATASTORE, $REPL_PASSWORD_DATASTORE, $REPL_LABEL_DATASTORE);
 
 // timer finished
@@ -316,19 +320,21 @@
 createTableColumnHeader("Status");
 createTableColumnHeader("Loading time");
-showPingStatus($HOST_GATEWAY, $DBNAME_GATEWAY);
-showPingStatus($HOST_GATEWAY_SECONDARY, $DBNAME_GATEWAY_SECONDARY);
-showPingStatus($HOST_NAGIOS, $DBNAME_NAGIOS);
-showPingStatus($HOST_HOME, $DBNAME_HOME);
-showPingStatus($HOST_APACHE1, $DBNAME_APACHE1);
-showPingStatus($HOST_APACHE2, $DBNAME_APACHE2);
-showPingStatus($HOST_APACHE3, $DBNAME_APACHE3);
-showPingStatus($HOST_APACHE4, $DBNAME_APACHE4);
-showPingStatus($HOST_APACHE5, $DBNAME_APACHE5);
-showPingStatus($HOST_APACHE6, $DBNAME_APACHE6);
-showPingStatus($HOST_APACHE7, $DBNAME_APACHE7);
-showPingStatus($HOST_APACHE8, $DBNAME_APACHE8);
-showPingStatus($HOST_PROXY, $DBNAME_PROXY);
-showPingStatus($HOST_SVN, $DBNAME_SVN);
-showPingStatus($HOST_CONFLUENCE, $DBNAME_CONFLUENCE);
+showPingStatus($HOST_GATEWAY, $LABEL_GATEWAY);
+showPingStatus($HOST_GATEWAY_SECONDARY, $LABEL_GATEWAY_SECONDARY);
+showPingStatus($HOST_PROXY, $LABEL_PROXY);
+showPingStatus($HOST_APACHE1, $LABEL_APACHE1);
+showPingStatus($HOST_APACHE2, $LABEL_APACHE2);
+showPingStatus($HOST_APACHE3, $LABEL_APACHE3);
+showPingStatus($HOST_APACHE4, $LABEL_APACHE4);
+showPingStatus($HOST_APACHE5, $LABEL_APACHE5);
+showPingStatus($HOST_APACHE6, $LABEL_APACHE6);
+showPingStatus($HOST_APACHE_BACKUP1, $LABEL_APACHE_BACKUP1);
+showPingStatus($HOST_APACHE_BACKUP2, $LABEL_APACHE_BACKUP2);
+showPingStatus($HOST_HOME, $LABEL_HOME);
+showPingStatus($HOST_HOME_BACKUP, $LABEL_HOME_BACKUP);
+showPingStatus($HOST_NAGIOS, $LABEL_NAGIOS);
+showPingStatus($HOST_SVN, $LABEL_SVN);
+showPingStatus($HOST_CONFLUENCE, $LABEL_CONFLUENCE);
+showPingStatus($HOST_MAILMAN, $LABEL_MAILMAN);
 //  echo "<td>ippc70 (apache node) <td> $PingStatus <td> 0 seconds ";  // comment out if ippc70 is back
 // timer finished