From a4d705917396f774138becf1224355cfb4900c48 Mon Sep 17 00:00:00 2001 From: "a.walker" Date: Mon, 29 Feb 2016 14:42:29 +0100 Subject: [PATCH] add import patched libicinga.so from folder /icinga2conf. Bug https://dev.icinga.org/issues/11248 --- .gitignore | 3 ++- icinga24.sh | 8 ++++---- run.sh | 23 +++++++++++++++-------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 172ef36..781618c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .idea icinga2 icingaweb2 -mysql \ No newline at end of file +mysql +libicinga.so diff --git a/icinga24.sh b/icinga24.sh index 463c514..84e1eb3 100644 --- a/icinga24.sh +++ b/icinga24.sh @@ -49,7 +49,7 @@ echo 'library "db_ido_mysql"' > /etc/icinga2/features-available/ido-mysql.conf echo 'object IdoMysqlConnection "ido-mysql" {' >> /etc/icinga2/features-available/ido-mysql.conf echo ' user = "root",' >> /etc/icinga2/features-available/ido-mysql.conf echo ' password = "root",' >> /etc/icinga2/features-available/ido-mysql.conf -echo ' host = "localhost",' >> /etc/icinga2/features-available/ido-mysql.conf +echo ' host = "localhost",' >> /etc/icinga2/features-available/ido-mysql.conf echo ' database = "icinga2idomysql"' >> /etc/icinga2/features-available/ido-mysql.conf echo '} ' >> /etc/icinga2/features-available/ido-mysql.conf @@ -67,7 +67,7 @@ apt-get install icinga2-classicui -y #Add User root to htpasswd.root. Pass root htpasswd -b /etc/icinga2-classicui/htpasswd.users icingaadmin $ICINGA_PASS - + #Classic UI Installation #http://localhost/icinga2-classicui/ #Login:icingaadmin @@ -119,7 +119,7 @@ service apache2 reload #/usr/share/icingaweb2/bin/icingacli setup token create -#It is required that a default timezone has been set using date.timezone in /etc/php5/apache2/php.ini. +#It is required that a default timezone has been set using date.timezone in /etc/php5/apache2/php.ini. #Change to date.timezone =Europe/Berlin echo "date.timezone =Europe/Berlin" >> /etc/php5/apache2/php.ini @@ -301,4 +301,4 @@ echo 'graphite_args_template = "&target=$target$&source=0&width=300&height=120&h sed -i 's#command_file.*#command_file=/var/run/icinga2/cmd/icinga2.cmd#g' /etc/nsca.cfg graphite-manage syncdb --noinput -unset DEBIAN_FRONTEND \ No newline at end of file +unset DEBIAN_FRONTEND diff --git a/run.sh b/run.sh index 1afba80..1e74c1f 100644 --- a/run.sh +++ b/run.sh @@ -7,6 +7,13 @@ MYSQLNEW="/mysql" #Change depricated mysql config sed -i 's/key_buffer*/key_buffer_size/g' /etc/mysql/my.cnf +#Add pached libicinga.so file. Bug: https://dev.icinga.org/issues/11248 +if [[ -s /icinga2conf/libicinga.so ]]; then + mv /usr/lib/x86_64-linux-gnu/icinga2/libicinga.so /usr/lib/x86_64-linux-gnu/icinga2/libicinga.so_old + mv /icinga2conf/libicinga.so /usr/lib/x86_64-linux-gnu/icinga2/libicinga.so +fi + + #Check folder /mysql. exit if not exist if [ ! -d "$MYSQLNEW" ]; then echo "Folder $MYSQLNEW not found. Exit" @@ -217,11 +224,11 @@ fi if [[ ! -s /icinga2conf/passive.conf ]]; then #Icinga2 Passive Check template (Host and Service) echo "template Service \"passive-service\" { " > /icinga2conf/passive.conf - echo " max_check_attempts = 1" >> /icinga2conf/passive.conf - echo " #retry_interval = 1m " >> /icinga2conf/passive.conf - echo " check_interval = 2m " >> /icinga2conf/passive.conf + echo " max_check_attempts = 2" >> /icinga2conf/passive.conf + echo " check_interval = 3m " >> /icinga2conf/passive.conf + echo " retry_interval = 0 " >> /icinga2conf/passive.conf echo " " >> /icinga2conf/passive.conf - echo " enable_active_checks = false " >> /icinga2conf/passive.conf + echo " enable_active_checks = true " >> /icinga2conf/passive.conf echo " " >> /icinga2conf/passive.conf echo " check_command = \"passive\" " >> /icinga2conf/passive.conf echo " " >> /icinga2conf/passive.conf @@ -231,11 +238,11 @@ if [[ ! -s /icinga2conf/passive.conf ]]; then echo "} " >> /icinga2conf/passive.conf echo " " >> /icinga2conf/passive.conf echo "template Host \"passive-host\" { " >> /icinga2conf/passive.conf - echo " max_check_attempts = 1 " >> /icinga2conf/passive.conf - echo " #retry_interval = 1m " >> /icinga2conf/passive.conf - echo " check_interval = 2m " >> /icinga2conf/passive.conf + echo " max_check_attempts = 2 " >> /icinga2conf/passive.conf + echo " check_interval = 3m " >> /icinga2conf/passive.conf + echo " retry_interval = 0 " >> /icinga2conf/passive.conf echo " " >> /icinga2conf/passive.conf - echo " enable_active_checks = false " >> /icinga2conf/passive.conf + echo " enable_active_checks = true " >> /icinga2conf/passive.conf echo " " >> /icinga2conf/passive.conf echo " check_command = \"passive\" " >> /icinga2conf/passive.conf echo " " >> /icinga2conf/passive.conf