From e03af38f48764a203ad9f1b5b96a3f9a7d6c35ec Mon Sep 17 00:00:00 2001
From: jamesbeedy <jamesbeedy@gmail.com>
Date: Thu, 27 Jun 2024 16:31:52 +0000
Subject: [PATCH] push last of local changes for slurmdbd-operator

These changes:
* remove fluentbit integration and associated code
* adds back creation of the the state dir
* fix path to jwt_key
---
 .gitignore                           |   1 -
 charmcraft.yaml                      |   2 -
 lib/charms/fluentbit/v0/fluentbit.py | 203 ---------------------------
 src/charm.py                         |  17 +--
 src/constants.py                     |  33 +----
 src/slurmctld_ops.py                 |   7 +
 6 files changed, 9 insertions(+), 254 deletions(-)
 delete mode 100644 lib/charms/fluentbit/v0/fluentbit.py

diff --git a/.gitignore b/.gitignore
index 2180401..da25869 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,4 @@ __pycache__/
 .idea
 .vscode/
 version
-.mypy_cache
 .ruff_cache
diff --git a/charmcraft.yaml b/charmcraft.yaml
index db30591..72b0520 100644
--- a/charmcraft.yaml
+++ b/charmcraft.yaml
@@ -29,8 +29,6 @@ requires:
     interface: slurmdbd
   slurmrestd:
     interface: slurmrestd
-  fluentbit:
-    interface: fluentbit
 
 assumes:
   - juju
diff --git a/lib/charms/fluentbit/v0/fluentbit.py b/lib/charms/fluentbit/v0/fluentbit.py
deleted file mode 100644
index aa68450..0000000
--- a/lib/charms/fluentbit/v0/fluentbit.py
+++ /dev/null
@@ -1,203 +0,0 @@
-r"""Fluentbit charm libraries.
-
-This library contains two main classes: `FluentbitProvider` and
-`FluentbitClient`. `FluentbitProvider` class is instantiated in the Fluentbit
-Server charm, and receives configuration data through a relation to other
-charms. `FluentbitClient` class should be instantiated in any charm that wants
-to ship logs via Fluentbit.
-
-## Forwarding logs using Fluentbit
-
-To forward logs from your charm to a centralized place using Fluentbit,
-instantiate the `FluentbitClient()` class and handle the `relation_created`
-event in your main charm code. In this event, your charm must pass all the
-configuration parameters necessary to configure Fluentbit: the inputs, the
-parsers, and the filters.
-
-For example:
-
-```python
-class MyCharm(CharmBase):
-    def __init__(self, *args):
-        super().__init__(*args)
-
-        self._fluentbit = FluentbitClient(self, "fluentbit")
-
-        self.framework.observe(self.on.fluentbit.relation_created,
-                               self._fluentbit_relation_created)
-
-    def _fluentbit_relation_created(self, event):
-        cfg = [{"input": [("name",     "tail"),
-                          ("path",     "/var/log/foo/bar.log"),
-                          ("path_key", "filename"),
-                          ("tag",      "foo"),
-                          ("parser",   "bar")]},
-               {"parser": [("name",        "bar"),
-                           ("format",      "regex"),
-                           ("regex",       "^\[(?<time>[^\]]*)\] (?<log>.*)$"),
-                           ("time_key",    "time"),
-                           ("time_format", "%Y-%m-%dT%H,%M,%S.%L")]}]
-        self._fluentbit.configure(cfg)
-```
-
-The configuration object must be a list of dictionaries. Each dictionary must
-contain one key. The key must be the section of Fluentbit's processing
-pipeline. Valid ones are:
-- `input`
-- `filter`
-- `parser`
-- `multiline_parser`
-- `output`
-
-The value of each key must be a list of all configuration entries. Each entry
-is a tuple (or list) of values to be rendered in the configuration files.
-
-Your charm's `metadata.yaml` should have the Fluentbit relation entry in the
-`requires` section:
-
-```
-requires:
-      fluentbit:
-          interface: fluentbit
-```
-
-
-## FluentbitProvider class
-
-This class receives the configuration data and forwards to the Fluentbit Charm,
-to rewrite the configuration files and restart the service. This class should
-only be instantiated by Fluentbit Charm.
-
-## Caveats
-
-The charm does not validate the configuration files before restarting the
-service. It is the charm author's responsibility to ensure the configuration is
-correct.
-"""
-
-import logging
-import json
-from typing import List
-
-from ops.framework import EventBase, EventSource, Object, ObjectEvents, StoredState
-from ops.model import Relation
-
-# The unique Charmhub library identifier, never change it
-LIBID = "e7b5ae1460034b9fb67cd4ec6aa3e87f"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 0
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 2
-
-logger = logging.getLogger(__name__)
-
-
-class FluentbitConfigurationAvailable(EventBase):
-    """Emitted when configuration is available."""
-
-
-class FluentbitEvents(ObjectEvents):
-    """Fluentbit emitted events."""
-
-    configuration_available = EventSource(FluentbitConfigurationAvailable)
-
-
-class FluentbitProvider(Object):
-    """Implement the provider side of the relation."""
-
-    _state = StoredState()
-    on = FluentbitEvents()
-
-    def __init__(self, charm, relation_name: str):
-        """Initialize the service provider.
-
-        Arguments:
-            charm: a `CharmBase` instance that manages this instance of the
-                   Fluentbit service.
-            relation_name: string name of the relation that provides the
-                           Fluentbit logging service.
-        """
-        super().__init__(charm, relation_name)
-
-        self.charm = charm
-        self._relation_name = relation_name
-
-        self._state.set_default(cfg=str())
-
-        events = self.charm.on[relation_name]
-        self.framework.observe(events.relation_changed, self._on_relation_changed)
-        # TODO relation_broken should reconfigure with empty/default values,
-        #      with care to not remove other entries from other relations
-
-    def _on_relation_changed(self, event):
-        """Get configuration from the client and trigger a reconfiguration."""
-        cfg = event.relation.data[event.unit].get("configuration")
-        logger.debug(f"## relation-changed: received: {cfg}")
-        # TODO this only works for 1 relation, should extend for any number of
-        #      relations, so it can support multiple outputs easily?
-        if cfg:
-            self._state.cfg = cfg
-            self.on.configuration_available.emit()
-
-    @property
-    def configuration(self) -> List[dict]:
-        """Get the stored configuration.
-
-        Returns:
-            list of dictionaries with the configuration parameters.
-        """
-        cfg = json.loads(self._state.cfg or '[]')
-        logger.debug(f"## Fluentbit stored configuration: {cfg}")
-        return cfg
-
-
-class FluentbitClient(Object):
-    """A client to relate to a Fluentbit Charm.
-
-    This class implements the `requires` end of the relation, to configure
-    Fluentbit.
-
-    The instantiating class must handle the `relation_created` event to
-    configure Fluentbit:
-    """
-    def __init__(self, charm, relation_name: str):
-        """Initialize Fluentbit client.
-
-        Arguments:
-            charm: a `CharmBase` object that manages this `FluentbitClient`
-                   object. Typically this is `self` in the instantiating class.
-            relation_name: string name of the relation between `charm` and the
-                           Fluentbit charmed service.
-        """
-        super().__init__(charm, relation_name)
-
-        self._charm = charm
-        self._relation_name = relation_name
-
-    def configure(self, cfg: List[dict]):
-        r"""Configure Fluentbit.
-
-        Arguments:
-            cfg: a list of stuff to setup. Example:
-                [{"input": [("name",     "tail"),
-                            ("path",     "/var/log/slurm/slurmd.log"),
-                            ("path_key", "filename"),
-                            ("tag",      "slurmd"),
-                            ("parser",   "slurm")]},
-                 {"parser": [("name",        "slurm"),
-                             ("format",      "regex"),
-                             ("regex",       "^\[(?<time>[^\]]*)\] (?<message>.*)$"),
-                             ("time_key",    "time"),
-                             ("time_format", "%Y-%m-%dT%H,%M,%S.%L")]},
-        """
-        # should we validate the input? how?
-        logging.debug(f"## Seding configuration data to Fluentbit: {cfg}")
-        self._relation.data[self.model.unit]["configuration"] = json.dumps(cfg)
-
-    @property
-    def _relation(self) -> Relation:
-        """Return the relation."""
-        return self.framework.model.get_relation(self._relation_name)
diff --git a/src/charm.py b/src/charm.py
index 56f96b0..c5d34b0 100755
--- a/src/charm.py
+++ b/src/charm.py
@@ -9,8 +9,7 @@
 import subprocess
 from typing import Any, Dict, List, Optional, Union
 
