diff --git a/src/classes/logstreamdb.class.php b/src/classes/logstreamdb.class.php
index d283219..4e4d0d1 100644
--- a/src/classes/logstreamdb.class.php
+++ b/src/classes/logstreamdb.class.php
@@ -668,11 +668,20 @@ class LogStreamDB extends LogStream {
else
$szLimitSql = "";
+ // Create SQL Where Clause!
+ if ( $this->_SQLwhereClause == "" )
+ {
+ $res = $this->CreateSQLWhereClause();
+ if ( $res != SUCCESS )
+ return $res;
+ }
+
// Create SQL String now!
$szSql = "SELECT " .
$myDBQueryFields .
"count(" . $myDBConsFieldName . ") as ItemCount " .
" FROM " . $this->_logStreamConfigObj->DBTableName .
+ $this->_SQLwhereClause .
" GROUP BY " . $myDBGroupByFieldName .
" ORDER BY " . $myDBSortedFieldName . " " . $szSortingOrder .
$szLimitSql ;
@@ -724,7 +733,7 @@ class LogStreamDB extends LogStream {
// Copy helper variables, this is just for better readability
$szTableType = $this->_logStreamConfigObj->DBTableType;
-
+
// Check if fields are available
if ( !isset($dbmapping[$szTableType]['DBMAPPINGS'][$szConsFieldId]) || !isset($dbmapping[$szTableType]['DBMAPPINGS'][$szSortFieldId]) )
return ERROR_DB_DBFIELDNOTFOUND;
@@ -790,11 +799,20 @@ class LogStreamDB extends LogStream {
else
$szLimitSql = "";
+ // Create SQL Where Clause!
+ if ( $this->_SQLwhereClause == "" )
+ {
+ $res = $this->CreateSQLWhereClause();
+ if ( $res != SUCCESS )
+ return $res;
+ }
+
// Create SQL String now!
$szSql = "SELECT " .
$myDBQueryFields .
"count(" . $myDBConsFieldName . ") as ItemCount " .
" FROM " . $this->_logStreamConfigObj->DBTableName .
+ $this->_SQLwhereClause .
" GROUP BY " . $myDBGroupByFieldName .
" ORDER BY " . $myDBSortedFieldName . " " . $szSortingOrder .
$szLimitSql ;
@@ -1295,6 +1313,8 @@ class LogStreamDB extends LogStream {
// Output Debug Informations
OutputDebugMessage("LogStreamDB|CreateMainSQLQuery: Created SQL Query:
" . $szSql, DEBUG_DEBUG);
+//print ("LogStreamDB|CreateMainSQLQuery: Created SQL Query:
" . $szSql);
+
// return success state if reached this point!
return SUCCESS;
}
diff --git a/src/classes/reports/report.eventlog.monilog.class.php b/src/classes/reports/report.eventlog.monilog.class.php
index a07ad02..3c8e372 100644
--- a/src/classes/reports/report.eventlog.monilog.class.php
+++ b/src/classes/reports/report.eventlog.monilog.class.php
@@ -100,9 +100,17 @@ class Report_monilog extends Report {
{
global $content, $severity_colors;
- // Verify Datasource first!
- if ( $this->verifyDataSource() == SUCCESS )
+ // Set Filter string
+ $this->_streamObj->SetFilter( $this->_filterString );
+
+ // Need to Open stream first!
+ $res = $this->_streamObj->Open( $this->_arrProperties, true );
+ if ( $res == SUCCESS )
{
+//
+// // Verify Datasource first!
+// if ( $this->verifyDataSource() == SUCCESS )
+// {
// Get Settings and set to global content variable
$content["report_title"] = $this->GetCustomTitle();
$content["report_comment"] = $this->GetCustomComment();
@@ -147,6 +155,8 @@ class Report_monilog extends Report {
$this->ConsolidateEventsPerHost($arrHosts);
// ---
}
+ else
+ return $ret;
// Return success!
return SUCCESS;
@@ -197,7 +207,7 @@ class Report_monilog extends Report {
global $content;
// Set Filter string
- $this->_streamObj->SetFilter( $this->_filterString );
+// $this->_streamObj->SetFilter( $this->_filterString );
// Now open the stream for data processing
$res = $this->_streamObj->Open( $this->_arrProperties, true );
diff --git a/src/classes/reports/report.eventlog.monilog/report.eventlog.monilog.template.html b/src/classes/reports/report.eventlog.monilog/report.eventlog.monilog.template.html
index 3a00f92..4e4e20f 100644
--- a/src/classes/reports/report.eventlog.monilog/report.eventlog.monilog.template.html
+++ b/src/classes/reports/report.eventlog.monilog/report.eventlog.monilog.template.html
@@ -87,9 +87,9 @@
{ZAEHLER} |
{FirstEvent_Date_Formatted} |
{LastEvent_Date_Formatted} |
- {sourceproc} |
+ {sourceproc} |
{syslogseverity_text} |
- {id} |
+ {id} |
{msg} |
{ItemCount} |