Merge branch 'feature/docker' into develop

Implements checks for mass channel activity to ensure proper functionality.

Introduces methods to verify if mass channels are active and to set errors when they are not connected.

Enhances reliability of data logging by avoiding unnecessary processing when mass channels are inactive.

.gitignore

@@ -213,3 +213,7 @@ flycheck_*.el
 
 /__simulate_fail.json
 /mailing_list.yaml
+
+.vscode/
+
+*.code-workspace

parameters.yaml

@@ -118,7 +118,10 @@ data_channels: ["HHZ", "HHN", "HHE"]
 
 # ---------------------------------------- OPTIONAL PARAMETERS ---------------------------------------------------------
 # deactivate powbox surveillance for stations (e.g. for solar powered), key: station, value: status message (abbr.)
-no_pbox_stations: {'GR33': 'SOL'}
+no_pbox_stations: {'GR33': 'SOL', 'GR27B': 'DCN', 'RP01': 'noPBox', 'RP02': 'noPBox', 'RP03': 'noPBox', 'RP04': 'noPBox', 'RP05B': 'noPBox', 'RP06': 'noPBox', 'RP07': 'noPBox', 'RP08': 'noPBox'}
+
+# deactivate mass position surveillance for stations without connected mass channels (e.g. STS-2 instruments), key: station, value: status message (abbr.)
+no_mass_stations: {'BIA': 'DCN', 'KNEZ': 'DCN', 'KRUS': 'DCN', 'OHR': 'DCN', 'OTOV': 'DCN', 'SKO': 'DCN', 'STIP': 'DCN', 'VAY': 'DCN', 'ZUPA': 'DCN'}
 
 # add links to html table with specified key as column and value as relative link, interpretable string parameters:
 # nw (e.g. 1Y), st (e.g. GR01A), nwst_id (e.g. 1Y.GR01A)
@@ -132,7 +135,7 @@ add_links:
 add_global_links:
   # for example: - {"text": "our homepage", "URL": "https://www.rub.de"}
   - {"text": "show recent events on map",
-     "URL": "https://fdsnws.geophysik.ruhr-uni-bochum.de/map/?lat=39.5&lon=21&zoom=7&baselayer=mapnik"}
+     "URL": "https://fdsnws.geophysik.ruhr-uni-bochum.de/map/?lat=39.5&lon=21&zoom=7&baselayer=osm"}
 
 # html logo at page bottom (path relative to html directory)
 html_logo: "logo.png"
@@ -142,14 +145,14 @@ EMAIL:
   # specify mail server and credentials
   # port, auth_type, user and password are only required if mailserver is not set to "localhost"
   # user and password can be set to "ENV" or "DOCKER" to read from environment variables or docker secrets
-  mailserver: "smtp.rub.de"           # mail server
+  mailserver: "smtp.example.org"      # mail server
   auth_type: "SSL"                    # mail authentication type, can be "SSL", "TLS" or "None"
   port: 465                           # mail port, default 465 for SSL, 587 for TLS
   user: "DOCKER"                      # mail user, read from environment variable if set to "ENV" or from docker secret if set to "DOCKER"
   password: "DOCKER"                  # mail password, read from environment variable if set to "ENV" or from docker secret if set to "DOCKER"
   # specify mail recipients, sender and blacklists
-  addresses: ["marcel.paffrath@rub.de", "kasper.fischer@rub.de"]  # list of mail addresses for info mails
+  addresses: ["test@example.org"]  # list of mail addresses for info mails
-  sender: "RUB SeisObs <seisobs@ruhr-uni-bochum.de>"              # mail sender
+  sender: "<test@example.org>"              # mail sender
   stations_blacklist: []                                          # do not send emails for specific stations
   networks_blacklist: []                                          # do not send emails for specific network
   # specify recipients for single stations in a yaml: key = email-address, val = station list (e.g. [1Y.GR01, 1Y.GR02])

survBot.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = '0.2-docker'
+__version__ = '0.3'
-__author__ = 'Marcel Paffrath <marcel.paffrath@rub.de>'
+__author__ = ['Marcel Paffrath <marcel.paffrath@rub.de>', 'Kasper D. Fischer <kasper.fischer@rub.de>']
 
 import os
 import io
@@ -595,6 +595,7 @@ class StationQC(object):
         self.status_track = status_track
 
         self.powbox_active = self.is_pbox_activated_check()
+        self.mass_active = self.is_mass_activated_check()
 
         self.start()
 
@@ -1080,6 +1081,11 @@ class StationQC(object):
         """ Analyse datalogger mass channels. """
         key = 'mass'
 
+        # skip processing if mass is not active
+        if not self.mass_active:
+            self.set_mass_inactive_error(key)
+            return
+        
         # build stream with all channels
         st = Stream()
         for channel in channels:
@@ -1341,6 +1347,12 @@ class StationQC(object):
         msg = self.parameters.get('no_pbox_stations')[self.station]
         self.error(key, detailed_message=f'PowBox not connected', disc=msg)
 
+    def is_mass_activated_check(self):
+        return self.station not in self.parameters.get('no_mass_stations', [])
+
+    def set_mass_inactive_error(self, key):
+        msg = self.parameters.get('no_mass_stations')[self.station]
+        self.error(key, detailed_message=f'Mass channels not connected', disc=msg)
 
 class Status(object):
     """ Basic Status class. All status classes are derived from this class."""

write_utils.py

@@ -19,12 +19,13 @@ def get_html_header(refresh_rate=10):
     header = ['<!DOCTYPE html>',
               '<html>',
               '<head>',
-              '  <link rel="stylesheet" media="only screen and (max-width: 400px)" href="mobile.css" />',
+              '  <title>SurvBot status</title>',
-              '  <link rel="stylesheet" media="only screen and (min-width: 401px)" href="desktop.css" />',
+              '  <link rel="stylesheet" media="only screen and (max-width: 400px)" href="mobile.css">',
+              '  <link rel="stylesheet" media="only screen and (min-width: 401px)" href="desktop.css">',
+              f'  <meta http-equiv="refresh" content="{refresh_rate}">',
+              '  <meta charset="utf-8">',
+              '  <meta name="viewport" content="width=device-width, initial-scale=1">',
               '</head>',
-              f'<meta http-equiv="refresh" content="{refresh_rate}" >',
-              '<meta charset="utf-8">',
-              '<meta name="viewport" content="width=device-width, initial-scale=1">',
               '<body>']
     header = _convert_to_textstring(header)
     return header
@@ -86,7 +87,7 @@ def get_html_row(items, html_key='td'):
         html_class = item.get('html_class')
         class_str = f' class="{html_class}"' if html_class else ''
         row_string += 2 * default_space + f'<{html_key}{class_str} bgcolor="{color}" title="{tooltip}"' \
-                      + f'style="color:{font_color}"> {text_str}</{html_key}>\n'
+                      + f'style="color:{font_color}">{text_str}</{html_key}>\n'
     row_string += default_space + '</tr>\n'
     return row_string