tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-25 18:59:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added support to create INDEXES, FIELDS and TRIGGERS for MSSQL in PDO Logstream

Browse Source 
Also fixed support for MSSQL for reports.
This commit is contained in:
Andre Lorbach 2011-11-09 11:35:29 +01:00
parent 3d8f5074c6
commit 78407d9844
2 changed files with 100 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
src/classes/logstreampdo.class.php
View File

@ -322,7 +322,8 @@ class LogStreamPDO extends LogStream {
$arrIndexTriggers = $this->GetTriggersAsArray(); $arrIndexTriggers = $this->GetTriggersAsArray();
// TRIGGER Listing failed! Nothing we can do in this case! // TRIGGER Listing failed! Nothing we can do in this case!
if ( $arrIndexTriggers == null ) if ( !isset($arrIndexTriggers) )// == null )
// if ( $arrIndexTriggers == null )
return SUCCESS; return SUCCESS;
$szTableType = $this->_logStreamConfigObj->DBTableType; $szTableType = $this->_logStreamConfigObj->DBTableType;
@ -380,6 +381,8 @@ class LogStreamPDO extends LogStream {
$szSql = "ALTER TABLE " . $this->_logStreamConfigObj->DBTableName . " ADD INDEX ( " . $dbmapping[$szTableType]['DBMAPPINGS'][$myproperty] . " )"; $szSql = "ALTER TABLE " . $this->_logStreamConfigObj->DBTableName . " ADD INDEX ( " . $dbmapping[$szTableType]['DBMAPPINGS'][$myproperty] . " )";
else if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ) else if ( $this->_logStreamConfigObj->DBType == DB_PGSQL )
$szSql = "CREATE INDEX " . $dbmapping[$szTableType]['DBMAPPINGS'][$myproperty] . "_idx ON " . $this->_logStreamConfigObj->DBTableName . " (" . $dbmapping[$szTableType]['DBMAPPINGS'][$myproperty] . ");"; $szSql = "CREATE INDEX " . $dbmapping[$szTableType]['DBMAPPINGS'][$myproperty] . "_idx ON " . $this->_logStreamConfigObj->DBTableName . " (" . $dbmapping[$szTableType]['DBMAPPINGS'][$myproperty] . ");";
else if ( $this->_logStreamConfigObj->DBType == DB_MSSQL )
$szSql = "CREATE INDEX " . $dbmapping[$szTableType]['DBMAPPINGS'][$myproperty] . "_idx ON " . $this->_logStreamConfigObj->DBTableName . " (" . $dbmapping[$szTableType]['DBMAPPINGS'][$myproperty] . ");";
else else
// Not supported in this case! // Not supported in this case!
return ERROR_DB_INDEXFAILED; return ERROR_DB_INDEXFAILED;
@ -479,6 +482,22 @@ class LogStreamPDO extends LogStream {
CREATE TRIGGER " . $szTriggerName . " BEFORE INSERT OR UPDATE ON \"" . $szTableName . "\" CREATE TRIGGER " . $szTriggerName . " BEFORE INSERT OR UPDATE ON \"" . $szTableName . "\"
FOR EACH ROW EXECUTE PROCEDURE " . $szTriggerName . "(); FOR EACH ROW EXECUTE PROCEDURE " . $szTriggerName . "();
"; ";
else if ( $this->_logStreamConfigObj->DBType == DB_MSSQL )
{
// Trigger code for MSSQL!
$szSql ="CREATE TRIGGER " . $szTriggerName . " ON " . $szTableName . " AFTER INSERT AS
BEGIN
-- SET NOCOUNT ON added to prevent extra result sets from
-- interfering with SELECT statements.
SET NOCOUNT ON;
-- Insert statements for trigger here
UPDATE " . $szTableName . "
SET " . $myDBTriggerCheckSumField . " = checksum(I." . $myDBTriggerField . ")
FROM systemevents JOIN inserted I on " . $szTableName . "." . $dbmapping[$szTableType]['DBMAPPINGS']['SYSLOG_UID'] . " = I." . $dbmapping[$szTableType]['DBMAPPINGS']['SYSLOG_UID'] . "
END
";
}
else else
// NOT SUPPORTED // NOT SUPPORTED
return null; return null;
@ -569,7 +588,13 @@ class LogStreamPDO extends LogStream {
$szTableType = $this->_logStreamConfigObj->DBTableType; $szTableType = $this->_logStreamConfigObj->DBTableType;
// Create SQL and Get INDEXES for table! // Create SQL and Get INDEXES for table!
$szSql = "SHOW COLUMNS FROM " . $this->_logStreamConfigObj->DBTableName . " WHERE Field = '" . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . "'"; if ( $this->_logStreamConfigObj->DBType == DB_MYSQL )
$szSql = "SHOW COLUMNS FROM " . $this->_logStreamConfigObj->DBTableName . " WHERE Field = '" . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . "'";
else
// NOT SUPPORTED or NEEDED
return SUCCESS;
// Run Query to check the Checksum field!
$myQuery = $this->_dbhandle->query($szSql); $myQuery = $this->_dbhandle->query($szSql);
if ($myQuery) if ($myQuery)
{ {
@ -1100,7 +1125,12 @@ class LogStreamPDO extends LogStream {
" SET " . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . " = hashtext(" . $dbmapping[$szTableType]['DBMAPPINGS'][SYSLOG_MESSAGE] . ") " . " SET " . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . " = hashtext(" . $dbmapping[$szTableType]['DBMAPPINGS'][SYSLOG_MESSAGE] . ") " .
" WHERE " . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . " IS NULL OR " . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . " = 0"; " WHERE " . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . " IS NULL OR " . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . " = 0";
} }
//MSSQL: binary_checksum elseif ($this->_logStreamConfigObj->DBType == DB_MSSQL )
{
$szSql = "UPDATE " . $this->_logStreamConfigObj->DBTableName .
" SET " . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . " = checksum(" . $dbmapping[$szTableType]['DBMAPPINGS'][SYSLOG_MESSAGE] . ") " .
" WHERE " . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . " IS NULL OR " . $dbmapping[$szTableType]['DBMAPPINGS'][MISC_CHECKSUM] . " = 0";
}
else else
{ {
// Failed | Checksum function not supported! // Failed | Checksum function not supported!
@ -1350,7 +1380,8 @@ class LogStreamPDO extends LogStream {
{ {
if ( isset($dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName]) ) if ( isset($dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName]) )
{ {
if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ) if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ||
$this->_logStreamConfigObj->DBType == DB_MSSQL )
$myDBQueryFields .= "Max(" . $dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName] . ") AS " . $dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName] . ", "; $myDBQueryFields .= "Max(" . $dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName] . ") AS " . $dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName] . ", ";
else else
// Default for other PDO Engines // Default for other PDO Engines
@ -1361,7 +1392,8 @@ class LogStreamPDO extends LogStream {
// Append Sortingfield // Append Sortingfield
if ( !in_array($szConsFieldId, $aIncludeCustomFields) ) if ( !in_array($szConsFieldId, $aIncludeCustomFields) )
{ {
if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ) if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ||
$this->_logStreamConfigObj->DBType == DB_MSSQL )
$myDBQueryFields .= "Max(" . $myDBConsFieldName . ") AS " . $dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName] . ", "; $myDBQueryFields .= "Max(" . $myDBConsFieldName . ") AS " . $dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName] . ", ";
else else
// Default for other PDO Engines // Default for other PDO Engines
@ -1375,7 +1407,8 @@ class LogStreamPDO extends LogStream {
{ {
if ( isset($dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName]) ) if ( isset($dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName]) )
{ {
if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ) if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ||
$this->_logStreamConfigObj->DBType == DB_MSSQL )
$myDBQueryFields .= "Max(" . $dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName] . ") AS " . $dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName] . ", "; $myDBQueryFields .= "Max(" . $dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName] . ") AS " . $dbmapping[$szTableType]['DBMAPPINGS'][$myFieldName] . ", ";
else else
// Default for other PDO Engines // Default for other PDO Engines
@ -1385,7 +1418,8 @@ class LogStreamPDO extends LogStream {
} }
else // Only Include ConsolidateField else // Only Include ConsolidateField
{ {
if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ) if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ||
$this->_logStreamConfigObj->DBType == DB_MSSQL )
$myDBQueryFields = "Max(" . $myDBConsFieldName . ") as " . $myDBConsFieldName. ", "; $myDBQueryFields = "Max(" . $myDBConsFieldName . ") as " . $myDBConsFieldName. ", ";
else else
// Default for other PDO Engines // Default for other PDO Engines
@ -1418,6 +1452,9 @@ class LogStreamPDO extends LogStream {
else if($this->_logStreamConfigObj->DBType == DB_MSSQL ) else if($this->_logStreamConfigObj->DBType == DB_MSSQL )
{ {
// TODO FIND A WAY FOR MSSQL! // TODO FIND A WAY FOR MSSQL!
// Helper variable for the select statement
$mySelectFieldName = $myDBGroupByFieldName . "Grouped";
$myDBQueryFieldName = "DATE( " . $myDBConsFieldName . ") AS " . $myDBGroupByFieldName ;
} }
} }
@ -1427,23 +1464,37 @@ class LogStreamPDO extends LogStream {
// Append LIMIT in this case! // Append LIMIT in this case!
if ( $this->_logStreamConfigObj->DBType == DB_MYSQL || if ( $this->_logStreamConfigObj->DBType == DB_MYSQL ||
$this->_logStreamConfigObj->DBType == DB_PGSQL ) $this->_logStreamConfigObj->DBType == DB_PGSQL )
$szLimitSql = " LIMIT " . $nRecordLimit; {
$szLimitSqlBefore = "";
$szLimitSqlAfter = " LIMIT " . $nRecordLimit;
}
else if( $this->_logStreamConfigObj->DBType == DB_MSSQL )
{
$szLimitSqlBefore = " TOP(" . $nRecordLimit . ") ";
$szLimitSqlAfter = "";
}
else else
$szLimitSql = ""; {
// TODO FIND A WAY FOR MSSQL! $szLimitSqlBefore = "";
$szLimitSqlAfter = "";
}
} }
else else
$szLimitSql = ""; {
$szLimitSqlBefore = "";
$szLimitSqlAfter = "";
}
// Create SQL String now! // Create SQL String now!
$szSql = "SELECT " . $szSql = "SELECT " .
$szLimitSqlBefore .
$myDBQueryFields . $myDBQueryFields .
"count(" . $myDBConsFieldName . ") as itemcount " . "count(" . $myDBConsFieldName . ") as itemcount " .
" FROM " . $this->_logStreamConfigObj->DBTableName . " FROM " . $this->_logStreamConfigObj->DBTableName .
$this->_SQLwhereClause . $this->_SQLwhereClause .
" GROUP BY " . $myDBGroupByFieldName . " GROUP BY " . $myDBGroupByFieldName .
" ORDER BY " . $myDBSortedFieldName . " " . $szSortingOrder . " ORDER BY " . $myDBSortedFieldName . " " . $szSortingOrder .
$szLimitSql ; $szLimitSqlAfter ;
// Output Debug Informations // Output Debug Informations
OutputDebugMessage("LogStreamPDO|ConsolidateDataByField: Running Created SQL Query:<br>" . $szSql, DEBUG_DEBUG); OutputDebugMessage("LogStreamPDO|ConsolidateDataByField: Running Created SQL Query:<br>" . $szSql, DEBUG_DEBUG);
@ -2243,6 +2294,10 @@ class LogStreamPDO extends LogStream {
{ {
// Return failure! // Return failure!
$this->PrintDebugError("ER_BAD_FIELD_ERROR - Field '" . $dbmapping[$szTableType]['DBMAPPINGS'][$myproperty] . "' is missing and failed to be added automatically! The fields has to be added manually to the database layout!'"); $this->PrintDebugError("ER_BAD_FIELD_ERROR - Field '" . $dbmapping[$szTableType]['DBMAPPINGS'][$myproperty] . "' is missing and failed to be added automatically! The fields has to be added manually to the database layout!'");
global $extraErrorDescription;
$extraErrorDescription = "Field '" . $dbmapping[$szTableType]['DBMAPPINGS'][$myproperty] . "' was missing and has been automatically added to the database layout.";
return ERROR_DB_DBFIELDNOTFOUND; return ERROR_DB_DBFIELDNOTFOUND;
} }
} }
@ -2273,10 +2328,13 @@ class LogStreamPDO extends LogStream {
$szSql = "SHOW INDEX FROM " . $this->_logStreamConfigObj->DBTableName; $szSql = "SHOW INDEX FROM " . $this->_logStreamConfigObj->DBTableName;
else if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ) else if ( $this->_logStreamConfigObj->DBType == DB_PGSQL )
$szSql = "SELECT c.relname AS \"Key_name\" FROM pg_catalog.pg_class c JOIN pg_catalog.pg_index i ON i.indexrelid = c.oid JOIN pg_catalog.pg_class t ON i.indrelid = t.oid WHERE c.relkind = 'i' AND t.relname = 'systemevents' AND c.relname LIKE '%idx%'"; $szSql = "SELECT c.relname AS \"Key_name\" FROM pg_catalog.pg_class c JOIN pg_catalog.pg_index i ON i.indexrelid = c.oid JOIN pg_catalog.pg_class t ON i.indrelid = t.oid WHERE c.relkind = 'i' AND t.relname = 'systemevents' AND c.relname LIKE '%idx%'";
else if ( $this->_logStreamConfigObj->DBType == DB_MSSQL )
$szSql = "SELECT sysindexes.name AS Key_name FROM sysobjects, sysindexes WHERE sysobjects.xtype='U' AND sysindexes.id=object_id(sysobjects.name) and sysobjects.name='" . $this->_logStreamConfigObj->DBTableName . "' ORDER BY sysobjects.name ASC";
else else
// Not supported in this case! // Not supported in this case!
return null; return null;
OutputDebugMessage("LogStreamPDO|GetIndexesAsArray: List Indexes for '" . $this->_logStreamConfigObj->DBTableName . "' - " . $szSql, DEBUG_ULTRADEBUG);
$myQuery = $this->_dbhandle->query($szSql); $myQuery = $this->_dbhandle->query($szSql);
if ($myQuery) if ($myQuery)
{ {
@ -2284,7 +2342,7 @@ class LogStreamPDO extends LogStream {
while ( $myRow = $myQuery->fetch(PDO::FETCH_ASSOC) ) while ( $myRow = $myQuery->fetch(PDO::FETCH_ASSOC) )
{ {
// Add to index keys // Add to index keys
if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ) if ( $this->_logStreamConfigObj->DBType == DB_PGSQL || $this->_logStreamConfigObj->DBType == DB_MSSQL )
$arrIndexKeys[] = str_replace( "_idx", "", strtolower($myRow['Key_name']) ); $arrIndexKeys[] = str_replace( "_idx", "", strtolower($myRow['Key_name']) );
else else
$arrIndexKeys[] = strtolower($myRow['Key_name']); $arrIndexKeys[] = strtolower($myRow['Key_name']);
@ -2322,10 +2380,13 @@ class LogStreamPDO extends LogStream {
$szSql = "SHOW FIELDS FROM " . $this->_logStreamConfigObj->DBTableName; $szSql = "SHOW FIELDS FROM " . $this->_logStreamConfigObj->DBTableName;
else if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ) else if ( $this->_logStreamConfigObj->DBType == DB_PGSQL )
$szSql = "SELECT column_name as \"Field\" FROM information_schema.COLUMNS WHERE table_name = '" . $this->_logStreamConfigObj->DBTableName . "'"; $szSql = "SELECT column_name as \"Field\" FROM information_schema.COLUMNS WHERE table_name = '" . $this->_logStreamConfigObj->DBTableName . "'";
else if ( $this->_logStreamConfigObj->DBType == DB_MSSQL )
$szSql = "SELECT syscolumns.name AS Field FROM sysobjects JOIN syscolumns ON sysobjects.id = syscolumns.id WHERE sysobjects.xtype='U' AND sysobjects.name='" . $this->_logStreamConfigObj->DBTableName . "'";
else else
// Not supported in this case! // Not supported in this case!
return null; return null;
OutputDebugMessage("LogStreamPDO|GetFieldsAsArray: List Columns for '" . $this->_logStreamConfigObj->DBTableName . "' - " . $szSql, DEBUG_ULTRADEBUG);
$myQuery = $this->_dbhandle->query($szSql); $myQuery = $this->_dbhandle->query($szSql);
if ($myQuery) if ($myQuery)
{ {
@ -2370,11 +2431,14 @@ class LogStreamPDO extends LogStream {
if ( $this->_logStreamConfigObj->DBType == DB_MYSQL ) if ( $this->_logStreamConfigObj->DBType == DB_MYSQL )
$szSql = "SHOW TRIGGERS"; $szSql = "SHOW TRIGGERS";
else if ( $this->_logStreamConfigObj->DBType == DB_PGSQL ) else if ( $this->_logStreamConfigObj->DBType == DB_PGSQL )
$szSql = "select tgname as \"Trigger\" from pg_trigger;"; $szSql = "SELECT tgname as \"Trigger\" from pg_trigger;";
else if ( $this->_logStreamConfigObj->DBType == DB_MSSQL )
$szSql = "SELECT B.Name as TableName,A.name AS 'Trigger' FROM sysobjects A,sysobjects B WHERE A.xtype='TR' AND A.parent_obj = B.id"; // AND B.Name='systemevents'";
else else
// Not supported in this case! // Not supported in this case!
return null; return null;
OutputDebugMessage("LogStreamPDO|GetTriggersAsArray: List Triggers for '" . $this->_logStreamConfigObj->DBTableName . "' - " . $szSql, DEBUG_ULTRADEBUG);
$myQuery = $this->_dbhandle->query($szSql); $myQuery = $this->_dbhandle->query($szSql);
if ($myQuery) if ($myQuery)
{ {

35
src/include/functions_frontendhelpers.php
View File

@ -213,23 +213,32 @@ function GetFormatedDate($evttimearray)
{ {
global $content; global $content;
if ( !is_array($evttimearray) ) if ( is_array($evttimearray) )
return $evttimearray;
if (
GetConfigSetting("ViewUseTodayYesterday", 0, CFGLEVEL_USER) == 1
&&
( date('m', $evttimearray[EVTIME_TIMESTAMP]) == date('m') && date('Y', $evttimearray[EVTIME_TIMESTAMP]) == date('Y') )
)
{ {
if ( date('d', $evttimearray[EVTIME_TIMESTAMP]) == date('d') ) if (
return "Today " . date("H:i:s", $evttimearray[EVTIME_TIMESTAMP] ); GetConfigSetting("ViewUseTodayYesterday", 0, CFGLEVEL_USER) == 1
else if ( date('d', $evttimearray[EVTIME_TIMESTAMP] + 86400) == date('d') ) &&
return "Yesterday " . date("H:i:s", $evttimearray[EVTIME_TIMESTAMP] ); ( date('m', $evttimearray[EVTIME_TIMESTAMP]) == date('m') && date('Y', $evttimearray[EVTIME_TIMESTAMP]) == date('Y') )
)
{
if ( date('d', $evttimearray[EVTIME_TIMESTAMP]) == date('d') )
return "Today " . date("H:i:s", $evttimearray[EVTIME_TIMESTAMP] );
else if ( date('d', $evttimearray[EVTIME_TIMESTAMP] + 86400) == date('d') )
return "Yesterday " . date("H:i:s", $evttimearray[EVTIME_TIMESTAMP] );
}
// Copy to local variable
$nMyTimeStamp = $evttimearray[EVTIME_TIMESTAMP];
}
else
{
$nMyTimeStamp = strtotime($evttimearray);
if ( $nMyTimeStamp === FALSE ) // Could not convert into timestamp so return original!
return $evttimearray;
} }
// Reach return normal format! // Reach return normal format!
return $szDateFormatted = date("Y-m-d H:i:s", $evttimearray[EVTIME_TIMESTAMP] ); return $szDateFormatted = date("Y-m-d H:i:s", $nMyTimeStamp );
} }
function GetDebugBgColor( $szDebugMode ) function GetDebugBgColor( $szDebugMode )