[icinga-checkins] icinga.org: icinga2/master: DB IDO: Do not populate logentries table by default

git at icinga.org git at icinga.org
Wed Jul 6 11:53:49 CEST 2016


Module: icinga2
Branch: master
Commit: f87f20e9ec3c3ca2a9f16331a031fb4c283962b2
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=f87f20e9ec3c3ca2a9f16331a031fb4c283962b2

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Wed Jul  6 11:52:20 2016 +0200

DB IDO: Do not populate logentries table by default

Not required by Icinga Web 2 and therefore obsolete as default.

fixes #12106

---

 doc/6-object-types.md      |   12 ++++++------
 lib/db_ido/dbconnection.ti |    1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/doc/6-object-types.md b/doc/6-object-types.md
index 6f414ef..b192ca0 100644
--- a/doc/6-object-types.md
+++ b/doc/6-object-types.md
@@ -697,7 +697,7 @@ Example:
 
       cleanup = {
         downtimehistory_age = 48h
-        logentries_age = 31d
+        contactnotifications_age = 31d
       }
     }
 
@@ -758,7 +758,7 @@ Data Categories:
   DbCatExternalCommand | External commands      | Icinga Web 2
   DbCatFlapping        | Flap detection data    | Icinga Web 2
   DbCatCheck           | Check results          | --
-  DbCatLog             | Log messages           | Icinga Web 2
+  DbCatLog             | Log messages           | --
   DbCatNotification    | Notifications          | Icinga Web 2
   DbCatProgramStatus   | Program status data    | Icinga Web 2
   DbCatRetention       | Retention data         | Icinga Web 2
@@ -774,7 +774,7 @@ flag may be used as a shortcut for listing all flags.
 > be removed in future versions.
 
 External interfaces like Icinga Web 2 require everything except `DbCatCheck`
-which is the default value if `categories` is not set.
+and `DbCatLog` which is the default value if `categories` is not set.
 
 ## <a id="objecttype-idopgsqlconnection"></a> IdoPgSqlConnection
 
@@ -793,7 +793,7 @@ Example:
 
       cleanup = {
         downtimehistory_age = 48h
-        logentries_age = 31d
+        contactnotifications_age = 31d
       }
     }
 
@@ -847,7 +847,7 @@ Data Categories:
   DbCatExternalCommand | External commands      | Icinga Web 2
   DbCatFlapping        | Flap detection data    | Icinga Web 2
   DbCatCheck           | Check results          | --
-  DbCatLog             | Log messages           | Icinga Web 2
+  DbCatLog             | Log messages           | --
   DbCatNotification    | Notifications          | Icinga Web 2
   DbCatProgramStatus   | Program status data    | Icinga Web 2
   DbCatRetention       | Retention data         | Icinga Web 2
@@ -863,7 +863,7 @@ flag may be used as a shortcut for listing all flags.
 > be removed in future versions.
 
 External interfaces like Icinga Web 2 require everything except `DbCatCheck`
-which is the default value if `categories` is not set.
+and `DbCatLog` which is the default value if `categories` is not set.
 
 
 ## <a id="objecttype-influxdbwriter"></a> InfluxdbWriter
diff --git a/lib/db_ido/dbconnection.ti b/lib/db_ido/dbconnection.ti
index e1b6373..8cac625 100644
--- a/lib/db_ido/dbconnection.ti
+++ b/lib/db_ido/dbconnection.ti
@@ -46,7 +46,6 @@ abstract class DbConnection : ConfigObject
 			cat->Add("DbCatEventHandler");
 			cat->Add("DbCatExternalCommand");
 			cat->Add("DbCatFlapping");
-			cat->Add("DbCatLog");
 			cat->Add("DbCatNotification");
 			cat->Add("DbCatProgramStatus");
 			cat->Add("DbCatRetention");



More information about the icinga-checkins mailing list