Add Ord-Mantell (a Raspberry Pi 5); remove Devaron (Raspberry Pi 4).

diff --git a/README.org b/README.org
index a8dd701d622afbcd85249132eaabc9fcb60de7c3..88fc8b444f9c72de3b0037f5be5c9bdbf04639de 100644 (file)
--- a/README.org
+++ b/README.org
@@ -1123,15 +1123,15 @@ esac
 
 ** Monitoring The Cloister
 
-The abbey adds monitoring for more servers: Kamino, Kessel and
-Devaron.  They are ~abbey-cloister~ servers, so they are configured as
+The abbey adds monitoring for more servers: Kamino, Kessel, and Ord
+Mantell.  They are ~abbey-cloister~ servers, so they are configured as
 small institute ~campus~ servers, like Gate, with an NRPE (a NAGIOS
 Remote Plugin Executor) server and an ~inst_sensors~ command.
 
 The configurations for the servers are very similar to Gate's, but are
 idiosyncratically in flux.  In particular, Kamino does not irritate
 ~check_total_procs~, yet Kessel does.  Both are Pop!_OS 22.04, but
-Kessel is a wireless host while Kamino is wired.  Devaron, the
+Kessel is a wireless host while Kamino is wired.  Ord Mantell, the
 Raspberry Pi OS (ARM64) machine, uses the ~abbey_pisensors~ monitor.
 
 *** Cloister Network Addresses
@@ -1143,9 +1143,9 @@ included in =private/vars-abbey.yml=.
 #+CAPTION: [[file:private_ex/vars-abbey.yml][=private_ex/vars-abbey.yml=]]
 #+BEGIN_SRC conf :tangle private_ex/vars-abbey.yml :mkdirp yes
 ---
-devaron_addr:               10.84.138.10
 kamino_addr:                192.168.56.14
 kessel_addr:                10.84.138.8
+ord_mantell_addr:           10.84.138.10
 #+END_SRC
 
 *** Installing NAGIOS Configurations
@@ -1162,58 +1162,58 @@ rarely powered up.
   template:
     src: nagios-{{ item }}.cfg
     dest: /etc/nagios4/conf.d/{{ item }}.cfg
-  loop: [ devaron, kessel ]
+  loop: [ ord-mantell, kessel ]
   notify: Reload NAGIOS4.
 #+END_SRC
 
-*** NAGIOS Monitoring of Devaron
+*** NAGIOS Monitoring of Ord-Mantell
 
-#+CAPTION: [[file:roles_t/abbey-core/templates/nagios-devaron.cfg][=roles_t/abbey-core/templates/nagios-devaron.cfg=]]
-#+BEGIN_SRC conf :tangle roles_t/abbey-core/templates/nagios-devaron.cfg :mkdirp yes
+#+CAPTION: [[file:roles_t/abbey-core/templates/nagios-ord-mantell.cfg][=roles_t/abbey-core/templates/nagios-ord-mantell.cfg=]]
+#+BEGIN_SRC conf :tangle roles_t/abbey-core/templates/nagios-ord-mantell.cfg :mkdirp yes
 define host {
     use                     linux-server
-    host_name               devaron
-    address                 {{ devaron_addr }}
+    host_name               ord-mantell
+    address                 {{ ord_mantell_addr }}
 }
 
 define service {
     use                     generic-service
-    host_name               devaron
+    host_name               ord-mantell
     service_description     Root Partition
     check_command           check_nrpe!inst_root
 }
 
 # define service {
 #     use                     generic-service
-#     host_name               devaron
+#     host_name               ord-mantell
 #     service_description     Current Load
 #     check_command           check_nrpe!check_load
 # }
 
 define service {
     use                     generic-service
-    host_name               devaron
+    host_name               ord-mantell
     service_description     Zombie Processes
     check_command           check_nrpe!check_zombie_procs
 }
 
 # define service {
 #     use                     generic-service
-#     host_name               devaron
+#     host_name               ord-mantell
 #     service_description     Total Processes
 #     check_command           check_nrpe!check_total_procs
 # }
 
 define service {
     use                     generic-service
-    host_name               devaron
+    host_name               ord-mantell
     service_description     Swap Usage
     check_command           check_nrpe!inst_swap
 }
 
 define service {
     use                     generic-service
-    host_name               devaron
+    host_name               ord-mantell
     service_description     Temperature Sensors
     check_command           check_nrpe!abbey_pisensors
 }
@@ -1374,8 +1374,8 @@ trends in resource usage.
       [kessel.birchwood.private]
           address {{ kessel_addr }}
 
-      [devaron.birchwood.private]
-          address {{ devaron_addr }}
+      [ord-mantell.birchwood.private]
+          address {{ ord_mantell_addr }}
     dest: /etc/munin/munin-conf.d/zzz-site.cfg
   notify: Restart Munin.
 #+END_SRC
@@ -3267,12 +3267,13 @@ all:
       ansible_become_password: "{{ become_anoat }}"
     dantooine:
       ansible_become_password: "{{ become_dantooine }}"
-    # WebTVs (Desktops)
-    devaron:
+    # Campus
     kamino:
       ansible_become_password: "{{ become_kamino }}"
     kessel:
       ansible_become_password: "{{ become_kessel }}"
+    ord-mantell:
+      ansible_become_password: "{{ become_ord_mantell }}"
     # Notebooks
     endor:
       ansible_become_password: "{{ become_endor }}"
@@ -3299,9 +3300,9 @@ all:
     campus:
       hosts:
         anoat:
-        devaron:
         kamino:
         kessel:
