Fix rtt, including bug in time compute

2026-04-01 19:41:53 -04:00
parent 090d341244
commit 460d2be9e9
13 changed files with 1366 additions and 372 deletions
@@ -21,10 +21,9 @@ SERVER_DEFAULTS = {
    "logfile": "/var/log/heartbeat.log",
    "logfmt": "text",           # text or msg or json
    
-    # Notification settings
-    "pushsrv": "pushover",      # pushover, mattermost, or all
-    "pushover_token": "",
-    "pushover_user": "",
+    # Notification channels
+    "notification_channels": {},  # Named channels with type and credentials
+    "default_notification_channels": [],  # Default channels if host doesn't specify
    
    # Monitoring settings
    "interval": 20,             # Expected heartbeat interval (for server checks)
@@ -32,22 +31,15 @@ SERVER_DEFAULTS = {
    "threshold_renotify_interval": 3600,  # Seconds between threshold re-notifications
    
    # Host management
-    "watchhosts": [],           # Hosts to monitor and notify about
-    "dyndnshosts": [],          # Hosts with dynamic DNS
+    "hosts": {},                # New unified host definitions (optional)
+    "watchhosts": [],           # Hosts to monitor and notify about (legacy)
+    "dyndnshosts": [],          # Hosts with dynamic DNS (legacy)
    "drophosts": [],            # Hosts to ignore
    "dyndomains": ["wrede.org"],
    
    # DNS updates
    "nsupdate_bin": "/usr/bin/nsupdate",
    
-    # Email settings
-    "smtpserver": "smtp.fastmail.com",
-    "smtpuser": "andreas@wrede.ca",
-    "smtppassword": "pvtvefyp5gbhnch2",
-    "smtpport": 587,
-    "toemail": ["aew.hbd.notify@wrede.ca"],
-    "fromemail": "aew.hbd@wrede.ca",
-    
    # WebSocket settings
    "ws_port": 50005,
    "wss_port": None,
@@ -101,3 +93,162 @@ def load_config(path=None):
            # yaml not installed: do not attempt to parse; user must ensure defaults
            pass
    return cfg
+
+
+def get_watchhosts(config):
+    """Extract watchhosts from config, supporting both new and legacy formats.
+    
+    Args:
+        config: Configuration dictionary
+        
+    Returns:
+        List of hostnames to watch
+    """
+    watchhosts = []
+    
+    # New format: hosts section with watch attribute
+    if "hosts" in config:
+        hosts_config = config["hosts"]
+        if isinstance(hosts_config, dict):
+            for host_name, host_attrs in hosts_config.items():
+                if isinstance(host_attrs, dict) and host_attrs.get("watch", False):
+                    watchhosts.append(host_name)
+    
+    # Legacy format: watchhosts list
+    if "watchhosts" in config:
+        legacy_watchhosts = config.get("watchhosts", [])
+        if isinstance(legacy_watchhosts, (list, set)):
+            watchhosts.extend(legacy_watchhosts)
+        elif isinstance(legacy_watchhosts, dict):
+            # Old dict format: {"host1": {attrs}, "host2": {attrs}}
+            watchhosts.extend(legacy_watchhosts.keys())
+    
+    return list(set(watchhosts))  # Remove duplicates
+
+
+def get_dyndnshosts(config):
+    """Extract dyndnshosts from config, supporting both new and legacy formats.
+    
+    Args:
+        config: Configuration dictionary
+        
+    Returns:
+        List of hostnames with dynamic DNS
+    """
+    dyndnshosts = []
+    
+    # New format: hosts section with dyndns attribute
+    if "hosts" in config:
+        hosts_config = config["hosts"]
+        if isinstance(hosts_config, dict):
+            for host_name, host_attrs in hosts_config.items():
+                if isinstance(host_attrs, dict) and host_attrs.get("dyndns", False):
+                    dyndnshosts.append(host_name)
+    
+    # Legacy format: dyndnshosts list/set
+    if "dyndnshosts" in config:
+        legacy_dyndnshosts = config.get("dyndnshosts", [])
+        if isinstance(legacy_dyndnshosts, (list, set)):
+            dyndnshosts.extend(legacy_dyndnshosts)
+    
+    return list(set(dyndnshosts))  # Remove duplicates
+
+
+def get_host_config(config, hostname):
+    """Get configuration for a specific host.
+    
+    Args:
+        config: Configuration dictionary
+        hostname: Host name
+        
+    Returns:
+        Dictionary with host attributes or empty dict
+    """
+    if "hosts" in config:
+        hosts_config = config.get("hosts", {})
+        if isinstance(hosts_config, dict) and hostname in hosts_config:
+            return hosts_config[hostname] if isinstance(hosts_config[hostname], dict) else {}
+    
+    # Check legacy watchhosts for notification settings
+    if "watchhosts" in config:
+        watchhosts = config.get("watchhosts", {})
+        if isinstance(watchhosts, dict) and hostname in watchhosts:
+            legacy_attrs = watchhosts[hostname]
+            if isinstance(legacy_attrs, dict):
+                # Convert legacy format to new format
+                return {
+                    "watch": True,
+                    "notify": legacy_attrs.get("notify"),
+                    "notify_src": legacy_attrs.get("src"),
+                }
+    
+    return {}
+
+
+def get_notification_channels_for_host(config, hostname):
+    """Get notification channels configured for a specific host.
+    
+    Args:
+        config: Configuration dictionary
+        hostname: Host name
+        
+    Returns:
+        List of channel names to use for this host
+    """
+    host_config = get_host_config(config, hostname)
+    
+    # Check if host specifies notification channels
+    channels = host_config.get("notification_channels", [])
+    if channels:
+        if isinstance(channels, str):
+            return [channels]
+        elif isinstance(channels, list):
+            return channels
+    
+    # Fall back to default channels
+    default_channels = config.get("default_notification_channels", [])
+    if default_channels:
+        if isinstance(default_channels, str):
+            return [default_channels]
+        elif isinstance(default_channels, list):
+            return default_channels
+    
+    # No channels configured, return empty list (will use legacy global config)
+    return []
+
+
+def get_channel_config(config, channel_name):
+    """Get configuration for a specific notification channel.
+    
+    Args:
+        config: Configuration dictionary
+        channel_name: Name of the notification channel
+        
+    Returns:
+        Dictionary with channel configuration or None if not found
+    """
+    channels = config.get("notification_channels", {})
+    if isinstance(channels, dict) and channel_name in channels:
+        return channels[channel_name]
+    return None
+
+
+def get_notification_channels_config(config, hostname):
+    """Get list of notification channel configurations for a host.
+    
+    Args:
+        config: Configuration dictionary
+        hostname: Host name
+        
+    Returns:
+        List of (channel_name, channel_config) tuples
+    """
+    channel_names = get_notification_channels_for_host(config, hostname)
+    
+    channels = []
+    for channel_name in channel_names:
+        channel_config = get_channel_config(config, channel_name)
+        if channel_config and channel_config.get("type"):
+            channels.append((channel_name, channel_config))
+    
+    return channels