[icinga-checkins] icinga.org: icinga-core/dev/cgis: upgrading: add config diff files to their respective locations to tell what exactly we did add /remove in them

git at icinga.org git at icinga.org
Sat Oct 27 15:36:05 CEST 2012


Module: icinga-core
Branch: dev/cgis
Commit: fc089333712539495c504a2f43344efe68345a8c
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=fc089333712539495c504a2f43344efe68345a8c

Author: Michael Friedrich <michael.friedrich at gmail.com>
Date:   Wed Oct 10 17:55:02 2012 +0200

upgrading: add config diff files to their respective locations to tell what exactly we did add/remove in them

also add a note to Changelog header, docs update pending.

refs #2608

---

 Changelog                                          |   11 ++++
 .../config/updates/ido2db.cfg_added_1.7_to_1.8.cfg |   29 +++++++++
 sample-config/.gitignore                           |    6 ++-
 sample-config/updates/cgi.cfg_added_1.7_to_1.8.cfg |   54 +++++++++++++++++
 .../updates/cgi.cfg_removed_1.7_to_1.8.cfg         |   63 ++++++++++++++++++++
 .../updates/icinga.cfg_added_1.7_to_1.8.cfg        |   38 ++++++++++++
 6 files changed, 200 insertions(+), 1 deletions(-)

diff --git a/Changelog b/Changelog
index 0724d59..f557563 100644
--- a/Changelog
+++ b/Changelog
@@ -4,6 +4,14 @@ Icinga 1.8.x Change Log
 
 Thanks to all contributers, testers and developers. Please read AUTHORS and THANKS for a detailed list :-)
 
+UPGRADE NOTES
+
+* for idoutils database upgrades, check the following for upgrade sql scripts
+	- module/idoutils/db/<yourrdbms>/upgrade/
+* for configuration file changes, check the following for added/removed config options
+	- core, classic ui: sample-config/updates/
+	- idoutils: module/idoutils/config/updates
+
 
 1.8.0 - 18/10/2012
 
@@ -64,6 +72,9 @@ ENHANCEMENTS
 
 * install: add --with-mainurl to configure, allowing to set the main frame target url for index.html #2611 - MF
 
+* config: add config added/removed diffs between versions for better upgrading #2608 - MF
+	** sample-config/updates/ and module/idoutils/config/updates/
+
 * contrib: add nginx configuration for icinga classicui by Francisco Miguel Biete into contrib/nginx #2253 - MF
 
 * docs: add a new stylesheet and rework docbook.xsl #3046 - MF
diff --git a/module/idoutils/config/updates/ido2db.cfg_added_1.7_to_1.8.cfg b/module/idoutils/config/updates/ido2db.cfg_added_1.7_to_1.8.cfg
new file mode 100644
index 0000000..9036e0f
--- /dev/null
+++ b/module/idoutils/config/updates/ido2db.cfg_added_1.7_to_1.8.cfg
@@ -0,0 +1,29 @@
+#################################################################
+# These are newly ADDED config optionss for IDO2DB.CFG only.
+#
+# NOTE: Update your existing configuration with those new ones,
+#	if needed. You are advised to do so, in order to get the
+#	full Icinga experience!
+#################################################################
+
+
+# SOCKET PERMISSIONS
+# This option determines the permissions of the Unix domain
+# socket. This option is only valid if the socket type specified
+# above is "unix". Default permissions are set to 0755.
+
+socket_perm=0755
+
+ 
+ 
+# LIBDBI DRIVER DIRECTORY !!!EXPERIMENTAL!!!
+# This option is only valid when using libdbi as database abstraction layer
+# (so not oracle) on compile time. By default, libdbi will figure out the
+# correct path itsself. If you want to change it, enable and change the value.
+#
+# Default: not in use, enable and change to e.g. /usr/local/lib/dbd
+
+#libdbi_driver_dir=@LIBDBIDRIVERDIR@
+
+
+
diff --git a/sample-config/.gitignore b/sample-config/.gitignore
index 32d26a5..f23af03 100644
--- a/sample-config/.gitignore
+++ b/sample-config/.gitignore
@@ -1,2 +1,6 @@
-*.cfg
+cgiauth.cfg
+cgi.cfg
+icinga.cfg
+mrtg.cfg
+resource.cfg
 httpd.conf
