Replace Dantooine with Malastare, and Ord-Mantell with Dantooine.
authorMatt Birkholz <matt@birchwood-abbey.net>
Thu, 18 Sep 2025 23:00:46 +0000 (17:00 -0600)
committerMatt Birkholz <matt@birchwood-abbey.net>
Fri, 19 Sep 2025 02:54:08 +0000 (20:54 -0600)
README.org
hosts
private_ex/vars-abbey.yml
roles_t/abbey-core/tasks/main.yml
roles_t/abbey-core/templates/nagios-dantooine.cfg [moved from roles_t/abbey-core/templates/nagios-ord-mantell.cfg with 63% similarity]

index a5ac6ea80febf0a39258d60280e712e7aba9f8b3..51017929ef228234c54fd8963de291451bb18c65 100644 (file)
@@ -1145,7 +1145,7 @@ esac
 
 ** Monitoring The Cloister
 
-The abbey adds monitoring for more servers: Kessel, and Ord Mantell.
+The abbey adds monitoring for more servers: Dantooine and Kessel.
 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.
@@ -1163,8 +1163,8 @@ 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
 ---
-kessel_addr:                10.84.138.8
-ord_mantell_addr:           10.84.138.10
+dantooine_addr:             10.84.138.8
+kessel_addr:                10.84.138.10
 #+END_SRC
 
 *** Installing NAGIOS Configurations
@@ -1179,60 +1179,60 @@ The following task installs each host's NAGIOS configuration.
   template:
     src: nagios-{{ item }}.cfg
     dest: /etc/nagios4/conf.d/{{ item }}.cfg
-  loop: [ ord-mantell, kessel ]
+  loop: [ dantooine, kessel ]
   notify: Reload NAGIOS4.
 #+END_SRC
 
-*** NAGIOS Monitoring of Ord-Mantell
+**** NAGIOS Monitoring of Dantooine
 
-#+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
+#+CAPTION: [[file:roles_t/abbey-core/templates/nagios-dantooine.cfg][=roles_t/abbey-core/templates/nagios-dantooine.cfg=]]
+#+BEGIN_SRC conf :tangle roles_t/abbey-core/templates/nagios-dantooine.cfg
 define host {
     use                     linux-server
-    host_name               ord-mantell
-    address                 {{ ord_mantell_addr }}
+    host_name               dantooine
+    address                 {{ dantooine_addr }}
 }
 
 define service {
     use                     generic-service
-    host_name               ord-mantell
+    host_name               dantooine
     service_description     Root Partition
     check_command           check_nrpe!inst_root
 }
 
 # define service {
 #     use                     generic-service
-#     host_name               ord-mantell
+#     host_name               dantooine
 #     service_description     Current Load
 #     check_command           check_nrpe!check_load
 # }
 
 define service {
     use                     generic-service
-    host_name               ord-mantell
+    host_name               dantooine
     service_description     Zombie Processes
     check_command           check_nrpe!check_zombie_procs
 }
 
 # define service {
 #     use                     generic-service
-#     host_name               ord-mantell
+#     host_name               dantooine
 #     service_description     Total Processes
 #     check_command           check_nrpe!check_total_procs
 # }
 
 define service {
     use                     generic-service
-    host_name               ord-mantell
+    host_name               dantooine
     service_description     Swap Usage
     check_command           check_nrpe!inst_swap
 }
 
 define service {
     use                     generic-service
-    host_name               ord-mantell
+    host_name               dantooine
     service_description     Temperature Sensors
-    check_command           check_nrpe!abbey_pisensors
+    check_command           check_nrpe!inst_sensors
 }
 #+END_SRC
 
@@ -1328,17 +1328,17 @@ trends in resource usage.
   become: yes
   copy:
     content: |
-      [dantooine.birchwood.private]
+      [malastare.birchwood.private]
           address 127.0.0.1
 
       [anoat.birchwood.private]
           address {{ gate_addr }}
 
+      [dantooine.birchwood.private]
+          address {{ dantooine_addr }}
+
       [kessel.birchwood.private]
           address {{ kessel_addr }}
-
-      [ord-mantell.birchwood.private]
-          address {{ ord_mantell_addr }}
     dest: /etc/munin/munin-conf.d/zzz-site.cfg
   notify: Restart Munin.
 #+END_SRC
@@ -2437,13 +2437,13 @@ all:
       ansible_become_password: "{{ become_droplet }}"
     anoat:
       ansible_become_password: "{{ become_anoat }}"
-    dantooine:
-      ansible_become_password: "{{ become_dantooine }}"
+    malastare:
+      ansible_become_password: "{{ become_malastare }}"
     # Campus
     kessel:
       ansible_become_password: "{{ become_kessel }}"
-    ord-mantell:
-      ansible_become_password: "{{ become_ord_mantell }}"
+    dantooine:
+      ansible_become_password: "{{ become_dantooine }}"
     # Notebooks
     endor:
       ansible_become_password: "{{ become_endor }}"
@@ -2465,30 +2465,32 @@ all:
         anoat:
     core:
       hosts:
-        dantooine:
+        malastare:
     campus:
       hosts:
         anoat:
+        dantooine:
         kessel:
-        ord-mantell:
     dvrs:
       hosts:
         dantooine:
     tvrs:
       hosts:
