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

Update icinga2-setup-agent to use zones.conf. 

Fixes #6367
This commit is contained in:
Gunnar Beutner 2014-05-31 08:17:10 +02:00
parent d11231d49d
commit eae6e75f94
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pki/icinga2-setup-agent.cmake
View File

@ -117,7 +117,7 @@ if [ -n "$1" ]; then
base64 -d < $1 | tar -C $ICINGA2CONFIG/pki/ -zx || exit 1 base64 -d < $1 | tar -C $ICINGA2CONFIG/pki/ -zx || exit 1
chown @ICINGA2_USER@:@ICINGA2_GROUP@ $ICINGA2CONFIG/pki/* || exit 1 chown @ICINGA2_USER@:@ICINGA2_GROUP@ $ICINGA2CONFIG/pki/* || exit 1
echo "Setting up api.configuration..." echo "Setting up api.conf..."
cat >$ICINGA2CONFIG/features-available/api.conf <<AGENT cat >$ICINGA2CONFIG/features-available/api.conf <<AGENT
/** /**
* The API listener is used for distributed monitoring setups. * The API listener is used for distributed monitoring setups.
@ -131,27 +131,37 @@ object ApiListener "api" {
bind_port = "$listener_port" bind_port = "$listener_port"
} }
AGENT
echo "Setting up zones.conf..."
cat >$ICINGA2CONFIG/zones.conf <<ZONES
/*
* Endpoint and Zone configuration for a cluster setup
* This local example requires `NodeName` defined in
* constants.conf.
*/
object Endpoint NodeName { object Endpoint NodeName {
host = NodeName host = NodeName
} }
object Zone ZoneName { object Zone ZoneName {
AGENT ZONES
if [ "$upstream_connect" = "y" ]; then if [ "$upstream_connect" = "y" ]; then
cat >>$ICINGA2CONFIG/features-available/api.conf <<AGENT cat >>$ICINGA2CONFIG/features-available/api.conf <<ZONES
parent = "$upstream_name" parent = "$upstream_name"
AGENT ZONES
fi fi
cat >>$ICINGA2CONFIG/features-available/api.conf <<AGENT cat >>$ICINGA2CONFIG/features-available/api.conf <<ZONES
endpoints = [ NodeName ] endpoints = [ NodeName ]
} }
AGENT ZONES
if [ "$upstream_connect" = "y" ]; then if [ "$upstream_connect" = "y" ]; then
cat >>$ICINGA2CONFIG/features-available/api.conf <<AGENT cat >>$ICINGA2CONFIG/features-available/api.conf <<ZONES
object Endpoint "$upstream_name" { object Endpoint "$upstream_name" {
host = "$upstream_host" host = "$upstream_host"
port = "$upstream_port" port = "$upstream_port"
@ -160,7 +170,7 @@ object Endpoint "$upstream_name" {
object Zone "$upstream_name" { object Zone "$upstream_name" {
endpoints = [ "$upstream_name" ] endpoints = [ "$upstream_name" ]
} }
AGENT ZONES
fi fi
sed -i "s/NodeName = \"localhost\"/NodeName = \"$name\"/" /etc/icinga2/constants.conf sed -i "s/NodeName = \"localhost\"/NodeName = \"$name\"/" /etc/icinga2/constants.conf