tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7527 from Icinga/bugfix/checkable-command-endpoint-zone 

Improve error message/docs for command endpoints requiring a zone
This commit is contained in:
Michael Friedrich 2019-09-23 10:16:42 +02:00 committed by GitHub
parent b25852d42a b837b505e6
commit cd71b97249
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etc/icinga2/zones.d/README
View File

@ -1,2 +1,11 @@
This directory contains configuration files for cluster zones. If you're not This directory contains zone directories used for
running a cluster you can safely ignore this directory. distributed monitoring with the cluster config sync.
Use this for the following scenarios:
- Master with Agents
- HA Masters with Agents
- Masters, Satellites and Agents
Please check the documentation for more details:
https://icinga.com/docs/icinga2/latest/doc/06-distributed-monitoring/

2
lib/icinga/checkable.cpp
View File

@ -53,7 +53,7 @@ void Checkable::OnAllConfigLoaded()
} }
} else { } else {
BOOST_THROW_EXCEPTION(ValidationError(this, { "command_endpoint" }, BOOST_THROW_EXCEPTION(ValidationError(this, { "command_endpoint" },
"Command endpoint must not be set.")); "Checkable with command endpoint requires a zone. Please check the troubleshooting documentation."));
} }
} }
} }