tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,885 Commits 347 Branches 117 Tags 190 MiB
Commit Graph

204 Commits

Author SHA1 Message Date
Gerd von Egidy 9667fb40b7 Improve the systemd service definition file 
- put "Icinga" back in the "Description=" field as usually only the description is displayed on unit start/stop or shown in syslog
- add dependency to carbon-cache.service
(systemd only cares about dependencies if the respective services are enabled, so this does not hurt if someone does not have carbon-cache
installed at all or is not using it at the moment)

fixes #6551

Signed-off-by: Gunnar Beutner <gunnar.beutner@netways.de>
 2014-06-24 13:40:44 +02:00
Gerd von Egidy 933e2480fc add new cmake option INSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT requested for Gentoo packaging 
fixes #6498

Signed-off-by: Gunnar Beutner <gunnar.beutner@netways.de>
 2014-06-24 13:39:38 +02:00
Gerd von Egidy 3ac3c91499 Separate CMakeLists.txt for etc/initsystem. 
Refs #6491
 2014-06-16 01:58:59 +02:00
Gerd von Egidy fe62fb90e6 Don't call check_run in the initscript, this function is gone. 
Refs #4794
 2014-06-15 20:08:45 +02:00
Gerd von Egidy dd9b7bcd73 Move the sysdefines.conf file to /etc/sysconfig. 
As /etc/sysconfig is distro specific, the filename used can be configured via the CMake parameter
ICINGA2_SYSCONFIGFILE

Refs #4794
 2014-06-15 19:47:27 +02:00
Sam Kottler 4568f68f90 Remove mention of icinga in the description since it's already in the name and might cause versioning confusion 
Refs #4794
 2014-06-15 17:00:30 +02:00
Gerd von Egidy 4ebde46520 Move code preparing dirs and permissions to icinga2-prepare-dirs, use this for SysV-Init and systemd. 
Refs #4794

Conflicts:
	etc/initsystem/icinga2.init.d.cmake
 2014-06-15 16:25:50 +02:00
Gerd von Egidy ef49658474 Unify resources for SysV-Init and systemd. 
- Move system-specific defines like paths and usernames to /etc/icinga2/sysdefines.conf
  Do not use /etc/sysconfig for this as per suggestion on the systemd mailinglist: it is RedHat-specific
- Use /etc/icinga2/sysdefines.conf in SysV-Init and systemd
- Move both the sources of the SysV-Initscript and the systemd-service definition to etc/initsystem

Refs #4794

Conflicts:
	etc/initsystem/icinga2.init.d.cmake
 2014-06-15 15:49:13 +02:00
Gerd von Egidy 59a1a133c3 Reloading with systemd is fixed now. 
Refs #4794
 2014-06-15 15:32:13 +02:00
Gerd von Egidy 7bfd2f1ea2 Systemd can't resolve variables recursively. 
Refs #4794
 2014-06-15 15:31:32 +02:00
Gerd von Egidy 954ceb3c6a Fix CMake escaping. 
Refs #4794
 2014-06-15 15:31:10 +02:00
Gerd von Egidy 69c06115d2 First try at a systemd service definition file, install it from CMake. 
Native systemd support is enabled with cmake -DUSE_SYSTEMD=ON

Refs #4794
 2014-06-15 15:30:53 +02:00
Tim Hardeck 74751a4e22 Fix logrotate should rotate log files as icinga user 
fixes #6477
 2014-06-13 09:47:26 +02:00
Michael Friedrich 6bebdddf98 Less verbose start output using the initscript 
All output is dumped to startup.log and only shown in case of
'checkconfig' as parameter, but not during a reload/restart.

Furtermore some additional formatting to make it fit line by line.

fixes #5822
 2014-06-12 16:05:45 +02:00
Michael Friedrich d9289add62 Documentation: Emphasize on global zone on all nodes 
refs #6254
 2014-06-12 14:33:59 +02:00
Michael Friedrich 318136257f Remove default example config. 
Refs #6254
 2014-06-11 21:28:01 +02:00
Michael Friedrich a3b2b1d780 Add global zone identifier for global object/template configuration. 
Refs #6254
 2014-06-11 16:49:30 +02:00
Michael Friedrich 63df43eea2 Revert "Fix configuration error on missing NodeName." 
This reverts commit 72ef0d31fd.

Refs #6393
 2014-06-04 10:23:39 +02:00
Michael Friedrich 72ef0d31fd Fix configuration error on missing NodeName. 
Fixes #6393
 2014-06-03 14:54:21 +02:00
Michael Friedrich 25e4e81e50 Yet another kernel removal fix. 
Refs #6369
 2014-06-02 14:54:59 +02:00
Michael Friedrich 26f0ef7657 Drop missing file from install. 
Refs #6369
 2014-06-02 14:06:48 +02:00
Michael Friedrich 9225f7ed00 Drop check_kernel in favor of check_running_kernel, add plugin command. 
Refs #6369
 2014-06-02 13:34:35 +02:00
