remove fluentbit and small fixes

charmcraft.yaml

@@ -28,8 +28,6 @@ links:
 requires:
   database:
     interface: mysql_client
-  fluentbit:
-    interface: fluentbit
 
 provides:
   slurmctld:

src/charm.py

@@ -13,7 +13,6 @@
     DatabaseCreatedEvent,
     DatabaseRequires,
 )
-from charms.fluentbit.v0.fluentbit import FluentbitClient
 from constants import CHARM_MAINTAINED_PARAMETERS, SLURM_ACCT_DB
 from interface_slurmctld import Slurmctld, SlurmctldAvailableEvent, SlurmctldUnavailableEvent
 from ops import (
@@ -22,7 +21,6 @@
     CharmBase,
     ConfigChangedEvent,
     InstallEvent,
-    RelationCreatedEvent,
     StoredState,
     UpdateStatusEvent,
     WaitingStatus,
@@ -48,22 +46,16 @@ def __init__(self, *args, **kwargs) -> None:
         )
 
         self._db = DatabaseRequires(self, relation_name="database", database_name=SLURM_ACCT_DB)
-        self._fluentbit = FluentbitClient(self, "fluentbit")
         self._slurmdbd_ops_manager = SlurmdbdOpsManager()
         self._slurmctld = Slurmctld(self, "slurmctld")
 
         event_handler_bindings = {
-            # Charm core events
             self.on.install: self._on_install,
             self.on.update_status: self._on_update_status,
             self.on.config_changed: self._write_config_and_restart_slurmdbd,
-            # Database relation
             self._db.on.database_created: self._on_database_created,
-            # Slurmctld
             self._slurmctld.on.slurmctld_available: self._on_slurmctld_available,
             self._slurmctld.on.slurmctld_unavailable: self._on_slurmctld_unavailable,
-            # fluentbit
-            self.on["fluentbit"].relation_created: self._on_fluentbit_relation_created,
         }
         for event, handler in event_handler_bindings.items():
             self.framework.observe(event, handler)
@@ -92,11 +84,6 @@ def _on_install(self, event: InstallEvent) -> None:
             self.unit.status = ActiveStatus("slurmdbd successfully installed")
         self._check_status()
 
-    def _on_fluentbit_relation_created(self, event: RelationCreatedEvent) -> None:
-        """Set up Fluentbit log forwarding."""
-        logger.debug("## Configuring fluentbit")
-        self._fluentbit.configure(self._slurmdbd_ops_manager.fluentbit_config_slurm)
-
     def _on_update_status(self, event: UpdateStatusEvent) -> None:
         """Handle update status."""
         self._check_status()

src/constants.py

@@ -3,11 +3,16 @@
 """Constants."""
 from pathlib import Path
 
+SLURM_USER = "slurm"
+SLURM_GROUP = "slurm"
+
+STATE_DIR = Path("/var/spool/slurmdbd")
+
 CHARM_MAINTAINED_PARAMETERS = {
     "DbdPort": "6819",
     "AuthType": "auth/munge",
     "AuthInfo": '"socket=/var/run/munge/munge.socket.2"',
-    "SlurmUser": "slurm",
+    "SlurmUser": SLURM_USER,
     "PluginDir": "/usr/lib/x86_64-linux-gnu/slurm-wlm",
     "PidFile": "/var/run/slurmdbd.pid",
     "LogFile": "/var/log/slurm/slurmdbd.log",
@@ -18,7 +23,7 @@
 
 SLURMDBD_DEFAULTS_FILE = Path("/etc/default/slurmdbd")
 
-UBUNTU_HPC_PPA_KEY: str = """
+UBUNTU_HPC_PPA_KEY = """
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Comment: Hostname:
 Version: Hockeypuck 2.1.1-10-gec3b0e7