diff --git a/sample-config/updates/cgi.cfg_added_1.7_to_1.8.cfg b/sample-config/updates/cgi.cfg_added_1.7_to_1.8.cfg
new file mode 100644
index 0000000..eee07ef
--- /dev/null
+++ b/sample-config/updates/cgi.cfg_added_1.7_to_1.8.cfg
@@ -0,0 +1,54 @@
+#################################################################
+# These are newly ADDED config optionss for CGI.CFG only.
+#
+# NOTE: Update your existing configuration with those new ones,
+#	if needed. You are advised to do so, in order to get the
+#	full Icinga experience!
+#################################################################
+
+
+
+# LOWERCASE USER NAME
+# This option controls whether or not the username is converted
+# to all lowercase letters. Can be useful if the username is stored
+# in Active Directory (case-insensitive).
+
+lowercase_user_name=0
+
+
+# READ-ONLY FOR COMMENTS USERS
+# A comma-delimited list of usernames that have rights to view comments in
+# the CGIs. If user is defined as read-only and you add the same user to
+# this options, then the user can still see comments. If user is NOT
+# read-only then the options to delete comments in extinfo.cgi are not
+# displayed as well.
+
+#authorized_for_comments_read_only=user1,user2
+#authorized_contactgroup_for_comments_read_only=
+
+
+# READ-ONLY FOR DOWNTIMES USERS
+# A comma-delimited list of usernames that have rights to view downtimes in
+# the CGIs. If user is defined as read-only and you add the same user to
+# this options, then the user can still see downtimes. If user is NOT
+# read-only then the options to delete downtimes in extinfo.cgi are not
+# displayed as well.
+
+#authorized_for_downtimes_read_only=user1,user2
+#authorized_contactgroup_for_downtimes_read_only=
+
+
+# DEFAULT EXPIRING DISABLED NOTIFICATIONS DURATION
+# This option defines the default duration (in seconds) of a expiring
+# disabled notifications. Default is 86400 seconds (1 day).
+
+default_expiring_disabled_notifications_duration=86400
+
+
+# RESULT LIMIT
+# This options specifies the number of page entries
+# displayed by default in various cgi's. To display
+# all entries by default set this value to 0.
+# Default is 50.
+ 
+result_limit=50
diff --git a/sample-config/updates/cgi.cfg_removed_1.7_to_1.8.cfg b/sample-config/updates/cgi.cfg_removed_1.7_to_1.8.cfg
new file mode 100644
index 0000000..be202f7
--- /dev/null
+++ b/sample-config/updates/cgi.cfg_removed_1.7_to_1.8.cfg
@@ -0,0 +1,63 @@
+#################################################################
+# These are REMOVED config options from CGI.CFG only.
+#
+# ATTENTION: They have been deprecated, and in order to stay safe
+# 	remove them from your existing configs on upgrade too.
+#################################################################
+
+
+
+# CONTEXT-SENSITIVE HELP
+# This option determines whether or not a context-sensitive
+# help icon will be displayed for most of the CGIs.
+# Values: 0 = disables context-sensitive help
+#         1 = enables context-sensitive help
+
+show_context_help=0
+
+# DEFAULT STATUSWRL LAYOUT METHOD
+# This option allows you to specify the default layout method
+# the statuswrl (VRML) CGI should use for drawing hosts.  If you
+# do not use this option, the default is to use user-defined
+# coordinates.  Valid options are as follows:
+#      0 = User-defined coordinates
+#       2 = Collapsed tree
+#       3 = Balanced tree
+#       4 = Circular
+
+default_statuswrl_layout=4
+
+
+# STATUSWRL INCLUDE
+# This option allows you to include your own objects in the
+# generated VRML world.  It is assumed that the file
+# resides in the HTML path (i.e. /usr/local/icinga/share).
+
+#statuswrl_include=myworld.wrl
+
+
+# PING SYNTAX
+# This option determines what syntax should be used when
+# attempting to ping a host from the WAP interface (using
+# the statuswml CGI.  You must include the full path to
+# the ping binary, along with all required options.  The
+# $HOSTADDRESS$ macro is substituted with the address of
+# the host before the command is executed.
+# Please note that the syntax for the ping binary is
+# notorious for being different on virtually ever *NIX
+# OS and distribution, so you may have to tweak this to
+# work on your system.
+
+ping_syntax=/bin/ping -n -U -c 5 $HOSTADDRESS$
+
+ 
+# DEFAULT NUM DISPLAYED LOG ENTRIES OPTION
+# This options specifies the number of log entries
+# displayed by default in showlog.cgi. To display
+# all log entries by default set this value to 0.
+# Default is 10000.
+ 
+#default_num_displayed_log_entries=10000
+
+
+
diff --git a/sample-config/updates/icinga.cfg_added_1.7_to_1.8.cfg b/sample-config/updates/icinga.cfg_added_1.7_to_1.8.cfg
new file mode 100644
index 0000000..6fb66e5
--- /dev/null
+++ b/sample-config/updates/icinga.cfg_added_1.7_to_1.8.cfg
@@ -0,0 +1,38 @@
+#################################################################
+# These are newly ADDED config optionss for ICINGA.CFG only.
+#
+# NOTE: Update your existing configuration with those new ones,
+#	if needed. You are advised to do so, in order to get the
+#	full Icinga experience!
+#################################################################
+
+
+
+# MAX CHECK RESULT LIST ITEMS !!EXPERIMENTAL!!
+# This experimental option allows you to set the max number of items
+# the checkresult reaper will put onto the checkresult list for further
+# processing by the core. If there are too many, the reaping will be
+# terminated early, allowing the core to process the results sooner.
+# On larger setups, that list might grow too much, and decrease
+# performance on processing. You might experiment with that value, the
+# inner core default is set to 0, disabling that feature.
+# Values:
+#  0 = Disable max check result list items
+#  number = set max check result list items
+
+#max_check_result_list_items=1024
+
+
+# KEEP UNKNOWN MACROS
+# This option can be used to keep unknown macros within the output.
+# e.g. check_proc -C $foo$ will remain.
+# This was the default in versions older than Icinga 1.8, but now
+# the default is to remove those macros from the output, causing
+# the shell to interpret $foo and leaving a single $ there. See
+# #2291 for further information.
+# Make sure to escape single dollar signs with another '$', as the
+# docs describe. Other than that, enable this setting to revert to
+# the old behaviour.
+
+keep_unknown_macros=0
+





More information about the icinga-checkins mailing list