Commit ea0cb3ab authored by tbrehm's avatar tbrehm
Browse files

No commit message

No commit message
parent aee6fd8a
......@@ -45,25 +45,9 @@ class app {
{
global $conf;
$this->_conf = $conf;
if($this->_conf["start_db"] == true) {
$this->load('db_'.$this->_conf["db_type"]);
if($this->_conf['start_db'] == true) {
$this->load('db_'.$this->_conf['db_type']);
$this->db = new db;
/*
Initialize the connection to the master DB,
if we are in a multiserver setup
*/
if($this->_conf["dbmaster_host"] != '' && $this->_conf["dbmaster_host"] != $this->_conf["db_host"]) {
$this->dbmaster = new db;
if($this->dbmaster->linkId) $this->dbmaster->closeConn();
$this->dbmaster->dbHost = $this->_conf["dbmaster_host"];
$this->dbmaster->dbName = $this->_conf["dbmaster_database"];
$this->dbmaster->dbUser = $this->_conf["dbmaster_user"];
$this->dbmaster->dbPass = $this->_conf["dbmaster_password"];
} else {
$this->dbmaster = $this->db;
}
}
//* Start the session
......
......@@ -101,7 +101,7 @@ $app->tpl->setVar("refresh",$tmp);
/* fetch the Data from the DB */
$record = $app->dbmaster->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = '" . $app->dbmaster->quote($logId) . "' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = '" . $app->db->quote($logId) . "' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$data = unserialize($record['data']);
......
......@@ -102,7 +102,7 @@ function _getSysState(){
*/
$html = '';
$servers = $app->dbmaster->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
$servers = $app->db->queryAllRecords("SELECT server_id, server_name FROM server order by server_name");
foreach ($servers as $server)
{
$html .= _getServerState($server['server_id'], $server['server_name'], false);
......@@ -134,7 +134,7 @@ function _getServerState($serverId, $serverName, $showAll)
* get all monitoring-data from the server als process then
* (count them and set the server-state)
*/
$records = $app->dbmaster->queryAllRecords("SELECT DISTINCT type FROM monitor_data WHERE server_id = " . $serverId);
$records = $app->db->queryAllRecords("SELECT DISTINCT type FROM monitor_data WHERE server_id = " . $serverId);
foreach($records as $record){
_processDbState($record['type'], $serverId, &$serverState, &$messages);
}
......@@ -210,7 +210,7 @@ function _processDbState($type, $serverId, &$serverState, &$messages)
* state
*/
// get the State from the DB
$record = $app->dbmaster->queryOneRecord("SELECT state FROM monitor_data WHERE type = '" . $type . "' and server_id = " . $serverId . " order by created desc");
$record = $app->db->queryOneRecord("SELECT state FROM monitor_data WHERE type = '" . $type . "' and server_id = " . $serverId . " order by created desc");
// change the new state to the highest state
$serverState = _setState($serverState, $record['state']);
// count the states
......
......@@ -30,7 +30,7 @@ function showServerLoad(){
global $app;
/* fetch the Data from the DB */
$record = $app->dbmaster->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'server_load' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
$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']);
......@@ -76,7 +76,7 @@ function showDiskUsage () {
global $app;
/* fetch the Data from the DB */
$record = $app->dbmaster->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'disk_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
$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']);
......@@ -119,7 +119,7 @@ function showMemUsage ()
global $app;
/* fetch the Data from the DB */
$record = $app->dbmaster->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'mem_usage' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
$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']);
......@@ -155,7 +155,7 @@ function showCpuInfo ()
global $app;
/* fetch the Data from the DB */
$record = $app->dbmaster->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'cpu_info' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
$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']);
......@@ -189,7 +189,7 @@ function showServices ()
global $app;
/* fetch the Data from the DB */
$record = $app->dbmaster->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'services' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
$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']);
......@@ -302,7 +302,7 @@ function showSystemUpdate()
global $app;
/* fetch the Data from the DB */
$record = $app->dbmaster->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'system_update' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'system_update' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$html =
......@@ -332,7 +332,7 @@ function showRaidState()
global $app;
/* fetch the Data from the DB */
$record = $app->dbmaster->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'raid_state' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'raid_state' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$html =
......@@ -364,7 +364,7 @@ function showRKHunter()
global $app;
/* fetch the Data from the DB */
$record = $app->dbmaster->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'rkhunter' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'rkhunter' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$html =
......@@ -396,7 +396,7 @@ function showMailq()
global $app;
/* fetch the Data from the DB */
$record = $app->dbmaster->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'mailq' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
$record = $app->db->queryOneRecord("SELECT data, state FROM monitor_data WHERE type = 'mailq' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['data'])) {
$data = unserialize($record['data']);
......@@ -412,7 +412,7 @@ function getDataTime($type) {
global $app;
/* fetch the Data from the DB */
$record = $app->dbmaster->queryOneRecord("SELECT created FROM monitor_data WHERE type = '" . $type . "' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
$record = $app->db->queryOneRecord("SELECT created FROM monitor_data WHERE type = '" . $type . "' and server_id = " . $_SESSION['monitor']['server_id'] . " order by created desc");
if(isset($record['created'])) {
$res = date('Y-m-d H:i', $record['created']);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment