tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DB IDO: Do not populate logentries table by default 

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

fixes #12106
This commit is contained in:
Michael Friedrich 2016-07-06 11:52:20 +02:00
parent 915ebe17cd
commit f87f20e9ec
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/6-object-types.md
View File

@ -697,7 +697,7 @@ Example:
cleanup = { cleanup = {
downtimehistory_age = 48h downtimehistory_age = 48h
logentries_age = 31d contactnotifications_age = 31d
} }
} }
@ -758,7 +758,7 @@ Data Categories:
DbCatExternalCommand | External commands | Icinga Web 2 DbCatExternalCommand | External commands | Icinga Web 2
DbCatFlapping | Flap detection data | Icinga Web 2 DbCatFlapping | Flap detection data | Icinga Web 2
DbCatCheck | Check results | -- DbCatCheck | Check results | --
DbCatLog | Log messages | Icinga Web 2 DbCatLog | Log messages | --
DbCatNotification | Notifications | Icinga Web 2 DbCatNotification | Notifications | Icinga Web 2
DbCatProgramStatus | Program status data | Icinga Web 2 DbCatProgramStatus | Program status data | Icinga Web 2
DbCatRetention | Retention 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. > be removed in future versions.
External interfaces like Icinga Web 2 require everything except `DbCatCheck` 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 ## <a id="objecttype-idopgsqlconnection"></a> IdoPgSqlConnection
@ -793,7 +793,7 @@ Example:
cleanup = { cleanup = {
downtimehistory_age = 48h downtimehistory_age = 48h
logentries_age = 31d contactnotifications_age = 31d
} }
} }
@ -847,7 +847,7 @@ Data Categories:
DbCatExternalCommand | External commands | Icinga Web 2 DbCatExternalCommand | External commands | Icinga Web 2
DbCatFlapping | Flap detection data | Icinga Web 2 DbCatFlapping | Flap detection data | Icinga Web 2
DbCatCheck | Check results | -- DbCatCheck | Check results | --
DbCatLog | Log messages | Icinga Web 2 DbCatLog | Log messages | --
DbCatNotification | Notifications | Icinga Web 2 DbCatNotification | Notifications | Icinga Web 2
DbCatProgramStatus | Program status data | Icinga Web 2 DbCatProgramStatus | Program status data | Icinga Web 2
DbCatRetention | Retention 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. > be removed in future versions.
External interfaces like Icinga Web 2 require everything except `DbCatCheck` 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 ## <a id="objecttype-influxdbwriter"></a> InfluxdbWriter

1
lib/db_ido/dbconnection.ti
View File

@ -46,7 +46,6 @@ abstract class DbConnection : ConfigObject
cat->Add("DbCatEventHandler"); cat->Add("DbCatEventHandler");
cat->Add("DbCatExternalCommand"); cat->Add("DbCatExternalCommand");
cat->Add("DbCatFlapping"); cat->Add("DbCatFlapping");
cat->Add("DbCatLog");
cat->Add("DbCatNotification"); cat->Add("DbCatNotification");
cat->Add("DbCatProgramStatus"); cat->Add("DbCatProgramStatus");
cat->Add("DbCatRetention"); cat->Add("DbCatRetention");