-        dantooine:
+        malastare:
     webtvs:
       hosts:
+        dantooine:
         kessel:
-        ord-mantell:
     notebooks:
       hosts:
         endor:
         sullust:
     builders:
       hosts:
-        sullust:
+        dantooine:
+        endor:
         kessel:
+        sullust:
 #+END_SRC
 
 ** =playbooks/site.yml=
diff --git a/hosts b/hosts
index 4149890c0b9dbf9a26ca33fe34dfcc6607fef859..afecefe9a6d0320df97af73906645f96abac8762 100644 (file)
--- a/hosts
+++ b/hosts
@@ -9,13 +9,13 @@ all:
       ansible_become_password: "{{ become_droplet }}"
     anoat:
       ansible_become_password: "{{ become_anoat }}"
-    dantooine:
-      ansible_become_password: "{{ become_dantooine }}"
+    malastare:
+      ansible_become_password: "{{ become_malastare }}"
     # Campus
     kessel:
       ansible_become_password: "{{ become_kessel }}"
-    ord-mantell:
-      ansible_become_password: "{{ become_ord_mantell }}"
+    dantooine:
+      ansible_become_password: "{{ become_dantooine }}"
     # Notebooks
     endor:
       ansible_become_password: "{{ become_endor }}"
@@ -37,27 +37,29 @@ all:
         anoat:
     core:
       hosts:
-        dantooine:
+        malastare:
     campus:
       hosts:
         anoat:
+        dantooine:
         kessel:
-        ord-mantell:
     dvrs:
       hosts:
         dantooine:
     tvrs:
       hosts:
-        dantooine:
+        malastare:
     webtvs:
       hosts:
+        dantooine:
         kessel:
-        ord-mantell:
     notebooks:
       hosts:
         endor:
         sullust:
     builders:
       hosts:
-        sullust:
+        dantooine:
+        endor:
         kessel:
+        sullust:
index f4827eb9dd60fc891e4d3b684bb200f28b3b7eda..036e5c5a7873a21adeff88dcffcbea198034b212 100644 (file)
@@ -1,3 +1,3 @@
 ---
-kessel_addr:                10.84.138.8
-ord_mantell_addr:           10.84.138.10
+dantooine_addr:             10.84.138.8
+kessel_addr:                10.84.138.10
index d9ad277be24008dc6c8f2b7a69364ec1b3cfb64b..d44efeb5e2a525476d209ad35fe86840821ce247 100644 (file)
   template:
     src: nagios-{{ item }}.cfg
     dest: /etc/nagios4/conf.d/{{ item }}.cfg
-  loop: [ ord-mantell, kessel ]
+  loop: [ dantooine, kessel ]
   notify: Reload NAGIOS4.
 
 - name: Install Munin.
   become: yes
   copy:
     content: |
-      [dantooine.birchwood.private]
+      [malastare.birchwood.private]
           address 127.0.0.1
 
       [anoat.birchwood.private]
           address {{ gate_addr }}
 
+      [dantooine.birchwood.private]
+          address {{ dantooine_addr }}
+
       [kessel.birchwood.private]
           address {{ kessel_addr }}
-
-      [ord-mantell.birchwood.private]
-          address {{ ord_mantell_addr }}
     dest: /etc/munin/munin-conf.d/zzz-site.cfg
   notify: Restart Munin.
 
similarity index 63%
rename from roles_t/abbey-core/templates/nagios-ord-mantell.cfg
rename to roles_t/abbey-core/templates/nagios-dantooine.cfg
index bf3e7d8c872f7cf46a86f6ee2587cf253a43ea8b..97a15f96e8a102f80145609538b15a73a422ecb9 100644 (file)
@@ -1,47 +1,54 @@
 define host {
     use                     linux-server
-    host_name               ord-mantell
-    address                 {{ ord_mantell_addr }}
+    host_name               dantooine
+    address                 {{ dantooine_addr }}
 }
 
 define service {
     use                     generic-service
-    host_name               ord-mantell
+    host_name               dantooine
     service_description     Root Partition
     check_command           check_nrpe!inst_root
 }
 
+define service {
+    use                     generic-service
+    host_name               dantooine
+    service_description     DVR Recordings
+    check_command           check_nrpe!abbey_dvr
+}
+
 # define service {
 #     use                     generic-service
-#     host_name               ord-mantell
+#     host_name               dantooine
 #     service_description     Current Load
 #     check_command           check_nrpe!check_load
 # }
 
 define service {
     use                     generic-service
-    host_name               ord-mantell
+    host_name               dantooine
     service_description     Zombie Processes
     check_command           check_nrpe!check_zombie_procs
 }
 
 # define service {
 #     use                     generic-service
-#     host_name               ord-mantell
+#     host_name               dantooine
 #     service_description     Total Processes
 #     check_command           check_nrpe!check_total_procs
 # }
 
 define service {
     use                     generic-service
-    host_name               ord-mantell
+    host_name               dantooine
     service_description     Swap Usage
     check_command           check_nrpe!inst_swap
 }
 
 define service {
     use                     generic-service
-    host_name               ord-mantell
+    host_name               dantooine
     service_description     Temperature Sensors
-    check_command           check_nrpe!abbey_pisensors
+    check_command           check_nrpe!inst_sensors
 }