diff options
Diffstat (limited to 'modules/xymon')
-rw-r--r-- | modules/xymon/templates/bb-hosts | 42 | ||||
-rw-r--r-- | modules/xymon/templates/hobbit-alerts.cfg | 8 | ||||
-rw-r--r-- | modules/xymon/templates/hobbit-clients.cfg | 8 | ||||
-rw-r--r-- | modules/xymon/templates/hobbitserver.cfg | 14 | ||||
-rw-r--r-- | modules/xymon/templates/xymon-client | 4 |
5 files changed, 38 insertions, 38 deletions
diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts index 7a3489dc..372d0fcc 100644 --- a/modules/xymon/templates/bb-hosts +++ b/modules/xymon/templates/bb-hosts @@ -13,34 +13,34 @@ # You need to define at least the Xymon server itself here. page visible Visible Services -0.0.0.0 blog.<%= domain %> # http://blog.<%= domain %> -0.0.0.0 identity.<%= domain %> # https://identity.<%= domain %> -0.0.0.0 bugs.<%= domain %> # https://bugs.<%= domain %> -0.0.0.0 ml.<%= domain %> # https://ml.<%= domain %> -0.0.0.0 www.<%= domain %> # http://www.<%= domain %> -0.0.0.0 svnweb.<%= domain %> # http://svnweb.<%= domain %> -0.0.0.0 epoll.<%= domain %> # https://epoll.<%= domain %> -0.0.0.0 planet.<%= domain %> # http://planet.<%= domain %> +0.0.0.0 blog.<%= @domain %> # http://blog.<%= @domain %> +0.0.0.0 identity.<%= @domain %> # https://identity.<%= @domain %> +0.0.0.0 bugs.<%= @domain %> # https://bugs.<%= @domain %> +0.0.0.0 ml.<%= @domain %> # https://ml.<%= @domain %> +0.0.0.0 www.<%= @domain %> # http://www.<%= @domain %> +0.0.0.0 svnweb.<%= @domain %> # http://svnweb.<%= @domain %> +0.0.0.0 epoll.<%= @domain %> # https://epoll.<%= @domain %> +0.0.0.0 planet.<%= @domain %> # http://planet.<%= @domain %> # This checks the public reverse proxy -0.0.0.0 forums.<%= domain %> # sni https://forums.<%= domain %>=<%= @nodes_ipaddr['sucuk']['ipv4'] %>/ -0.0.0.0 check.<%= domain %> # http://check.<%= domain %> -0.0.0.0 pkgsubmit.<%= domain %> # http://pkgsubmit.<%= domain %> -0.0.0.0 bcd.<%= domain %> # http://bcd.<%= domain %> -0.0.0.0 hugs.<%= domain %> # http://hugs.<%= domain %> -0.0.0.0 dashboard.<%= domain %> # http://dashboard.<%= domain %> -0.0.0.0 meetbot.<%= domain %> # http://meetbot.<%= domain %> +0.0.0.0 forums.<%= @domain %> # sni https://forums.<%= @domain %>=<%= @nodes_ipaddr['sucuk']['ipv4'] %>/ +0.0.0.0 check.<%= @domain %> # http://check.<%= @domain %> +0.0.0.0 pkgsubmit.<%= @domain %> # http://pkgsubmit.<%= @domain %> +0.0.0.0 bcd.<%= @domain %> # http://bcd.<%= @domain %> +0.0.0.0 hugs.<%= @domain %> # http://hugs.<%= @domain %> +0.0.0.0 dashboard.<%= @domain %> # http://dashboard.<%= @domain %> +0.0.0.0 meetbot.<%= @domain %> # http://meetbot.<%= @domain %> page servers Servers group-compress Marseille -212.85.158.151 sucuk.<%= domain %> # testip bbd dns smtp ssh CLIENT:xymon.<%= domain %> http://xymon.<%= domain %> -212.85.158.148 ecosse.<%= domain %> # testip ssh -212.85.158.150 fiona.<%= domain %> # testip ssh -212.85.158.152 rabbit.<%= domain %> # testip ssh -212.85.158.153 duvel.<%= domain %> # testip ssh rsync svn git ldapssl ldap +212.85.158.151 sucuk.<%= @domain %> # testip bbd dns smtp ssh CLIENT:xymon.<%= @domain %> http://xymon.<%= @domain %> +212.85.158.148 ecosse.<%= @domain %> # testip ssh +212.85.158.150 fiona.<%= @domain %> # testip ssh +212.85.158.152 rabbit.<%= @domain %> # testip ssh +212.85.158.153 duvel.<%= @domain %> # testip ssh rsync svn git ldapssl ldap group-compress VM Sucuk -192.168.122.131 friteuse.<%= domain %> # testip ssh http://forums.<%= domain %>=<%= @nodes_ipaddr['friteuse']['ipv4'] %>/ %>/ +192.168.122.131 friteuse.<%= @domain %> # testip ssh http://forums.<%= @domain %>=<%= @nodes_ipaddr['friteuse']['ipv4'] %>/ %>/ group-compress Scaleway 163.172.148.228 neru.mageia.org # testip ssh dns ldap ldapssl smtp diff --git a/modules/xymon/templates/hobbit-alerts.cfg b/modules/xymon/templates/hobbit-alerts.cfg index 763e253d..1eb8b544 100644 --- a/modules/xymon/templates/hobbit-alerts.cfg +++ b/modules/xymon/templates/hobbit-alerts.cfg @@ -121,8 +121,8 @@ builder = ['ecosse','rabbit'] builders = builder.map{|x| x + "." + domain }.join(',') %> -HOST=<%= builders %> SERVICE=cpu - MAIL=sysadmin-reports@ml.<%= domain %> DURATION>6h RECOVERED NOTICE REPEAT=3h STOP +HOST=<%= @builders %> SERVICE=cpu + MAIL=sysadmin-reports@ml.<%= @domain %> DURATION>6h RECOVERED NOTICE REPEAT=3h STOP -HOST=%.*.<%= domain %> - MAIL=sysadmin-reports@ml.<%= domain %> DURATION>5 RECOVERED NOTICE REPEAT=3h +HOST=%.*.<%= @domain %> + MAIL=sysadmin-reports@ml.<%= @domain %> DURATION>5 RECOVERED NOTICE REPEAT=3h diff --git a/modules/xymon/templates/hobbit-clients.cfg b/modules/xymon/templates/hobbit-clients.cfg index ff010681..2acf94fe 100644 --- a/modules/xymon/templates/hobbit-clients.cfg +++ b/modules/xymon/templates/hobbit-clients.cfg @@ -346,19 +346,19 @@ # The special DEFAULT section can modify the built-in defaults - this must # be placed at the end of the file. -HOST=rabbit.<%= domain %> +HOST=rabbit.<%= @domain %> DISK %.*stage2$ IGNORE # ecosse has 24 cores, is a builder, and we try to use them all -HOST=ecosse.<%= domain %> +HOST=ecosse.<%= @domain %> LOAD 36.0 48.0 # rabbit has 12 cores and mksquashfs uses all of them -HOST=rabbit.<%= domain %> +HOST=rabbit.<%= @domain %> LOAD 18.0 24.0 # duvel has 24 cores, dont trigger alarms too soon -HOST=duvel.<%= domain %> +HOST=duvel.<%= @domain %> LOAD 18.0 24.0 DISK /var/lib/binrepo 95 98 DISK /var/www 95 98 diff --git a/modules/xymon/templates/hobbitserver.cfg b/modules/xymon/templates/hobbitserver.cfg index a5a7aacf..f2da8a6a 100644 --- a/modules/xymon/templates/hobbitserver.cfg +++ b/modules/xymon/templates/hobbitserver.cfg @@ -1,15 +1,15 @@ # NB : Even though it might look like a shell-script, it is NOT. # -BBSERVERROOT="<%= lib_dir %>/xymon" # Where Xymon is installed - holds the server and bbvar sub-dirs. +BBSERVERROOT="<%= @lib_dir %>/xymon" # Where Xymon is installed - holds the server and bbvar sub-dirs. BBSERVERLOGS="/var/log/xymon" # Directory for server logs. The hobbit user must have write-access here. -HOBBITCLIENTHOME="<%= lib_dir %>/xymon/client" # BBHOME directory for the client +HOBBITCLIENTHOME="<%= @lib_dir %>/xymon/client" # BBHOME directory for the client -BBSERVERHOSTNAME="sucuk.<%= domain %>" # The hostname of your server -BBSERVERIP="<%= ipaddress %>" # The IP-address of your server. Use the real one, not 127.0.0.1 . +BBSERVERHOSTNAME="sucuk.<%= @domain %>" # The hostname of your server +BBSERVERIP="<%= @ipaddress %>" # The IP-address of your server. Use the real one, not 127.0.0.1 . BBSERVEROS="linux" # The operating system of your server. linux,freebsd,solaris,hpux,aix,osf -BBSERVERWWWNAME="xymon.<%= domain %>" # The name used for this hosts' webserver +BBSERVERWWWNAME="xymon.<%= @domain %>" # The name used for this hosts' webserver BBSERVERWWWURL="/xymon" # The top URL for the Xymon webpages BBSERVERCGIURL="/xymon-cgi" # The URL for the Xymon CGI scripts. BBSERVERSECURECGIURL="/xymon-seccgi" # The URL for the secured Xymon CGI scripts. @@ -73,7 +73,7 @@ CGIBINURL="$BBSERVERCGIURL" # URL prefix for the Xymon CGI-scripts - /cgi-bin SECURECGIBINURL="$BBSERVERSECURECGIURL" # URL prefix for the secured Xymon CGI-scripts - /cgi-secure # Locations of system-wide files and directories -BBHOME="<%= lib_dir %>/xymon/server" # The Xymon server directory, where programs and configurations go. +BBHOME="<%= @lib_dir %>/xymon/server" # The Xymon server directory, where programs and configurations go. BBTMP="$BBHOME/tmp" # Directory used for temporary files. BBHOSTS="$BBHOME/etc/bb-hosts" # The bb-hosts file BB="$BBHOME/bin/bb" # The 'bb' client program @@ -99,7 +99,7 @@ BBHOSTHISTLOG="TRUE" # Save a log of all events for a host (not used by any t SAVESTATUSLOG="TRUE" # Save the detailed status log each time the status changes. # For the hobbitd_alert module -FROM="root@<%= domain %>" +FROM="root@<%= @domain %>" MAILC="mail -r $FROM" # Command used to send an e-mail with no subject MAIL="$MAILC -s" # Command used to send an e-mail with a subject SVCCODES="disk:100,cpu:200,procs:300,svcs:350,msgs:400,conn:500,http:600,dns:800,smtp:725,telnet:723,ftp:721,pop:810,pop3:810,pop-3:810,ssh:722,imap:843,ssh1:722,ssh2:722,imap2:843,imap3:843,imap4:843,pop2:809,pop-2:809,nntp:819,test:901" diff --git a/modules/xymon/templates/xymon-client b/modules/xymon/templates/xymon-client index ae54b2f3..84dbfad1 100644 --- a/modules/xymon/templates/xymon-client +++ b/modules/xymon/templates/xymon-client @@ -11,9 +11,9 @@ # HOBBITSERVERS="10.0.0.1 192.168.1.1" <% if scope.function_versioncmp([lsbdistrelease, '5']) >= 0 %> -XYMONSERVERS="<%= server %>" +XYMONSERVERS="<%= @server %>" <% else %> -HOBBITSERVERS="<%= server %>" +HOBBITSERVERS="<%= @server %>" <% end %> # The defaults usually suffice for the rest of this file, |