The monitor now supports OpenVZ-Hosts and OpenVZ-VE's

Author: vogelor

interface/web/monitor/lib/lang/de.lng

@@ -40,6 +40,7 @@ $wb['Show Clamav-Log'] = 'Clamav-Protokoll anzeigen';
 $wb['Show ISPConfig-Log'] = 'ISPConfig-Protokoll anzeigen';
 $wb['Show RKHunter-Log'] = 'RKHunter-Protokoll anzeigen';
 $wb['Show Jobqueue'] = 'Jobwarteschlange anzeigen';
+$wb['Show OpenVz VE BeanCounter'] = 'OpenVz VE Beancounter anzeigen';
 $wb['Show ISPC Cron-Log'] = 'ISPC Cron-Protokoll anzeigen';
 $wb['no_data_updates_txt'] = 'Derzeit stehen keine Daten über Updates zur Verfügung. Bitte später erneut überprüfen.';
 $wb['no_data_raid_txt'] = 'Derzeit stehen keine Daten über RAID zur Verfügung. Bitte später erneut überprüfen.';
@@ -66,10 +67,10 @@ $wb['monitor_nomdadm_txt'] = 'mdadm ist auf ihrem Server nicht installiert oder
 $wb['monitor_norkhunter_txt'] = 'RKHunter ist nicht installiert, deshalb gibt es keine Protokolldatei';
 $wb['monitor_serverstate_server_txt'] = 'Server';
 $wb['monitor_serverstate_state_txt'] = 'Status';
-$wb['monitor_serverstate_unknown_txt'] = 'unbekannt';
+$wb['monitor_serverstate_unknown_txt'] = 'Unbekannt';
 $wb['monitor_serverstate_info_txt'] = 'Info';
 $wb['monitor_serverstate_warning_txt'] = 'Warnung';
-$wb['monitor_serverstate_critical_txt'] = 'kritisch';
+$wb['monitor_serverstate_critical_txt'] = 'Kritisch';
 $wb['monitor_serverstate_error_txt'] = 'Fehler';
 $wb['monitor_serverstate_moreinfo_txt'] = 'Mehr Informationen...';
 $wb['monitor_serverstate_more_txt'] = 'mehr...';
@@ -115,6 +116,11 @@ $wb['monitor_serverstate_syslogunknown_txt'] = 'System-Protokoll: ???';
 $wb['monitor_serverstate_updatesok_txt'] = 'Ihr System ist aktuell';
 $wb['monitor_serverstate_updatesneeded_txt'] = 'Eine oder mehrere Komponenten benötigen ein Update';
 $wb['monitor_serverstate_updatesunknown_txt'] = 'System-Update: ???';
+$wb['monitor_serverstate_beancounterok_txt'] = 'Die Datei Beancounter beinhaltet keine Fehler';
+$wb['monitor_serverstate_beancounterinfo_txt'] = 'Die Datei Beancounter beinhaltet wenige Fehler';
+$wb['monitor_serverstate_beancounterwarning_txt'] = 'Die Datei Beancounter beinhaltet einige Fehler';
+$wb['monitor_serverstate_beancountercritical_txt'] = 'Die Datei Beancounter beinhaltet viele Fehler';
+$wb['monitor_serverstate_beancountererror_txt'] = 'Die Datei Beancounter beinhaltet zu viele Fehler';
 $wb['monitor_services_online_txt'] = 'Online';
 $wb['monitor_services_offline_txt'] = 'Offline';
 $wb['monitor_services_web_txt'] = 'Web-Server:';
@@ -135,4 +141,6 @@ $wb['monitor_title_raidstate_txt'] = 'RAID-Status';
 $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter-Protokoll';
 $wb['monitor_updates_nosupport_txt'] = 'Ihre Distribution wird für die Überwachung nicht unterstützt';
 $wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Log';
+$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter';
+$wb['monitor_beancounter_nosupport_txt'] = 'Dieser Server ist kein OpenVz-VE und besitzt deshalb auch keine Beancounter Informationen.';
 ?>

interface/web/monitor/lib/lang/en.lng

@@ -115,6 +115,11 @@ $wb['monitor_serverstate_syslogunknown_txt'] = 'System log: ???';
 $wb['monitor_serverstate_updatesok_txt'] = 'Your system is up to date.';
 $wb['monitor_serverstate_updatesneeded_txt'] = 'One or more components needs an update';
 $wb['monitor_serverstate_updatesunknown_txt'] = 'System Update: ???';
+$wb['monitor_serverstate_beancounterok_txt'] = 'The beancounter is ok';
+$wb['monitor_serverstate_beancounterinfo_txt'] = 'There are vew failure in the beancounter';
+$wb['monitor_serverstate_beancounterwarning_txt'] = 'There are some failure in the beancounter';
+$wb['monitor_serverstate_beancountercritical_txt'] = 'There are many failure in the beancounter';
+$wb['monitor_serverstate_beancountererror_txt'] = 'There are too much failure in the beancounter';
 $wb['monitor_services_online_txt'] = 'Online';
 $wb['monitor_services_offline_txt'] = 'Offline';
 $wb['monitor_services_web_txt'] = 'Web-Server:';
@@ -134,5 +139,7 @@ $wb['monitor_title_mailq_txt'] = 'Mail Queue';
 $wb['monitor_title_raidstate_txt'] = 'RAID Status';
 $wb['monitor_title_rkhunterlog_txt'] = 'RKHunter Log';
 $wb['monitor_title_fail2ban_txt'] = 'Fail2Ban Log';
+$wb['monitor_title_beancounter_txt'] = 'OpenVz VE BeanCounter';
 $wb['monitor_updates_nosupport_txt'] = 'Your distribution is not supported for this monitoring';
+$wb['monitor_beancounter_nosupport_txt'] = 'This server is not a OpenVz VE and has no beancounter information';
 ?>

interface/web/monitor/lib/module.conf.php

@@ -104,6 +104,9 @@
                   'target' 	=> 'content',
                   'link'	=> 'monitor/show_data.php?type=services');
 
+$items[] = array( 'title' 	=> "Show OpenVz VE BeanCounter",
+                  'target' 	=> 'content',
+                  'link'	=> 'monitor/show_data.php?type=openvz_beancounter');
 
 $module["nav"][] = array(	'title'	=> 'Server State',
                             'open' 	=> 1,

interface/web/monitor/show_data.php

@@ -82,6 +82,13 @@
         $title = $app->lng("Status of services").' ('. $monTransSrv .' : ' . $_SESSION['monitor']['server_name'] . ')';
         $description = '';
         break;
+    case 'openvz_beancounter':
+        $template = 'templates/show_data.htm';
+        $output .= showOpenVzBeanCounter();
+        $time = getDataTime('openvz_beancounter');
+        $title = $app->lng("monitor_title_beancounter_txt") . ' (' . $monTransSrv . ' : ' . $_SESSION['monitor']['server_name'] . ')';
+        $description = '';
+        break;
     case 'system_update':
         $template = 'templates/show_data.htm';
         $output .= showSystemUpdate();