[icinga-checkins] icinga.org: icinga2/master: Remove compatido documentation.

git at icinga.org git at icinga.org
Thu Feb 28 14:24:29 CET 2013


Module: icinga2
Branch: master
Commit: 365b7a7ba33c65004d2cb51f068033a825e45a9f
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=365b7a7ba33c65004d2cb51f068033a825e45a9f

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Thu Feb 28 14:24:19 2013 +0100

Remove compatido documentation.

---

 docs/icinga2-config.txt |   45 ---------------------------------------------
 icinga-app/Makefile.am  |    1 -
 2 files changed, 0 insertions(+), 46 deletions(-)

diff --git a/docs/icinga2-config.txt b/docs/icinga2-config.txt
index 029bf9c..aca5220 100644
--- a/docs/icinga2-config.txt
+++ b/docs/icinga2-config.txt
@@ -487,8 +487,6 @@ Icinga 2 uses a number of components to implement its feature-set. The
 additional parameters for them. "Component" objects must have the "local"
 specifier. The typical components to be loaded in the default configuration
 would be "checker", "delegation" and more.
-There are optional components which may not run on every operating system, such as
-"compat" or "compatido".
 
 Example "compat":
 
@@ -513,46 +511,6 @@ Specifies where Icinga 2 Compat component will put the objects.cache file, which
 be read by Icinga 1.x Classic UI and other addons. If not set, it defaults to the
 localstatedir location.
 
-Example "compatido":
-
--------------------------------------------------------------------------------
-local object Component "compatido" {
-  socket_address = "127.0.0.1",
-  socket_port = "5668",
-  instance_name = "i2-default",
-  reconnect_interval = 15,
-}
--------------------------------------------------------------------------------
-
-Attribute: socket_address
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Specifies the tcp socket address of ido2db where Icinga 2 CompatIDO component will
-try to connect to. ido2db must be running and listening there already. The default
-is set to "127.0.0.1" if missing.
-
-Attribute: socket_port
-^^^^^^^^^^^^^^^^^^^^^^
-
-Specifies the tcp socket port of ido2db where Icinga 2 CompatIDO component will try
-to connect to. ido2db must be running and listening there already. The default is
-set to "5668" if missing.
-
-Attribute: instance_name
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-This is the instance name which Icinga 2 CompatIDO will use to identify itsself to
-ido2db (same as idomod would use). Once set, do not change that unless knowing the
-consequences of data inconsistency. If not set, this will default to "i2-default".
-
-Attribute: reconnect_interval
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Specifies the interval compatido will try to reconnect, if the connection to the
-ido socket fails (ido2db drops out, and will require a reconnect handshake,
-opening the socket and saying hello again).
-
-
 Type: Logger
 ~~~~~~~~~~~~
 
@@ -910,8 +868,5 @@ object Host "localhost" {
 
 NOTE: You may also want to load the "compat" component if you want Icinga 2 to
 write status.dat and objects.cache files.
-If you require an idomod connector for ido2db, outputting into idoutils database,
-you may also load the "compatido" component (default: tcpsocket, 127.0.0.1:5668).
-Make sure that ido2db is running and listening to the tcpsocket!
 
 /* vim: set syntax=asciidoc filetype=asciidoc: */
diff --git a/icinga-app/Makefile.am b/icinga-app/Makefile.am
index 3963c5a..c96be39 100644
--- a/icinga-app/Makefile.am
+++ b/icinga-app/Makefile.am
@@ -32,7 +32,6 @@ icinga2_LDADD = \
 	-dlopen ${top_builddir}/components/checker/checker.la \
 	-dlopen ${top_builddir}/components/replication/replication.la \
 	-dlopen ${top_builddir}/components/compat/compat.la \
-	-dlopen ${top_builddir}/components/compatido/compatido.la \
 	-dlopen ${top_builddir}/components/delegation/delegation.la \
 	-dlopen ${top_builddir}/components/demo/demo.la \
 	-dlopen ${top_builddir}/components/notification/notification.la





More information about the icinga-checkins mailing list