Merge Institute. Punt Kamino. Sync with Devaron's abbey_pisensors.

diff --git a/Institute b/Institute
index e23b88ab267abf73db7fcc5d678ac26e4829eb26..5e2be7364f649d078cf0fe499f802d60e31d7553 160000 (submodule)
--- a/Institute
+++ b/Institute
@@ -1 +1 @@
-Subproject commit e23b88ab267abf73db7fcc5d678ac26e4829eb26
+Subproject commit 5e2be7364f649d078cf0fe499f802d60e31d7553

diff --git a/README.org b/README.org
index 86933fe08798c070ba040b48ee25e49a34a5f449..50b3a95258db03ee52d392fe38facc289adf1a50 100644 (file)
--- a/README.org
+++ b/README.org
@@ -1095,7 +1095,7 @@ print_help() {
 
 brief_data() {
     echo "$1" | sed -n -E -e '
-  /^temp[0-9]+: +[-+][0-9.]+°C/ { s/^temp[0-9]+: +([-+][0-9.]+)°C.*/ \1/; H }
+  /^temp[0-9]+: +[-+][0-9.]+.?C/ { s/^temp[0-9]+: +([-+][0-9.]+).?C.*/ \1/; H }
   $ { x; s/\n//g; p }'
 }
 
@@ -1160,6 +1160,8 @@ idiosyncratically in flux.  In particular, Kamino does not irritate
 Kessel is a wireless host while Kamino is wired.  Devaron, the
 Raspberry Pi OS (ARM64) machine, uses the ~abbey_pisensors~ monitor.
 
+Kamino is currently unmonitored as it is now rarely powered up.
+
 #+CAPTION: =roles_t/abbey-core/tasks/main.yml=
 #+BEGIN_SRC conf :tangle roles_t/abbey-core/tasks/main.yml
 
@@ -1168,7 +1170,7 @@ Raspberry Pi OS (ARM64) machine, uses the ~abbey_pisensors~ monitor.
   template:
     src: nagios-{{ item }}.cfg
     dest: /etc/nagios4/conf.d/{{ item }}.cfg
-  loop: [ devaron, kamino, kessel ]
+  loop: [ devaron, kessel ]
   notify: Reload NAGIOS4.
 #+END_SRC
 
@@ -3175,7 +3177,6 @@ all:
       hosts:
         anoat:
         devaron:
-        kamino:
         kessel:
     weather:
       hosts:
@@ -3194,7 +3195,6 @@ all:
       hosts:
         devaron:
         geonosis:
-        kamino:
 #+END_SRC
 
 ** =playbooks/site.yml=

diff --git a/hosts b/hosts
index 065a52c0222e709d9fdd5f8a72ba19fa7659ffc9..1626e10f874806669d7b3abd5dddea6512be653d 100644 (file)
--- a/hosts
+++ b/hosts
@@ -44,7 +44,6 @@ all:
       hosts:
         anoat:
         devaron:
-        kamino:
         kessel:
     weather:
       hosts:
@@ -63,4 +62,3 @@ all:
       hosts:
         devaron:
         geonosis:
-        kamino:

diff --git a/roles_t/abbey-core/files/abbey_pisensors b/roles_t/abbey-core/files/abbey_pisensors
index e50d13440a44a6164fca3d6e1f3f283f82c12709..1901f5e1e58aad296aacd70c8130139adced20ef 100644 (file)
--- a/roles_t/abbey-core/files/abbey_pisensors
+++ b/roles_t/abbey-core/files/abbey_pisensors
@@ -24,7 +24,7 @@ print_help() {
 
 brief_data() {
     echo "$1" | sed -n -E -e '
-  /^temp[0-9]+: +[-+][0-9.]+°C/ { s/^temp[0-9]+: +([-+][0-9.]+)°C.*/ \1/; H }
+  /^temp[0-9]+: +[-+][0-9.]+.?C/ { s/^temp[0-9]+: +([-+][0-9.]+).?C.*/ \1/; H }
   $ { x; s/\n//g; p }'
 }
 

diff --git a/roles_t/abbey-core/tasks/main.yml b/roles_t/abbey-core/tasks/main.yml
index 6ee4ccfd256be5548d65a1b9251d8601755de99b..c4ca66920fabee60ebc3df848dad0e4758f5f5fe 100644 (file)
--- a/roles_t/abbey-core/tasks/main.yml
+++ b/roles_t/abbey-core/tasks/main.yml
@@ -260,7 +260,7 @@
   template:
     src: nagios-{{ item }}.cfg
     dest: /etc/nagios4/conf.d/{{ item }}.cfg
-  loop: [ devaron, kamino, kessel ]
+  loop: [ devaron, kessel ]
   notify: Reload NAGIOS4.
 
 - name: Install Analog.