From 7a3665be7452934eaed5054afb988fb2b726b1f2 Mon Sep 17 00:00:00 2001 From: Christian Lauf Date: Tue, 23 Jul 2024 19:22:34 +0200 Subject: [PATCH 1/8] Update 10-icinga-template-library.md Explicitly name the config-sync check feature of the icinga check, as before this was a little bit too undocumented making it unknown to me. Also mention where the check has to executed in order to bring the desired results. --- doc/10-icinga-template-library.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md index 2c64779d342..f72771eadd6 100644 --- a/doc/10-icinga-template-library.md +++ b/doc/10-icinga-template-library.md @@ -75,8 +75,10 @@ plugin scripts. ### icinga -Check command for the built-in `icinga` check. This check returns performance -data for the current Icinga instance, reports as warning if the last reload failed and optionally allows for minimum version checks. +Check command for the built-in `icinga` check. This check returns performance data for the current Icinga instance, +reports as warning if the last reload/config-sync failed and optionally allows for minimum version checks. + +For the config sync check to work this must be executed on Satellites/Agents. Custom variables passed as [command parameters](03-monitoring-basics.md#command-passing-parameters): From 92a0488471753f87f44b617346cfbd0362ca21d7 Mon Sep 17 00:00:00 2001 From: Christian Lauf Date: Tue, 23 Jul 2024 19:29:01 +0200 Subject: [PATCH 2/8] Update 15-troubleshooting.md Add 4h typical error point for configuration stored outside of /etc/icinga2/zones.d. For when a non-distributed setup was migrated to a distributed setup. Also link to the internal icinga CheckCommand to promote its existance. --- doc/15-troubleshooting.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/15-troubleshooting.md b/doc/15-troubleshooting.md index 4cc733854f7..4ccf4bb2b9a 100644 --- a/doc/15-troubleshooting.md +++ b/doc/15-troubleshooting.md @@ -1640,6 +1640,9 @@ Typical errors are: * The api feature doesn't [accept config](06-distributed-monitoring.md#distributed-monitoring-top-down-config-sync). This is logged into `/var/lib/icinga2/icinga2.log`. * The received configuration zone is not configured in [zones.conf](04-configuration.md#zones-conf) and Icinga denies it. This is logged into `/var/lib/icinga2/icinga2.log`. * The satellite/agent has local configuration in `/etc/icinga2/zones.d` and thinks it is authoritive for this zone. It then denies the received update. Purge the content from `/etc/icinga2/zones.d`, `/var/lib/icinga2/api/zones/*` and restart Icinga to fix this. +* Configuration parts stored outside of `/etc/icinga2/zones.d` on the master, for example a constant in /etc/icinga2/constants.conf, which are then missing on the satellite/agent. + +Note that if set up, the [internal icinga CheckCommand](10-icinga-template-library.md#icinga-) will notify you in case the config sync wasn't successful. #### New configuration does not trigger a reload From bb25ba3ff5d2797b95cc6c6d5d4fc64e342164f1 Mon Sep 17 00:00:00 2001 From: Christian Lauf Date: Tue, 23 Jul 2024 19:30:33 +0200 Subject: [PATCH 3/8] Update 15-troubleshooting.md Remove "-" from link --- doc/15-troubleshooting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/15-troubleshooting.md b/doc/15-troubleshooting.md index 4ccf4bb2b9a..166700072a4 100644 --- a/doc/15-troubleshooting.md +++ b/doc/15-troubleshooting.md @@ -1642,7 +1642,7 @@ Typical errors are: * The satellite/agent has local configuration in `/etc/icinga2/zones.d` and thinks it is authoritive for this zone. It then denies the received update. Purge the content from `/etc/icinga2/zones.d`, `/var/lib/icinga2/api/zones/*` and restart Icinga to fix this. * Configuration parts stored outside of `/etc/icinga2/zones.d` on the master, for example a constant in /etc/icinga2/constants.conf, which are then missing on the satellite/agent. -Note that if set up, the [internal icinga CheckCommand](10-icinga-template-library.md#icinga-) will notify you in case the config sync wasn't successful. +Note that if set up, the [internal icinga CheckCommand](10-icinga-template-library.md#icinga) will notify you in case the config sync wasn't successful. #### New configuration does not trigger a reload From 71fb1e40174fa359539ab172a2cac46e729b6a14 Mon Sep 17 00:00:00 2001 From: Christian Lauf Date: Tue, 23 Jul 2024 19:35:46 +0200 Subject: [PATCH 4/8] Revert "Update 15-troubleshooting.md" This reverts commit bb25ba3ff5d2797b95cc6c6d5d4fc64e342164f1. --- doc/15-troubleshooting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/15-troubleshooting.md b/doc/15-troubleshooting.md index 166700072a4..4ccf4bb2b9a 100644 --- a/doc/15-troubleshooting.md +++ b/doc/15-troubleshooting.md @@ -1642,7 +1642,7 @@ Typical errors are: * The satellite/agent has local configuration in `/etc/icinga2/zones.d` and thinks it is authoritive for this zone. It then denies the received update. Purge the content from `/etc/icinga2/zones.d`, `/var/lib/icinga2/api/zones/*` and restart Icinga to fix this. * Configuration parts stored outside of `/etc/icinga2/zones.d` on the master, for example a constant in /etc/icinga2/constants.conf, which are then missing on the satellite/agent. -Note that if set up, the [internal icinga CheckCommand](10-icinga-template-library.md#icinga) will notify you in case the config sync wasn't successful. +Note that if set up, the [internal icinga CheckCommand](10-icinga-template-library.md#icinga-) will notify you in case the config sync wasn't successful. #### New configuration does not trigger a reload From f609912acae1f1f85b97ca2d5d8a4dce7adecbee Mon Sep 17 00:00:00 2001 From: Christian Lauf Date: Wed, 24 Jul 2024 12:19:32 +0200 Subject: [PATCH 5/8] Update AUTHORS Add myself to AUTHORS --- AUTHORS | 1 + 1 file changed, 1 insertion(+) diff --git a/AUTHORS b/AUTHORS index b661897b6cc..b1ce4a2e16d 100644 --- a/AUTHORS +++ b/AUTHORS @@ -52,6 +52,7 @@ Christian Gut Christian Harke Christian Jonak Christian Lehmann +Christian Lauf Christian Loos Christian Schmidt Christopher Peterson <3893680+cspeterson@users.noreply.github.com> From 44a23a098c791c2d4790a5f90fe59cdd96c772c7 Mon Sep 17 00:00:00 2001 From: Christian Lauf Date: Wed, 24 Jul 2024 12:22:31 +0200 Subject: [PATCH 6/8] Update doc/15-troubleshooting.md Co-authored-by: alvar <8402811+oxzi@users.noreply.github.com> --- doc/15-troubleshooting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/15-troubleshooting.md b/doc/15-troubleshooting.md index 4ccf4bb2b9a..53849c93bdb 100644 --- a/doc/15-troubleshooting.md +++ b/doc/15-troubleshooting.md @@ -1642,7 +1642,7 @@ Typical errors are: * The satellite/agent has local configuration in `/etc/icinga2/zones.d` and thinks it is authoritive for this zone. It then denies the received update. Purge the content from `/etc/icinga2/zones.d`, `/var/lib/icinga2/api/zones/*` and restart Icinga to fix this. * Configuration parts stored outside of `/etc/icinga2/zones.d` on the master, for example a constant in /etc/icinga2/constants.conf, which are then missing on the satellite/agent. -Note that if set up, the [internal icinga CheckCommand](10-icinga-template-library.md#icinga-) will notify you in case the config sync wasn't successful. +Note that if set up, the [built-in icinga CheckCommand](10-icinga-template-library.md#icinga) will notify you in case the config sync wasn't successful. #### New configuration does not trigger a reload From a64104a983140558d64ac9b439e1fb704e77bbaf Mon Sep 17 00:00:00 2001 From: Christian Lauf Date: Wed, 24 Jul 2024 12:22:39 +0200 Subject: [PATCH 7/8] Update doc/10-icinga-template-library.md Co-authored-by: alvar <8402811+oxzi@users.noreply.github.com> --- doc/10-icinga-template-library.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/10-icinga-template-library.md b/doc/10-icinga-template-library.md index f72771eadd6..f876df4d63e 100644 --- a/doc/10-icinga-template-library.md +++ b/doc/10-icinga-template-library.md @@ -76,9 +76,9 @@ plugin scripts. ### icinga Check command for the built-in `icinga` check. This check returns performance data for the current Icinga instance, -reports as warning if the last reload/config-sync failed and optionally allows for minimum version checks. +reports as warning if the last reload or config sync failed and optionally allows for minimum version checks. -For the config sync check to work this must be executed on Satellites/Agents. +For the config sync check to work, it must be run on the satellite or agent. Custom variables passed as [command parameters](03-monitoring-basics.md#command-passing-parameters): From aad252e3294f10e5de739075fbb7f52bace5b617 Mon Sep 17 00:00:00 2001 From: Christian Lauf Date: Wed, 24 Jul 2024 12:22:45 +0200 Subject: [PATCH 8/8] Update doc/15-troubleshooting.md Co-authored-by: alvar <8402811+oxzi@users.noreply.github.com> --- doc/15-troubleshooting.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/15-troubleshooting.md b/doc/15-troubleshooting.md index 53849c93bdb..2998cceeb4b 100644 --- a/doc/15-troubleshooting.md +++ b/doc/15-troubleshooting.md @@ -1640,7 +1640,7 @@ Typical errors are: * The api feature doesn't [accept config](06-distributed-monitoring.md#distributed-monitoring-top-down-config-sync). This is logged into `/var/lib/icinga2/icinga2.log`. * The received configuration zone is not configured in [zones.conf](04-configuration.md#zones-conf) and Icinga denies it. This is logged into `/var/lib/icinga2/icinga2.log`. * The satellite/agent has local configuration in `/etc/icinga2/zones.d` and thinks it is authoritive for this zone. It then denies the received update. Purge the content from `/etc/icinga2/zones.d`, `/var/lib/icinga2/api/zones/*` and restart Icinga to fix this. -* Configuration parts stored outside of `/etc/icinga2/zones.d` on the master, for example a constant in /etc/icinga2/constants.conf, which are then missing on the satellite/agent. +* Configuration parts stored outside of `/etc/icinga2/zones.d` on the master, for example a constant in `/etc/icinga2/constants.conf`, are then missing on the satellite/agent. Note that if set up, the [built-in icinga CheckCommand](10-icinga-template-library.md#icinga) will notify you in case the config sync wasn't successful.