+        ord-mantell:
     weather:
       hosts:
         anoat:
@@ -3313,16 +3314,15 @@ all:
         dantooine:
     webtvs:
       hosts:
-        kessel:
-        devaron:
         kamino:
+        kessel:
+        ord-mantell:
     notebooks:
       hosts:
         endor:
         geonosis:
     builders:
       hosts:
-        devaron:
         geonosis:
         kamino:
 #+END_SRC

diff --git a/hosts b/hosts
index 70455b5b33e508a153178d2cd8589951dde40cb7..ba5280eab36557c245be71211d62e748a2afe125 100644 (file)
--- a/hosts
+++ b/hosts
@@ -11,12 +11,13 @@ all:
       ansible_become_password: "{{ become_anoat }}"
     dantooine:
       ansible_become_password: "{{ become_dantooine }}"
-    # WebTVs (Desktops)
-    devaron:
+    # Campus
     kamino:
       ansible_become_password: "{{ become_kamino }}"
     kessel:
       ansible_become_password: "{{ become_kessel }}"
+    ord-mantell:
+      ansible_become_password: "{{ become_ord_mantell }}"
     # Notebooks
     endor:
       ansible_become_password: "{{ become_endor }}"
@@ -43,9 +44,9 @@ all:
     campus:
       hosts:
         anoat:
-        devaron:
         kamino:
         kessel:
+        ord-mantell:
     weather:
       hosts:
         anoat:
@@ -57,15 +58,14 @@ all:
         dantooine:
     webtvs:
       hosts:
-        kessel:
-        devaron:
         kamino:
+        kessel:
+        ord-mantell:
     notebooks:
       hosts:
         endor:
         geonosis:
     builders:
       hosts:
-        devaron:
         geonosis:
         kamino:

diff --git a/private_ex/vars-abbey.yml b/private_ex/vars-abbey.yml
index f60e21fd6f8cf9d042902dd1204018de56e827ee..fbd328e5d3b0b2fe57f8217c108944af06bb5e53 100644 (file)
--- a/private_ex/vars-abbey.yml
+++ b/private_ex/vars-abbey.yml
@@ -1,7 +1,7 @@
 ---
-devaron_addr:               10.84.138.10
 kamino_addr:                192.168.56.14
 kessel_addr:                10.84.138.8
+ord_mantell_addr:           10.84.138.10
 
 zoneminder_dbpass:           gakJopbikJadsEdd
 

diff --git a/roles_t/abbey-core/tasks/main.yml b/roles_t/abbey-core/tasks/main.yml
index 397160053f732e12731f0caf20d685c8362bd6a2..a44eb880557b71571da11c3dcd4cd8e99eec1d92 100644 (file)
--- a/roles_t/abbey-core/tasks/main.yml
+++ b/roles_t/abbey-core/tasks/main.yml
@@ -203,7 +203,7 @@
   template:
     src: nagios-{{ item }}.cfg
     dest: /etc/nagios4/conf.d/{{ item }}.cfg
-  loop: [ devaron, kessel ]
+  loop: [ ord-mantell, kessel ]
   notify: Reload NAGIOS4.
 
 - name: Install Munin.
@@ -246,8 +246,8 @@
       [kessel.birchwood.private]
           address {{ kessel_addr }}
 
-      [devaron.birchwood.private]
-          address {{ devaron_addr }}
+      [ord-mantell.birchwood.private]
+          address {{ ord_mantell_addr }}
     dest: /etc/munin/munin-conf.d/zzz-site.cfg
   notify: Restart Munin.
 

diff --git a/roles_t/abbey-core/templates/nagios-devaron.cfg b/roles_t/abbey-core/templates/nagios-ord-mantell.cfg
similarity index 75%
rename from roles_t/abbey-core/templates/nagios-devaron.cfg
rename to roles_t/abbey-core/templates/nagios-ord-mantell.cfg
index 27cd1e233370ace41b97a11ea409e31f373c9da1..bf3e7d8c872f7cf46a86f6ee2587cf253a43ea8b 100644 (file)
--- a/roles_t/abbey-core/templates/nagios-devaron.cfg
+++ b/roles_t/abbey-core/templates/nagios-ord-mantell.cfg
@@ -1,47 +1,47 @@
 define host {
     use                     linux-server
-    host_name               devaron
-    address                 {{ devaron_addr }}
+    host_name               ord-mantell
+    address                 {{ ord_mantell_addr }}
 }
 
 define service {
     use                     generic-service
-    host_name               devaron
+    host_name               ord-mantell
     service_description     Root Partition
     check_command           check_nrpe!inst_root
 }
 
 # define service {
 #     use                     generic-service
-#     host_name               devaron
+#     host_name               ord-mantell
 #     service_description     Current Load
 #     check_command           check_nrpe!check_load
 # }
 
 define service {
     use                     generic-service
-    host_name               devaron
+    host_name               ord-mantell
     service_description     Zombie Processes
     check_command           check_nrpe!check_zombie_procs
 }
 
 # define service {
 #     use                     generic-service
-#     host_name               devaron
+#     host_name               ord-mantell
 #     service_description     Total Processes
 #     check_command           check_nrpe!check_total_procs
 # }
 
 define service {
     use                     generic-service
-    host_name               devaron
+    host_name               ord-mantell
     service_description     Swap Usage
     check_command           check_nrpe!inst_swap
 }
 
 define service {
     use                     generic-service
-    host_name               devaron
+    host_name               ord-mantell
     service_description     Temperature Sensors
     check_command           check_nrpe!abbey_pisensors
 }