Gunnar Beutner 32e6e6ff04 Rewrite the check_kernel script and implement support for RHEL, Fedora and Ubuntu. 
Fixes #6332
 2014-05-31 09:13:01 +02:00
Carlos Cesario a7a234a600 Add missing file icingastatus.conf. 
Fixes #6308

Signed-off-by: Michael Friedrich <michael.friedrich@netways.de>
 2014-05-26 16:07:37 +02:00
Gunnar Beutner a222442e70 Comment out the NodeName constant. 
Fixes #6306
 2014-05-26 14:40:57 +02:00
Gunnar Beutner 7183495d89 Make username in the logrotate config configurable. 
Fixes #6295
 2014-05-26 09:01:23 +02:00
Michael Friedrich e873ce6b9c Fix wrong service apply rule examples for ping{4,6}. 
Refs #6266
 2014-05-22 23:05:39 +02:00
Michael Friedrich 4df2721d4e Documentation: Fix Getting Started based on revamped example configuration. 
Refs #6266
 2014-05-22 22:47:32 +02:00
Michael Friedrich 0eec68aec4 Emphasize on apply rules in example config. 
- move all templates into templates.conf
- move service apply ping{4,6} to services.conf
- apply notifications based on vars.sla == "24x7"
- apply scheduled downtime based on host/service name
- apply ping{4,6} based on hostgroup membership
- keep hosts/localhost for real local configuration

Fixes #6266
 2014-05-22 22:19:41 +02:00
Michael Friedrich ec7d9b0f3d Move zone specific configuration to zones.conf included in icinga2.conf. 
Fixes #6208
 2014-05-22 21:00:42 +02:00
Michael Friedrich 3f361bcb05 Fix checkconfig error message. 
Fixes #6269
 2014-05-22 17:26:56 +02:00
Gunnar Beutner 7223ae1dc2 Update documentation. 
Refs #5795
 2014-05-22 13:33:54 +02:00
Gunnar Beutner 95d9b6f221 Fix invalid logrotate option. 
Fixes #6265
 2014-05-22 12:02:11 +02:00
Gunnar Beutner 2350593ef0 Fix logrotate config. 
Fixes #6229
 2014-05-22 11:22:30 +02:00
Gunnar Beutner cffe3cf57c Simplify "ignore where" condition in the example config. 
Refs #5795
 2014-05-18 08:59:13 +02:00
Gunnar Beutner 34abe21420 Add missing file. 
Refs #6191
 2014-05-13 13:26:57 +02:00
Gunnar Beutner 0d36cc8d5f Implement support for the zones.d config directory. 
Refs #6191
 2014-05-13 13:19:43 +02:00
Gunnar Beutner ff3de818f6 Move kernel check to the Debian package directory. 
Refs #6012
 2014-05-13 07:00:22 +02:00
Michael Friedrich 4b75d8f8c8 Disable non-working kernel check in sample config. 
Refs #6012
 2014-05-13 00:15:05 +02:00
Michael Friedrich d06d4f2540 Include monitoring plugin commands seperately. 
Fixes #6130
 2014-05-10 19:02:51 +02:00
Gunnar Beutner 3926b68c04 Decrease default check intervals. 
Refs #6107
 2014-05-08 13:56:28 +02:00
Gunnar Beutner 656d6ff13a Update scripts and example config. 
Refs #6107
 2014-05-08 12:17:21 +02:00
Gunnar Beutner 45270f1bb8 Refactor the agent and cluster components. 
Refs #6107
 2014-05-08 09:13:04 +02:00
Michael Friedrich 2cfc0afc8a icinga2 init script should start/stop mysql/pgsql. 
Fixes #5479
 2014-04-29 17:26:39 +02:00
Gerd von Egidy 3a294bbd5d Fork new process from previous daemon on reload. 
The previously planned logic of forking a new daemon from the reload-process didn't work with
systemd: systemd does not allow long-running processes started from within the reload command.

Replaces parameter --reload with --reload-internal which is used when starting the new daemon.

Refs #5788
 2014-04-29 10:34:01 +02:00
Gerd von Egidy 33bd909b71 Add --reload command-line parameter. 
Refs #5788
 2014-04-29 10:34:01 +02:00
Gerd von Egidy 19afcd894a Split ConfigItem::ActivateItems() into ConfigItem::ValidateItems() and ConfigItem::ActivateItems(). 
Also removes the -Z commandline parameter: won't be needed when this feature is done.

Refs #5788
 2014-04-29 10:34:01 +02:00
Gunnar Beutner d617c7b1f6 Implement support for optional command arguments. 
Fixes #5933
 2014-04-26 15:03:38 +02:00
Michael Friedrich 7a147d268e Add group assign/ignore rules. 
Fixes #5910
 2014-04-23 15:50:00 +02:00
Michael Friedrich 0e42a5724b Add apply ping{4,6} to generic-host example config again. 
Fixes #6056
 2014-04-23 14:58:44 +02:00