From: Matt Birkholz Date: Thu, 18 Sep 2025 23:00:46 +0000 (-0600) Subject: Replace Dantooine with Malastare, and Ord-Mantell with Dantooine. X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=f541be1a0f312536d8463571583e0acc253b0510;p=Network.git Replace Dantooine with Malastare, and Ord-Mantell with Dantooine. --- diff --git a/README.org b/README.org index a5ac6ea..5101792 100644 --- a/README.org +++ b/README.org @@ -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 4149890..afecefe 100644 --- 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: diff --git a/private_ex/vars-abbey.yml b/private_ex/vars-abbey.yml index f4827eb..036e5c5 100644 --- a/private_ex/vars-abbey.yml +++ b/private_ex/vars-abbey.yml @@ -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 diff --git a/roles_t/abbey-core/tasks/main.yml b/roles_t/abbey-core/tasks/main.yml index d9ad277..d44efeb 100644 --- a/roles_t/abbey-core/tasks/main.yml +++ b/roles_t/abbey-core/tasks/main.yml @@ -205,7 +205,7 @@ 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. @@ -238,17 +238,17 @@ 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. diff --git a/roles_t/abbey-core/templates/nagios-ord-mantell.cfg b/roles_t/abbey-core/templates/nagios-dantooine.cfg 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 bf3e7d8..97a15f9 100644 --- a/roles_t/abbey-core/templates/nagios-ord-mantell.cfg +++ b/roles_t/abbey-core/templates/nagios-dantooine.cfg @@ -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 }