From 21ce07046c4438bc5e56f016d5a4c40b87e2f233 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Fri, 28 Apr 2017 09:37:27 +0200 Subject: [PATCH] DB IDO: Disable external command history by default That's not used in Icinga Web 2 and might lock the feature on cleanup. refs #4788 --- doc/9-object-types.md | 16 ++++++++-------- lib/db_ido/dbconnection.ti | 1 - 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/doc/9-object-types.md b/doc/9-object-types.md index 61586c5ae..f16d09fab 100644 --- a/doc/9-object-types.md +++ b/doc/9-object-types.md @@ -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. - ## 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. - ## InfluxdbWriter diff --git a/lib/db_ido/dbconnection.ti b/lib/db_ido/dbconnection.ti index 55e10881e..77d50f6e5 100644 --- a/lib/db_ido/dbconnection.ti +++ b/lib/db_ido/dbconnection.ti @@ -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");