View | Details | Raw Unified | Return to bug 18828 | Differences between
and this patch

Collapse All | Expand All

(-)/home/mueller/bug/svn/18828/univention-nagios/debian/changelog (+6 lines)
 Lines 1-3    Link Here 
1
univention-nagios (4.0.13-3) unstable; urgency=low
2
3
  * set normal_check_interval to 150 and retry_check_interval to 10 for UNIVENTION_JOINSTATUS (Bug #18828)
4
5
 -- Martin Müller <packages@univention.de>  Tue, 28 Jun 2011 17:11:00 +0200
6
1
univention-nagios (4.0.13-2) unstable; urgency=low
7
univention-nagios (4.0.13-2) unstable; urgency=low
2
8
3
  * switch from check_univention_winbind to
9
  * switch from check_univention_winbind to
(-)/home/mueller/bug/svn/18828/univention-nagios/26univention-nagios-server.inst (-2 / +7 lines)
 Lines 30-36    Link Here 
30
# /usr/share/common-licenses/AGPL-3; if not, see
30
# /usr/share/common-licenses/AGPL-3; if not, see
31
# <http://www.gnu.org/licenses/>.
31
# <http://www.gnu.org/licenses/>.
32
32
33
VERSION=3
33
VERSION=4
34
. /usr/share/univention-join/joinscripthelper.lib
34
. /usr/share/univention-join/joinscripthelper.lib
35
joinscript_init
35
joinscript_init
36
36
 Lines 101-108    Link Here 
101
101
102
univention-directory-manager nagios/service create $@ --ignore_exists --position="cn=nagios,$ldap_base" --set name="UNIVENTION_NMBD" --set description="Default Service: check if nmbd is functional" --set checkCommand="check_univention_nmbd" --set checkArgs="" --set useNRPE="1" --set normalCheckInterval="15" --set retryCheckInterval="2" --set maxCheckAttempts="2" --set checkPeriod="24x7" --set notificationOptionWarning="1" --set notificationOptionCritical="1" --set notificationOptionUnreachable="1" --set notificationOptionRecovered="1" --set notificationPeriod="24x7"
102
univention-directory-manager nagios/service create $@ --ignore_exists --position="cn=nagios,$ldap_base" --set name="UNIVENTION_NMBD" --set description="Default Service: check if nmbd is functional" --set checkCommand="check_univention_nmbd" --set checkArgs="" --set useNRPE="1" --set normalCheckInterval="15" --set retryCheckInterval="2" --set maxCheckAttempts="2" --set checkPeriod="24x7" --set notificationOptionWarning="1" --set notificationOptionCritical="1" --set notificationOptionUnreachable="1" --set notificationOptionRecovered="1" --set notificationPeriod="24x7"
103
103
104
univention-directory-manager nagios/service create $@ --ignore_exists --position="cn=nagios,$ldap_base" --set name="UNIVENTION_JOINSTATUS" --set description="Default Service: check if system has been joined successfully" --set checkCommand="check_univention_joinstatus" --set checkArgs="" --set useNRPE="1" --set normalCheckInterval="1440" --set retryCheckInterval="480" --set maxCheckAttempts="1" --set checkPeriod="24x7" --set notificationOptionWarning="1" --set notificationOptionCritical="1" --set notificationOptionUnreachable="1" --set notificationOptionRecovered="1" --set notificationPeriod="24x7"
104
#update values of normalCheckInterval and retryCheckInterval (Bug #18828)
105
if [ "$(udm nagios/service list --filter name=UNIVENTION_JOINSTATUS | egrep -c '^[ \t]+retryCheckInterval:[ \t]+480$|^[ \t]+normalCheckInterval:[ \t]+1440$')" = '2' ] ; then
106
	udm nagios/service modify --dn "cn=UNIVENTION_JOINSTATUS,cn=nagios,$ldap_base" --set normalCheckInterval="180" --set retryCheckInterval="30"
107
fi
105
108
109
univention-directory-manager nagios/service create $@ --ignore_exists --position="cn=nagios,$ldap_base" --set name="UNIVENTION_JOINSTATUS" --set description="Default Service: check if system has been joined successfully" --set checkCommand="check_univention_joinstatus" --set checkArgs="" --set useNRPE="1" --set normalCheckInterval="180" --set retryCheckInterval="30" --set maxCheckAttempts="1" --set checkPeriod="24x7" --set notificationOptionWarning="1" --set notificationOptionCritical="1" --set notificationOptionUnreachable="1" --set notificationOptionRecovered="1" --set notificationPeriod="24x7"
110
106
/etc/init.d/nagios2 restart 2> /dev/null > /dev/null || true
111
/etc/init.d/nagios2 restart 2> /dev/null > /dev/null || true
107
112
108
univention-directory-manager container/cn create $@ --ignore_exists --position cn=univention,$ldap_base --set name=console
113
univention-directory-manager container/cn create $@ --ignore_exists --position cn=univention,$ldap_base --set name=console

Return to bug 18828