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

Merge pull request #5207 from Icinga/feature/ido-remove-unused-xommand-history 

DB IDO: Disable external command history by default

fixes #5207 
refs #4788
This commit is contained in:
Michael Friedrich 2017-04-28 09:40:38 +02:00 committed by GitHub
parent 0bafd532a9 21ce07046c
commit 26c0a6f0c9
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/9-object-types.md
View File

@ -763,7 +763,7 @@ Data Categories:
DbCatComment | Comments | Icinga Web 2
DbCatDowntime | Downtimes | Icinga Web 2
DbCatEventHandler | Event handler data | Icinga Web 2
DbCatExternalCommand | External commands | Icinga Web 2
DbCatExternalCommand | External commands | --
DbCatFlapping | Flap detection data | Icinga Web 2
DbCatCheck | Check results | --
DbCatLog | Log messages | --
@ -772,6 +772,9 @@ Data Categories:
DbCatRetention | Retention data | Icinga Web 2
DbCatStateHistory | Historical state data | Icinga Web 2
The default value for `categories` includes everything required
by Icinga Web 2 in the table above.
In addition to the category flags listed above the `DbCatEverything`
flag may be used as a shortcut for listing all flags.
@ -781,9 +784,6 @@ flag may be used as a shortcut for listing all flags.
> `DbCatProgramStatus | DbCatState` was deprecated in 2.5 and will
> be removed in future versions.
External interfaces like Icinga Web 2 require everything except `DbCatCheck`
and `DbCatLog` which is the default value if `categories` is not set.
## <a id="objecttype-idopgsqlconnection"></a> IdoPgSqlConnection
IDO database adapter for PostgreSQL.
@ -852,7 +852,7 @@ Data Categories:
DbCatComment | Comments | Icinga Web 2
DbCatDowntime | Downtimes | Icinga Web 2
DbCatEventHandler | Event handler data | Icinga Web 2
DbCatExternalCommand | External commands | Icinga Web 2
DbCatExternalCommand | External commands | --
DbCatFlapping | Flap detection data | Icinga Web 2
DbCatCheck | Check results | --
DbCatLog | Log messages | --
@ -861,6 +861,9 @@ Data Categories:
DbCatRetention | Retention data | Icinga Web 2
DbCatStateHistory | Historical state data | Icinga Web 2
The default value for `categories` includes everything required
by Icinga Web 2 in the table above.
In addition to the category flags listed above the `DbCatEverything`
flag may be used as a shortcut for listing all flags.
@ -870,9 +873,6 @@ flag may be used as a shortcut for listing all flags.
> `DbCatProgramStatus | DbCatState` was deprecated in 2.5 and will
> be removed in future versions.
External interfaces like Icinga Web 2 require everything except `DbCatCheck`
and `DbCatLog` which is the default value if `categories` is not set.
## <a id="objecttype-influxdbwriter"></a> InfluxdbWriter

1
lib/db_ido/dbconnection.ti
View File

@ -44,7 +44,6 @@ abstract class DbConnection : ConfigObject
cat->Add("DbCatComment");
cat->Add("DbCatDowntime");
cat->Add("DbCatEventHandler");
cat->Add("DbCatExternalCommand");
cat->Add("DbCatFlapping");
cat->Add("DbCatNotification");
cat->Add("DbCatProgramStatus");