[icinga-checkins] icinga.org: icinga-core/master: core: add 'module' as object config, allowing cfg_dir usage loading multiple modules without touching broker_module in icinga .cfg #162

git at icinga.org git at icinga.org
Sat Apr 30 21:33:38 CEST 2011


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

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Sat Apr 30 01:13:00 2011 +0200

core: add 'module' as object config, allowing cfg_dir usage loading multiple modules without touching broker_module in icinga.cfg #162

define module{
        module_name     idomod
        module_type     neb
        path            /usr/local/icinga/bin/idomod.o
        args            config_file=/usr/local/icinga/etc/idomod.cfg
}

this is *fully* optional to the default way of adding event broker modules.

it just shows an initial proof of concept which steps are needed to define
new objects and their basic usage.

and by adding this, every packager can ignore icinga.cfg:broker_module
by just installing idoutils.cfg into etc/modules/ or similar, just including
the cfg_dir and allowing this object config to be read, and the event broker
modules to be loaded.

pls read the issue for further information on that
https://dev.icinga.org/issues/162

refs #162

---

 Changelog                              |    1 +
 Makefile.in                            |    1 +
 base/config.c                          |   22 ++
 base/icinga.c                          |    7 +
 common/objects.c                       |  140 ++++++++++++++
 configure                              |    2 +-
 configure.in                           |    2 +-
 include/common.h                       |    3 +-
 include/objects.h                      |   18 ++-
 module/idoutils/.gitignore             |    1 +
 module/idoutils/Makefile.in            |    3 +-
 module/idoutils/config/idoutils.cfg.in |   12 ++
 sample-config/icinga.cfg.in            |    2 +
 xdata/xodtemplate.c                    |  327 +++++++++++++++++++++++++++++++-
 xdata/xodtemplate.h                    |   28 +++-
 15 files changed, 562 insertions(+), 7 deletions(-)

Diff:   https://git.icinga.org/?p=icinga-core.git;a=commitdiff;h=ac3bc80a87333553c84896ca70b540fd13b4187e




More information about the icinga-checkins mailing list