Skip to content

GitLab

Commit 8793b32c authored by vogelor's avatar vogelor
Browse files

Monitor Module now only shows the state of the "active" services 

Monitor Module now has system state
parent e8a7e840
Expand all Hide whitespace changes
Inline Side-by-side
install/sql/ispconfig3.sql
View file @ 8793b32c
......@@ -1102,15 +1102,11 @@ CREATE TABLE `monitor_data` (
`type` varchar(255) NOT NULL,
`created` int(11) NOT NULL,
`data` mediumtext NOT NULL,
`state` enum('unknown','ok','warning','critical', 'error') NOT NULL default 'unknown',
`state` enum('no_state', 'unknown', 'ok', 'info', 'warning', 'critical', 'error') NOT NULL default 'unknown',
PRIMARY KEY (`server_id`,`type`,`created`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
SET FOREIGN_KEY_CHECKS = 1;
# iso_country_list.sql
#
......@@ -1373,6 +1369,7 @@ INSERT INTO country VALUES ('ZM','ZAMBIA','Zambia','ZMB','894');
INSERT INTO country VALUES ('ZW','ZIMBABWE','Zimbabwe','ZWE','716');
SET FOREIGN_KEY_CHECKS = 1;
......
interface/web/monitor/lib/module.conf.php
View file @ 8793b32c
......@@ -7,7 +7,17 @@ $module["name"] = "monitor";
$module["title"] = "Monitor";
$module["template"] = "module.tpl.htm";
$module["tab_width"] = '';
$module["startpage"] = "monitor/show_data.php?type=overview";
$module["startpage"] = "monitor/show_sys_state.php?state=system";
unset($items);
$items[] = array( 'title' => "Show System State",
'target' => 'content',
'link' => 'monitor/show_sys_state.php?state=system');
$module["nav"][] = array( 'title' => 'System State',
'open' => 1,
'items' => $items);
/*
We need all the available servers on the left navigation.
......@@ -15,24 +25,25 @@ $module["startpage"] = "monitor/show_data.php?type=overview";
*/
$servers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
$dropDown = "<select id='server_id' onchange=\"loadContent('monitor/show_data.php?type=overview&server=' + document.getElementById('server_id').value);\">";
$dropDown = "<select id='server_id' onchange=\"loadContent('monitor/show_sys_state.php?state=server&server=' + document.getElementById('server_id').value);\">";
foreach ($servers as $server)
{
$dropDown .= "<option value='" . $server['server_id'] . "|" . $server['server_name'] . "'>" . $server['server_name'] . "</option>";
$dropDown .= "<option value='" . $server['server_id'] . "|" . $server['server_name'] . "'>" . $server['server_name'] . "</option>";
}
$dropDown .= "</select>";
/*
Now add them as dropdown to the navigation
*/
unset($items);
$items[] = array( 'title' => $dropDown,
'target' => '', // no action!
'link' => ''); // no action!
'target' => '', // no action!
'link' => ''); // no action!
$module["nav"][] = array( 'title' => 'Server to Monitor',
'open' => 1,
'items' => $items);
'open' => 1,
'items' => $items);
/*
The first Server at the list is the server first selected
*/
......@@ -40,83 +51,90 @@ $_SESSION['monitor']['server_id'] = $servers[0]['server_id'];
$_SESSION['monitor']['server_name'] = $servers[0]['server_name'];
/*
Logmonitoring module
*/
// aufrumen
* Logmonitoring module
*/
/*
* Clear and set the Navigation-Items
*/
unset($items);
$items[] = array( 'title' => "Server Load",
'target' => 'content',
'link' => 'monitor/show_data.php?type=server_load');
$items[] = array( 'title' => "Show Server State",
'target' => 'content',
'link' => 'monitor/show_sys_state.php?state=server');
$items[] = array( 'title' => "Show Server Load",
'target' => 'content',
'link' => 'monitor/show_data.php?type=server_load');
$items[] = array( 'title' => "Disk usage",
'target' => 'content',
'link' => 'monitor/show_data.php?type=disk_usage');
$items[] = array( 'title' => "Show Disk usage",
'target' => 'content',
'link' => 'monitor/show_data.php?type=disk_usage');
$items[] = array( 'title' => "Memory usage",
'target' => 'content',
'link' => 'monitor/show_data.php?type=mem_usage');
$items[] = array( 'title' => "Show Memory usage",
'target' => 'content',
'link' => 'monitor/show_data.php?type=mem_usage');
$items[] = array( 'title' => "Services",
'target' => 'content',
'link' => 'monitor/show_data.php?type=services');
$items[] = array( 'title' => "Show Services",
'target' => 'content',
'link' => 'monitor/show_data.php?type=services');
$module["nav"][] = array( 'title' => 'Monitoring',
'open' => 1,
'items' => $items);
'open' => 1,
'items' => $items);
// aufrumen
/*
* Clear and set the Navigation-Items
*/
unset($items);
$items[] = array( 'title' => "CPU",
'target' => 'content',
'link' => 'monitor/show_data.php?type=cpu_info');
$items[] = array( 'title' => "Show CPU info",
'target' => 'content',
'link' => 'monitor/show_data.php?type=cpu_info');
$module["nav"][] = array( 'title' => 'System-Information',
'open' => 1,
'items' => $items);
// aufrumen
unset($items);
'open' => 1,
'items' => $items);
/*
* Logmonitoring module
*/
/*
Logmonitoring module
*/
* Clear and set the Navigation-Items
*/
unset($items);
$items[] = array( 'title' => "Mail log",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_mail');
$items[] = array( 'title' => "Show Mail-Log",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_mail');
$items[] = array( 'title' => "Mail warn",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_mail_warn');
$items[] = array( 'title' => "Show Mail warn-Log",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_mail_warn');
$items[] = array( 'title' => "Mail err",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_mail_err');
$items[] = array( 'title' => "Show Mail err-Log",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_mail_err');
$items[] = array( 'title' => "Messages",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_messages');
$items[] = array( 'title' => "Show Messages-Log",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_messages');
$items[] = array( 'title' => "Freshclam",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_freshclam');
$items[] = array( 'title' => "Show Freshclam-Log",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_freshclam');
$items[] = array( 'title' => "Clamav",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_clamav');
$items[] = array( 'title' => "Show Clamav-Log",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_clamav');
$items[] = array( 'title' => "ISPConfig",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_ispconfig');
$items[] = array( 'title' => "Show ISPConfig-Log",
'target' => 'content',
'link' => 'monitor/show_log.php?log=log_ispconfig');
$module["nav"][] = array( 'title' => 'Logfiles',
'open' => 1,
'items' => $items);
// aufrumen
unset($items);
'open' => 1,
'items' => $items);
?>
\ No newline at end of file
interface/web/monitor/show_data.php
View file @ 8793b32c
......@@ -30,6 +30,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
require_once('tools.inc.php');
//* Check permissions for module
$app->auth->check_module_permissions('monitor');
......@@ -38,58 +39,42 @@ $app->auth->check_module_permissions('monitor');
/* Get the dataType to show */
$dataType = $_GET["type"];
/* Change the Server if needed */
if (isset($_GET['server'])){
$server = explode('|', $_GET['server'], 2);
$_SESSION['monitor']['server_id'] = $server[0];
$_SESSION['monitor']['server_name'] = $server[1];
}
$output = '';
switch($dataType) {
case 'server_load':
$template = 'templates/show_data.htm';
$output .= showServerLoad();
$title = $app->lng("Server Load").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'disk_usage':
$template = 'templates/show_data.htm';
$output .= showDiskUsage();
$title = $app->lng("Disk usage").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'mem_usage':
$template = 'templates/show_data.htm';
$output .= showMemUsage();
$title = $app->lng("Memory usage").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'cpu_info':
$template = 'templates/show_data.htm';
$output .= showCpuInfo();
$title = $app->lng("CPU info").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'services':
$template = 'templates/show_data.htm';
$output .= showServices();
$title = $app->lng("Status of services").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'overview':
$template = 'templates/show_data.htm';
$output .= showServerLoad();
$output .= '&nbsp;'. showDiskUsage();
$output .= '&nbsp;'.showServices();
$title = $app->lng("System Monitor").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
default:
$template = '';
break;
case 'server_load':
$template = 'templates/show_data.htm';
$output .= showServerLoad();
$title = $app->lng("Server Load").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'disk_usage':
$template = 'templates/show_data.htm';
$output .= showDiskUsage();
$title = $app->lng("Disk usage").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'mem_usage':
$template = 'templates/show_data.htm';
$output .= showMemUsage();
$title = $app->lng("Memory usage").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'cpu_info':
$template = 'templates/show_data.htm';
$output .= showCpuInfo();
$title = $app->lng("CPU info").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
case 'services':
$template = 'templates/show_data.htm';
$output .= showServices();
$title = $app->lng("Status of services").' (Server: ' . $_SESSION['monitor']['server_name'] . ')';
$description = '';
break;
default:
$template = '';
break;
}
......@@ -105,226 +90,4 @@ $app->tpl->setVar("description",$description);
$app->tpl_defaults();
$app->tpl->pparse();
function showServerLoad(){
global $app;
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'server_load' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$data = unserialize($record['data']);
/*
Format the data
*/
$html .=
'<table id="system_load">
<tr>
<td>' . $app->lng("Server online since").':</td>
<td>' . $data['up_days'] . ' days, ' . $data['up_hours'] . ':' . $data['up_minutes'] . ' hours</center></td>
</tr>
<tr>
<td>' . $app->lng("Users online").':</td>
<td>' . $data['user_online'] . '</td>
</tr>' .
'<tr>
<td>' . $app->lng("System load 1 minute") . ':</td>
<td>' . $data['load_1'] . '</td>
</tr>
<tr>
<td>' . $app->lng("System load 5 minutes") . ':</td>
<td>' . $data['load_5'] . '</td>
</tr>
<tr>
<td>'.$app->lng("System load 15 minutes").':</td>
<td>' . $data['load_15'] . '</td>
</tr>
</table>';
} else {
$html = '<p>'.$app->lng("no_data_serverload_txt").'</p>';
}
return $html;
}
function showDiskUsage () {
global $app;
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'disk_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$data = unserialize($record['data']);
/*
Format the data
*/
$html .= '<table id="system_disk">';
foreach($data as $line) {
$html .= '<tr>';
foreach ($line as $item) {
$html .= '<td>' . $item . '</td>';
}
$html .= '</tr>';
}
$html .= '</table>';
} else {
$html = '<p>'.$app->lng("no_data_diskusage_txt").'</p>';
}
return $html;
}
function showMemUsage ()
{
global $app;
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'mem_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$data = unserialize($record['data']);
/*
Format the data
*/
$html .= '<table id="system_memusage">';
foreach($data as $key => $value){
if ($key != '') {
$html .= '<tr>
<td>' . $key . ':</td>
<td>' . $value . '</td>
</tr>';
}
}
$html .= '</table>';
} else {
$html = '<p>'.$app->lng("no_data_memusage_txt").'</p>';
}
return $html;
}
function showCpuInfo ()
{
global $app;
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'cpu_info' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$data = unserialize($record['data']);
/*
Format the data
*/
$html .= '<table id="system_cpu">';
foreach($data as $key => $value){
if ($key != '') {
$html .= '<tr>
<td>' . $key . ':</td>
<td>' . $value . '</td>
</tr>';
}
}
$html .= '</table>';
} else {
$html = '<p>'.$app->lng("no_data_cpuinfo_txt").'</p>';
}
return $html;
}
function showServices ()
{
global $app;
/* fetch the Data from the DB */
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'services' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$data = unserialize($record['data']);
/*
Format the data
*/
$html .= '<table id="system_services">';
if($data['webserver'] == true) {
$status = '<span class="online">Online</span>';
} else {
$status = '<span class="offline">Offline</span>';
}
$html .= '<tr>
<td>Web-Server:</td>
<td>'.$status.'</td>
</tr>';
if($data['ftpserver'] == true) {
$status = '<span class="online">Online</span>';
} else {
$status = '<span class="offline">Offline</span>';
}
$html .= '<tr>
<td>FTP-Server:</td>
<td>'.$status.'</td>
</tr>';
if($data['smtpserver'] == true) {
$status = '<span class="online">Online</span>';
} else {
$status = '<span class="offline">Offline</span>';
}
$html .= '<tr>
<td>SMTP-Server:</td>
<td>'.$status.'</td>
</tr>';
if($data['pop3server'] == true) {
$status = '<span class="online">Online</span>';
} else {
$status = '<span class="offline">Offline</span>';
}
$html .= '<tr>
<td>POP3-Server:</td>
<td>'.$status.'</td>
</tr>';
if($data['bindserver'] == true) {
$status = '<span class="online">Online</span>';
} else {
$status = '<span class="offline">Offline</span>';
}
$html .= '<tr>
<td>DNS-Server:</td>
<td>'.$status.'</td>
</tr>';
if($data['mysqlserver'] == true) {
$status = '<span class="online">Online</span>';
} else {
$status = '<span class="offline">Offline</span>';
}
$html .= '<tr>
<td>mySQL-Server:</td>
<td>'.$status.'</td>
</tr>';
$html .= '</table></div>';
} else {
$html = '<p>'.$app->lng("no_data_services_txt").'</p>';
}
return $html;
}
?>
\ No newline at end of file
interface/web/monitor/show_log.php
View file @ 8793b32c
......@@ -43,7 +43,6 @@ $app->tpl->setInclude('content_tpl','templates/show_log.htm');
$refresh = (isset($_GET["refresh"]))?intval($_GET["refresh"]):0;
$logParam = $_GET["log"];
/*
Setting the db-type and the caption
*/
......
interface/web/monitor/show_sys_state.php 0 → 100644
View file @ 8793b32c
<?php
/*
Copyright (c) 2007-2008, Till Brehm, projektfarm Gmbh and Oliver Vogel www.muv.com
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of ISPConfig nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
require_once('tools.inc.php');
/* Check permissions for module */
$app->auth->check_module_permissions('monitor');
/* Change the Server if needed */
if (isset($_GET['server'])){
$server = explode('|', $_GET['server'], 2);
$_SESSION['monitor']['server_id'] = $server[0];
$_SESSION['monitor']['server_name'] = $server[1];
}
/*
* Loading the template
*/
$app->uses('tpl');