Updated nagios configs with ubuntu servers and docker services

13 files changed, 48 insertions, 17 deletions

diff --git a/templates/nagios/conf.d/docker/miniflux.adyxax.org.cfg b/templates/nagios/conf.d/docker/miniflux.adyxax.org.cfg
new file mode 100644
index 0000000..2243d50
--- /dev/null
+++ b/templates/nagios/conf.d/docker/miniflux.adyxax.org.cfg
@@ -0,0 +1,6 @@
+define host {
+    use        workhours
+    host_name  miniflux.adyxax.org
+    address    miniflux
+    parents    reality.adyxax.org
+}
diff --git a/templates/nagios/conf.d/docker/phpipam.adyxax.org.cfg b/templates/nagios/conf.d/docker/phpipam.adyxax.org.cfg
new file mode 100644
index 0000000..ea8d270
--- /dev/null
+++ b/templates/nagios/conf.d/docker/phpipam.adyxax.org.cfg
@@ -0,0 +1,6 @@
+define host {
+    use        workhours
+    host_name  phpipam.adyxax.org
+    address    phpipam
+    parents    reality.adyxax.org
+}
diff --git a/templates/nagios/conf.d/hostgroups.cfg b/templates/nagios/conf.d/hostgroups.cfg
index b592eb7..e05049e 100644
--- a/templates/nagios/conf.d/hostgroups.cfg
+++ b/templates/nagios/conf.d/hostgroups.cfg
@@ -1,7 +1,8 @@
 define hostgroup {
-    hostgroup_name  freebsd-servers
-    alias           FreeBSD Servers
-    members         cobsd.adyxax.org
+    hostgroup_name  docker-services
+    alias           Docker Services
+    members         miniflux.adyxax.org, \
+                    phpipam.adyxax.org
 }
 
 define hostgroup {
@@ -9,6 +10,18 @@ define hostgroup {
     alias           FreeBSD Jails
     members         console.adyxax.org, \
                     git.adyxax.org, \
-                    ipam.adyxax.org, \
                     nagios.adyxax.org
 }
+
+define hostgroup {
+    hostgroup_name  freebsd-servers
+    alias           FreeBSD Servers
+    members         cobsd.adyxax.org
+}
+
+define hostgroup {
+    hostgroup_name  ubuntu-servers
+    alias           Ubuntu Servers
+    members         collab.adyxax.org, \
+                    reality.adyxax.org
+}
diff --git a/templates/nagios/conf.d/ipam.adyxax.org.cfg b/templates/nagios/conf.d/ipam.adyxax.org.cfg
deleted file mode 100644
index 9391ac6..0000000
--- a/templates/nagios/conf.d/ipam.adyxax.org.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-define host {
-    use        freebsd-server
-    host_name  ipam.adyxax.org
-    address    ipam.jail
-    parents    cobsd.adyxax.org
-}
diff --git a/templates/nagios/conf.d/console.adyxax.org.cfg b/templates/nagios/conf.d/jails/console.adyxax.org.cfg
index 49913d9..13c506d 100644
--- a/templates/nagios/conf.d/console.adyxax.org.cfg
+++ b/templates/nagios/conf.d/jails/console.adyxax.org.cfg
@@ -1,5 +1,5 @@
 define host {
-    use        freebsd-server
+    use        workhours
     host_name  console.adyxax.org
     address    console.jail
     parents    cobsd.adyxax.org
diff --git a/templates/nagios/conf.d/git.adyxax.org.cfg b/templates/nagios/conf.d/jails/git.adyxax.org.cfg
index 1ad6f48..cc01f42 100644
--- a/templates/nagios/conf.d/git.adyxax.org.cfg
+++ b/templates/nagios/conf.d/jails/git.adyxax.org.cfg
@@ -1,5 +1,5 @@
 define host {
-    use        freebsd-server
+    use        workhours
     host_name  git.adyxax.org
     address    git.jail
     parents    cobsd.adyxax.org
diff --git a/templates/nagios/conf.d/mysql01.adyxax.org.cfg b/templates/nagios/conf.d/jails/mysql01.adyxax.org.cfg
index a7992d0..733c454 100644
--- a/templates/nagios/conf.d/mysql01.adyxax.org.cfg
+++ b/templates/nagios/conf.d/jails/mysql01.adyxax.org.cfg
@@ -1,5 +1,5 @@
 define host {
-    use        freebsd-server
+    use        workhours
     host_name  mysql01.adyxax.org
     address    mysql01.jail
     parents    cobsd.adyxax.org
diff --git a/templates/nagios/conf.d/nagios.adyxax.org.cfg b/templates/nagios/conf.d/jails/nagios.adyxax.org.cfg
index 96b7e5c..08fe0af 100644
--- a/templates/nagios/conf.d/nagios.adyxax.org.cfg
+++ b/templates/nagios/conf.d/jails/nagios.adyxax.org.cfg
@@ -1,5 +1,5 @@
 define host {
-    use        freebsd-server
+    use        workhours
     host_name  nagios.adyxax.org
     address    10.1.0.101
 }
diff --git a/templates/nagios/conf.d/tiddlywiki.adyxax.org.cfg b/templates/nagios/conf.d/jails/tiddlywiki.adyxax.org.cfg
index cecda77..55d9cb7 100644
--- a/templates/nagios/conf.d/tiddlywiki.adyxax.org.cfg
+++ b/templates/nagios/conf.d/jails/tiddlywiki.adyxax.org.cfg
@@ -1,5 +1,5 @@
 define host {
-    use        freebsd-server
+    use        workhours
     host_name  tiddlywiki.adyxax.org
     address    tiddlywiki.jail
     parents    cobsd.adyxax.org
diff --git a/templates/nagios/conf.d/cobsd.adyxax.org.cfg b/templates/nagios/conf.d/servers/cobsd.adyxax.org.cfg
index 84507f1..ea6bd7d 100644
--- a/templates/nagios/conf.d/cobsd.adyxax.org.cfg
+++ b/templates/nagios/conf.d/servers/cobsd.adyxax.org.cfg
@@ -1,5 +1,5 @@
 define host {
-    use        freebsd-server
+    use        workhours
     host_name  cobsd.adyxax.org
     address    cobsd
     parents    nagios.adyxax.org
diff --git a/templates/nagios/conf.d/servers/collab.cfg b/templates/nagios/conf.d/servers/collab.cfg
new file mode 100644
index 0000000..5f25243
--- /dev/null
+++ b/templates/nagios/conf.d/servers/collab.cfg
@@ -0,0 +1,6 @@
+define host {
+    use        workhours
+    host_name  collab.adyxax.org
+    address    collab
+    parents    cobsd.adyxax.org, reality.adyxax.org
+}
diff --git a/templates/nagios/conf.d/servers/reality.cfg b/templates/nagios/conf.d/servers/reality.cfg
new file mode 100644
index 0000000..7998e4d
--- /dev/null
+++ b/templates/nagios/conf.d/servers/reality.cfg
@@ -0,0 +1,6 @@
+define host {
+    use        workhours
+    host_name  reality.adyxax.org
+    address    reality
+    parents    cobsd.adyxax.org
+}
diff --git a/templates/nagios/conf.d/templates.cfg b/templates/nagios/conf.d/templates.cfg
index f1f7fc9..c794dcf 100644
--- a/templates/nagios/conf.d/templates.cfg
+++ b/templates/nagios/conf.d/templates.cfg
@@ -22,7 +22,7 @@ define host {
 }
 
 define host {
-    name                      freebsd-server    ; The name of this host template
+    name                      workhours    ; The name of this host template
     use                       generic-host    ; This template inherits other values from the generic-host template
     check_period              24x7        ; By default, FreeBSD hosts are checked round the clock
     check_interval            5        ; Actively check the host every 5 minutes