aboutsummaryrefslogtreecommitdiffstats
path: root/modules/xymon/templates
diff options
context:
space:
mode:
Diffstat (limited to 'modules/xymon/templates')
-rw-r--r--modules/xymon/templates/bb-hosts41
-rw-r--r--modules/xymon/templates/client-local.cfg2
-rw-r--r--modules/xymon/templates/hobbit-alerts.cfg6
-rw-r--r--modules/xymon/templates/hobbit-clients.cfg19
-rw-r--r--modules/xymon/templates/hobbitserver.cfg6
-rw-r--r--modules/xymon/templates/xymon-client15
6 files changed, 46 insertions, 43 deletions
diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts
index 4d0370f3..140932b5 100644
--- a/modules/xymon/templates/bb-hosts
+++ b/modules/xymon/templates/bb-hosts
@@ -13,37 +13,40 @@
# 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 blog.<%= domain %> # sni https://blog.<%= domain %>/en/
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 www.<%= domain %> # https://www.<%= domain %>
+0.0.0.0 svnweb.<%= domain %> # https://svnweb.<%= domain %>
0.0.0.0 epoll.<%= domain %> # https://epoll.<%= domain %>
-0.0.0.0 transifex.<%= domain %> # https://transifex.<%= domain %>
-0.0.0.0 planet.<%= domain %> # http://planet.<%= domain %>
-0.0.0.0 forums.<%= domain %> # https://forums.<%= domain %>=212.85.158.146/
-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 planet.<%= domain %> # sni https://planet.<%= domain %>/en/
+# 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 %> # https://check.<%= domain %>
+0.0.0.0 madb.<%= domain %> # https://madb.mageia.org
+0.0.0.0 pkgsubmit.<%= domain %> # sni https://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 meetbot.<%= domain %> # sni https://meetbot.<%= domain %>
page servers Servers
group-compress Marseille
-212.85.158.146 alamut.<%= domain %> # testip bbd dns smtp ssh CLIENT:xymon.<%= domain %> http://xymon.<%= domain %>
-212.85.158.147 valstar.<%= 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.149 jonund.<%= domain %> # testip ssh
212.85.158.150 fiona.<%= domain %> # testip ssh
-212.85.158.151 sucuk.<%= 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 Gandi
-95.142.164.207 krampouezh.<%= domain %> # ssh dns ldap ldapssl smtp
-217.70.188.116 champagne.<%= domain %> # ssh
+group-compress VM Sucuk
+192.168.122.131 friteuse.<%= domain %> # testip ssh http://forums.<%= domain %>=<%= @nodes_ipaddr['friteuse']['ipv4'] %>/ %>/
-group-compress VM Alamut
-192.168.122.131 friteuse.<%= domain %> # testip ssh http://forums.<%= domain %>=192.168.122.131/ https://forums.<%= domain %>=192.168.122.131/
+group-compress Scaleway
+163.172.148.228 neru.mageia.org # testip ssh dns ldap ldapssl smtp
+163.172.201.211 madb.mageia.org # testip
+
+# NOTE: lines with IPv6 addresses are ignored in xymon versions before 4.4 or 5.0
+group-compress Oracle cloud
+2603:c026:c101:f00::1:1 ociaa1.<%= domain %> # testip ssh
diff --git a/modules/xymon/templates/client-local.cfg b/modules/xymon/templates/client-local.cfg
index e42ce467..44428778 100644
--- a/modules/xymon/templates/client-local.cfg
+++ b/modules/xymon/templates/client-local.cfg
@@ -99,7 +99,7 @@ ignore MARK
log:/var/log/messages:10240
ignore MARK
-[mandrake]
+[mageia]
log:/var/log/messages:10240
ignore MARK
diff --git a/modules/xymon/templates/hobbit-alerts.cfg b/modules/xymon/templates/hobbit-alerts.cfg
index 36ff44a4..763e253d 100644
--- a/modules/xymon/templates/hobbit-alerts.cfg
+++ b/modules/xymon/templates/hobbit-alerts.cfg
@@ -74,10 +74,10 @@
# TIME - rule matching an alert by the time-of-day. This
# is specified as the DOWNTIME timespecification
# in the bb-hosts file (see bb-hosts(5)).
-# DURATION - Rule matcing an alert if the event has lasted
+# DURATION - Rule matching an alert if the event has lasted
# longer/shorter than the given duration. E.g.
# DURATION>10 (lasted longer than 10 minutes) or
-# DURARION<30 (only sends alerts the first 30 minutes).
+# DURATION<30 (only sends alerts the first 30 minutes).
# RECOVERED - Rule matches if the alert has recovered from an
# alert state.
# NOTICE - Rule matches if the message is a "notify" message
@@ -118,7 +118,7 @@
# N is the DOWNSECS value.
<%
-builder = ['jonund','ecosse','rabbit']
+builder = ['ecosse','rabbit']
builders = builder.map{|x| x + "." + domain }.join(',')
%>
HOST=<%= builders %> SERVICE=cpu
diff --git a/modules/xymon/templates/hobbit-clients.cfg b/modules/xymon/templates/hobbit-clients.cfg
index 72140850..ff010681 100644
--- a/modules/xymon/templates/hobbit-clients.cfg
+++ b/modules/xymon/templates/hobbit-clients.cfg
@@ -102,7 +102,7 @@
# show up in the "ps" listing as a command. The scanner will find
# a ps-listing of e.g. "/usr/sbin/cron" if you only specify "processname"
# as "cron".
-# "processname" can also be a Perl-compatiable regular expression, e.g.
+# "processname" can also be a Perl-compatible regular expression, e.g.
# "%java.*inst[0123]" can be used to find entries in the ps-listing for
# "java -Xmx512m inst2" and "java -Xmx256 inst3". In that case,
# "processname" must begin with "%" followed by the reg.expression.
@@ -253,7 +253,7 @@
# the output from netstat. This is typically "10.0.0.1:80" for the IP
# 10.0.0.1, port 80. Or "*:80" for any local address, port 80.
# NB: The Xymon clients normally report only the numeric data for
-# IP-adresses and port-numbers, so you must specify the port
+# IP-addresses and port-numbers, so you must specify the port
# number (e.g. "80") instead of the service name ("www").
# "state" causes only the sockets in the specified state to be included;
# it is usually LISTEN or ESTABLISHED.
@@ -265,7 +265,7 @@
#
# "addr" and "state" can be a simple strings, in which case these string must
# show up in the "netstat" at the appropriate column.
-# "addr" and "state" can also be a Perl-compatiable regular expression, e.g.
+# "addr" and "state" can also be a Perl-compatible regular expression, e.g.
# "LOCAL=%(:80|:443)" can be used to find entries in the netstat local port for
# both http (port 80) and https (port 443). In that case, portname or state must
# begin with "%" followed by the reg.expression.
@@ -349,19 +349,20 @@
HOST=rabbit.<%= domain %>
DISK %.*stage2$ IGNORE
-# jonund has 24 cores and we try and utilise it as much as possible
-# la of up to 1.5*cores is probably not problematic
-HOST=jonund.<%= domain %>
- LOAD 36.0 48.0
-
# ecosse has 24 cores, is a builder, and we try to use them all
HOST=ecosse.<%= domain %>
LOAD 36.0 48.0
-# rabbit has 12 and mksquashfs uses all of them
+# rabbit has 12 cores and mksquashfs uses all of them
HOST=rabbit.<%= domain %>
LOAD 18.0 24.0
+# duvel has 24 cores, dont trigger alarms too soon
+HOST=duvel.<%= domain %>
+ LOAD 18.0 24.0
+ DISK /var/lib/binrepo 95 98
+ DISK /var/www 95 98
+
DEFAULT
# These are the built-in defaults.
UP 1h
diff --git a/modules/xymon/templates/hobbitserver.cfg b/modules/xymon/templates/hobbitserver.cfg
index 60dd1a75..a5a7aacf 100644
--- a/modules/xymon/templates/hobbitserver.cfg
+++ b/modules/xymon/templates/hobbitserver.cfg
@@ -5,7 +5,7 @@ BBSERVERLOGS="/var/log/xymon" # Directory for server logs. The hobbit user must
HOBBITCLIENTHOME="<%= lib_dir %>/xymon/client" # BBHOME directory for the client
-BBSERVERHOSTNAME="alamut.<%= domain %>" # The hostname of your server
+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
@@ -29,7 +29,7 @@ PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/usr/lib64/xy
# 2011-07-17 15:32:54 Oversize status msg from
# 212.85.158.149 for jonund.mageia.org:procs truncated (n=350049, limit=262144)
#
-# http://en.wikibooks.org/wiki/System_Monitoring_with_Xymon/Other_Docs/FAQ#Q._How_do_I_fix_.22Oversize_status_msg_from_192.168.1.31_for_test.my.com:ports_truncated_.28n.3D508634.2C_limit.3D262144.29.22
+# https://en.wikibooks.org/wiki/System_Monitoring_with_Xymon/Other_Docs/FAQ#Q._How_do_I_fix_.22Oversize_status_msg_from_192.168.1.31_for_test.my.com:ports_truncated_.28n.3D508634.2C_limit.3D262144.29.22
MAXMSG_STATUS="496"
##### Normally you do not need to modify anything below this point #####
@@ -58,7 +58,7 @@ MACHINEDOTS="$BBSERVERHOSTNAME" # This systems hostname
MACHINEADDR="$BBSERVERIP" # This systems IP-address
# URL's generated/used by bbgen
-BBWEBHOST="http://$BBSERVERWWWNAME" # Just the host part of the URL - http://www.foo.com
+BBWEBHOST="https://$BBSERVERWWWNAME" # Just the host part of the URL - http://www.foo.com
BBWEBHOSTURL="$BBWEBHOST$BBSERVERWWWURL" # Prefix for all static Xymon pages - http://www.foo.com/bb
BBWEBHTMLLOGS="$BBWEBHOSTURL/html" # Prefix for the Xymon HTML logs (only if BBLOGSTATUS=STATIC)
BBWEB="$BBSERVERWWWURL" # Xymon URL prefix without the host part
diff --git a/modules/xymon/templates/xymon-client b/modules/xymon/templates/xymon-client
index 1635457c..e846d2a5 100644
--- a/modules/xymon/templates/xymon-client
+++ b/modules/xymon/templates/xymon-client
@@ -2,19 +2,18 @@
# You MUST set the list of Hobbit servers that this
# client reports to.
-# It is good to use IP-adresses here instead of DNS
+# It is good to use IP-addresses here instead of DNS
# names - DNS might not work if there's a problem.
#
# E.g. (a single Hobbit server)
-# HOBBITSERVERS="192.168.1.1"
+# HOBBITSERVERS="192.168.1.1"
# or (multiple servers)
-# HOBBITSERVERS="10.0.0.1 192.168.1.1"
+# HOBBITSERVERS="10.0.0.1 192.168.1.1"
+XYMONSERVERS="<%= server %>"
-HOBBITSERVERS="<%= server %>"
-
-# The defaults usually suffice for the rest of this file,
-# but you can tweak the hostname that the client reports
-# data with, and the OS name used (typically needed only on
+# The defaults usually suffice for the rest of this file,
+# but you can tweak the hostname that the client reports
+# data with, and the OS name used (typically needed only on
# RHEL or RHAS servers).
# CLIENTHOSTNAME=""
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-14 22:53:06 +0000