[icinga-checkins] icinga.org: icinga-core/rbartels/cgi: deprecate enable_sla refs #3450

[git at icinga.org]

Module: icinga-core
Branch: rbartels/cgi
Commit: 77eaab40b7ef04a87151d7c6af7614fd77770cd2
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=77eaab40b7ef04a87151d7c6af7614fd77770cd2

Author: Michael Friedrich <michael.friedrich at netways.de>
Date:   Thu Jan 10 20:36:24 2013 +0100

deprecate enable_sla refs #3450

---

 Changelog                                   |    3 +++
 module/idoutils/config/ido2db.cfg-sample.in |    7 +++----
 module/idoutils/src/ido2db.c                |    1 +
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index f2724ea..317eec9 100644
--- a/Changelog
+++ b/Changelog
@@ -14,6 +14,9 @@ UPGRADE NOTES
 
 1.9.0 - 25/04/2012
 
+NOTES
+* ido2db.cfg enable_sla is now deprecated! #3450
+
 ENHANCEMENTS
 * core: introduce warning level -vv on config verification #3510 - MF
 
diff --git a/module/idoutils/config/ido2db.cfg-sample.in b/module/idoutils/config/ido2db.cfg-sample.in
index dbeb4d3..181b208 100644
--- a/module/idoutils/config/ido2db.cfg-sample.in
+++ b/module/idoutils/config/ido2db.cfg-sample.in
@@ -343,13 +343,12 @@ oracle_trace_level=0
 
 
 
-# ENABLE SLA - EXPERIMENTAL!
+# ENABLE SLA - DEPRECATED!
 # This setting enables collection of SLA data in the slahistory table
 # Values: 0 = disabled, 1 = enabled
 #
-# WARNING: This setting is highly experimantal and may harm your
-# systems performance. Enable at your own risk, and if any problems
-# occur, remark that you are explicitely using it. You've been warned.
+# WARNING: This setting will be deprecated in 1.9 and not developed
+# anymore, as it has never been used by any Icinga application.
 
 enable_sla=0
 
diff --git a/module/idoutils/src/ido2db.c b/module/idoutils/src/ido2db.c
index 10b6042..6602ec1 100644
--- a/module/idoutils/src/ido2db.c
+++ b/module/idoutils/src/ido2db.c
@@ -610,6 +610,7 @@ int ido2db_process_config_var(char *arg) {
 	} else if (!strcmp(var, "oracle_trace_level")) {
 		ido2db_db_settings.oracle_trace_level = atoi(val);
 	} else if (!strcmp(var, "enable_sla")) {
+		syslog(LOG_USER | LOG_INFO, "Warning: enable_sla is deprecated!\n");
 		enable_sla = (atoi(val) > 0) ? IDO_TRUE : IDO_FALSE;
 	} else if (!strcmp(var, "debug_readable_timestamp")) {
 		ido2db_debug_readable_timestamp = (atoi(val) > 0) ? IDO_TRUE : IDO_FALSE;