-from charms.fluentbit.v0.fluentbit import FluentbitClient
-from constants import CHARM_MAINTAINED_SLURM_CONF_PARAMETERS, FLUENTBIT_CONFIG, SLURM_CONF_PATH
+from constants import CHARM_MAINTAINED_SLURM_CONF_PARAMETERS, SLURM_CONF_PATH
 from interface_slurmd import (
     PartitionAvailableEvent,
     PartitionUnavailableEvent,
@@ -34,7 +33,6 @@
     CharmBase,
     ConfigChangedEvent,
     InstallEvent,
-    RelationCreatedEvent,
     StoredState,
     UpdateStatusEvent,
     WaitingStatus,
@@ -68,29 +66,21 @@ def __init__(self, *args):
 
         self._slurmctld_manager = SlurmctldManager()
 
-        self._fluentbit = FluentbitClient(self, "fluentbit")
         self._slurmd = Slurmd(self, "slurmd")
         self._slurmdbd = Slurmdbd(self, "slurmdbd")
         self._slurmrestd = Slurmrestd(self, "slurmrestd")
 
         event_handler_bindings = {
-            # Charm lifecycle hook events
             self.on.install: self._on_install,
             self.on.update_status: self._on_update_status,
             self.on.config_changed: self._on_config_changed,
-            # slurmdbd lifecycle hook events
             self._slurmdbd.on.slurmdbd_available: self._on_slurmdbd_available,
             self._slurmdbd.on.slurmdbd_unavailable: self._on_slurmdbd_unavailable,
-            # slurmd lifecycle hook events
             self._slurmd.on.partition_available: self._on_write_slurm_conf,
             self._slurmd.on.partition_unavailable: self._on_write_slurm_conf,
             self._slurmd.on.slurmd_available: self._on_write_slurm_conf,
             self._slurmd.on.slurmd_departed: self._on_write_slurm_conf,
-            # slurmrestd available
             self._slurmrestd.on.slurmrestd_available: self._on_slurmrestd_available,
-            # fluentbit
-            self.on["fluentbit"].relation_created: self._on_fluentbit_relation_created,
-            # actions
             self.on.show_current_config_action: self._on_show_current_config_action,
             self.on.drain_action: self._on_drain_nodes_action,
             self.on.resume_action: self._on_resume_nodes_action,
@@ -173,11 +163,6 @@ def _on_show_current_config_action(self, event: ActionEvent) -> None:
         slurm_conf = SLURM_CONF_PATH.read_text()
         event.set_results({"slurm.conf": slurm_conf})
 
-    def _on_fluentbit_relation_created(self, event: RelationCreatedEvent) -> None:
-        """Set up Fluentbit log forwarding."""
-        logger.debug("## Configuring fluentbit")
-        self._fluentbit.configure(FLUENTBIT_CONFIG)
-
     def _on_slurmrestd_available(self, event: SlurmrestdAvailableEvent) -> None:
         """Check that we have slurm_config when slurmrestd available otherwise defer the event."""
         if self.model.unit.is_leader():
diff --git a/src/constants.py b/src/constants.py
index c074c34..1890c15 100644
--- a/src/constants.py
+++ b/src/constants.py
@@ -8,7 +8,7 @@
 SLURM_GROUP = "slurm"
 
 CHARM_MAINTAINED_SLURM_CONF_PARAMETERS = {
-    "AuthAltParameters": "jwt_key=/var/spool/slurmctldjwt_hs256.key",
+    "AuthAltParameters": "jwt_key=/var/spool/slurmctld/jwt_hs256.key",
     "AuthAltTypes": "auth/jwt",
     "AuthInfo": "/var/run/munge/munge.socket.2",
     "AuthType": "auth/munge",
@@ -34,37 +34,6 @@
     "RebootProgram": '"/usr/sbin/reboot --reboot"',
 }
 
-
-FLUENTBIT_CONFIG = [
-    {
-        "input": [
-            ("name", "tail"),
-            ("path", "/var/log/slurm/slurmctld.log"),
-            ("path_key", "filename"),
-            ("tag", "slurmctld"),
-            ("parser", "slurm"),
-        ]
-    },
-    {
-        "parser": [
-            ("name", "slurm"),
-            ("format", "regex"),
-            ("regex", r"^\[(?<time>[^\]]*)\] (?<log>.*)$"),
-            ("time_key", "time"),
-            ("time_format", "%Y-%m-%dT%H:%M:%S.%L"),
-        ]
-    },
-    {
-        "filter": [
-            ("name", "record_modifier"),
-            ("match", "slurmctld"),
-            ("record", "hostname ${HOSTNAME}"),
-            ("record", "service slurmctld"),
-        ]
-    },
-]
-
-
 UBUNTU_HPC_PPA_KEY = """
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Comment: Hostname:
diff --git a/src/slurmctld_ops.py b/src/slurmctld_ops.py
index 07819f9..c3315cb 100644
--- a/src/slurmctld_ops.py
+++ b/src/slurmctld_ops.py
@@ -138,6 +138,13 @@ def install(self) -> bool:
             return False
         systemd.service_stop("munge")
 
+        spool_dir = Path("/var/spool/slurmctld")
+        if not spool_dir.exists():
+            spool_dir.mkdir()
+
+        slurm_user_uid, slurm_group_gid = _get_slurm_user_uid_and_slurm_group_gid()
+        os.chown(f"{spool_dir}", slurm_user_uid, slurm_group_gid)
+
         return True
 
     def version(self) -> str: