aboutsummaryrefslogtreecommitdiffstats
path: root/modules/xymon
diff options
context:
space:
mode:
Diffstat (limited to 'modules/xymon')
-rw-r--r--modules/xymon/manifests/client.pp8
-rw-r--r--modules/xymon/manifests/server.pp28
-rw-r--r--modules/xymon/templates/bb-hosts22
-rw-r--r--modules/xymon/templates/hobbit-alerts.cfg4
-rw-r--r--modules/xymon/templates/hobbit-clients.cfg6
-rw-r--r--modules/xymon/templates/xymon-client17
6 files changed, 32 insertions, 53 deletions
diff --git a/modules/xymon/manifests/client.pp b/modules/xymon/manifests/client.pp
index 890430c6..cfde8134 100644
--- a/modules/xymon/manifests/client.pp
+++ b/modules/xymon/manifests/client.pp
@@ -1,11 +1,7 @@
class xymon::client {
package { 'xymon-client': }
- if versioncmp($::lsbdistrelease, '5') < 0 {
- $service = 'xymon-client'
- } else {
- $service = 'xymon'
- }
+ $service = 'xymon'
service { $service:
hasstatus => false,
@@ -13,7 +9,7 @@ class xymon::client {
require => Package['xymon-client'],
}
- # TODO replace with a exported ressource
+ # TODO replace with a exported resource
$server = extlookup('hobbit_server','x')
file { '/etc/sysconfig/xymon-client':
content => template('xymon/xymon-client'),
diff --git a/modules/xymon/manifests/server.pp b/modules/xymon/manifests/server.pp
index dff50430..b6c269cf 100644
--- a/modules/xymon/manifests/server.pp
+++ b/modules/xymon/manifests/server.pp
@@ -1,36 +1,18 @@
class xymon::server {
package { ['xymon','fping']: }
- if versioncmp($::lsbdistrelease, '5') < 0 {
- service { 'xymon':
- hasstatus => false,
- status => "su xymon -c '${::lib_dir}/xymon/server/hobbit.sh status'",
- require => Package['xymon'],
- }
- }
-
File {
group => 'xymon',
require => Package['xymon'],
notify => Exec['service xymon reload'],
}
- if versioncmp($::lsbdistrelease, '5') < 0 {
- file {
- # Define hosts and web view layout, and lists tests to be run against
- # host by e.g. network tests from xymon server
- '/etc/xymon/bb-hosts':
- content => template('xymon/bb-hosts');
- }
- } else {
- file {
- # Define hosts and web view layout, and lists tests to be run against
- # host by e.g. network tests from xymon server
- '/etc/xymon/hosts.cfg':
- content => template('xymon/bb-hosts');
- }
- }
file {
+ # Define hosts and web view layout, and lists tests to be run against
+ # host by e.g. network tests from xymon server
+ '/etc/xymon/hosts.cfg':
+ content => template('xymon/bb-hosts');
+
# Environment variables user by hobbitd,hobbitlaunch,hobbitd_rrd,CGIs
# and bbgen (which generates the static html pages)
# hobbitlaunch (started by init script) may need to be restarted for
diff --git a/modules/xymon/templates/bb-hosts b/modules/xymon/templates/bb-hosts
index 7a3489dc..140932b5 100644
--- a/modules/xymon/templates/bb-hosts
+++ b/modules/xymon/templates/bb-hosts
@@ -13,22 +13,23 @@
# 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 planet.<%= domain %> # http://planet.<%= 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 %> # 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 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
@@ -44,3 +45,8 @@ group-compress VM Sucuk
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/hobbit-alerts.cfg b/modules/xymon/templates/hobbit-alerts.cfg
index 10906fe8..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
diff --git a/modules/xymon/templates/hobbit-clients.cfg b/modules/xymon/templates/hobbit-clients.cfg
index 8460280d..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.
diff --git a/modules/xymon/templates/xymon-client b/modules/xymon/templates/xymon-client
index 6bbdd836..e846d2a5 100644
--- a/modules/xymon/templates/xymon-client
+++ b/modules/xymon/templates/xymon-client
@@ -2,23 +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"
-
-<% if scope.function_versioncmp([lsbdistrelease, '5']) >= 0 %>
+# HOBBITSERVERS="10.0.0.1 192.168.1.1"
XYMONSERVERS="<%= server %>"
-<% else %>
-HOBBITSERVERS="<%= server %>"
-<% end %>
-# 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-07-18 01:13:56 +0000