Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generate S3 config for mimir workers #15

Merged
merged 5 commits into from
Jan 9, 2024
Merged

Generate S3 config for mimir workers #15

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b538668
mimir-s3
IbraAoad Dec 13, 2023
609f9f0
refactoring _set_data_dirs comments
IbraAoad Dec 14, 2023
ac55935
Merge branch 'main' into mimir-s3
IbraAoad Jan 5, 2024
dc362e6
using hardcoded common root data directory
IbraAoad Jan 8, 2024
673e9bf
Document Coordinator's Path Dependency
IbraAoad Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 3 additions & 34 deletions src/charm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
import logging
import re
import socket
from pathlib import Path
from typing import Any, Dict, List, Optional
from typing import List, Optional

import yaml
from charms.mimir_coordinator_k8s.v0.mimir_cluster import (
Expand Down Expand Up @@ -51,7 +50,6 @@ class MimirWorkerK8SOperatorCharm(CharmBase):
def __init__(self, *args):
super().__init__(*args)
self._container = self.unit.get_container(self._name)
self._root_data_dir = Path(self.meta.containers["mimir"].mounts["data"].location)

self.topology = JujuTopology.from_charm(self)
self.mimir_cluster = MimirClusterRequirer(self)
Expand Down Expand Up @@ -183,43 +181,14 @@ def _update_mimir_config(self) -> bool:
logger.warning("cannot update mimir config: coordinator hasn't published one yet.")
return False

config = self._set_data_dirs(mimir_config)

if self._running_mimir_config() != config:
config_as_yaml = yaml.safe_dump(config)
if self._running_mimir_config() != mimir_config:
config_as_yaml = yaml.safe_dump(mimir_config)
self._container.push(MIMIR_CONFIG, config_as_yaml, make_dirs=True)
logger.info("Pushed new Mimir configuration")
return True

return False

def _set_data_dirs(self, config: Dict[str, Any]) -> dict:
"""Set the data-dirs in the config we received from the coordinator.

- Place all data dirs under a common root data dir, so files are persisted across upgrades.
Following the default names from official docs:
https://grafana.com/docs/mimir/latest/references/configuration-parameters/
"""
config = config.copy()
for key, folder in (
("alertmanager", "data-alertmanager"),
("compactor", "data-compactor"),
):
if key not in config:
config[key] = {}
config[key]["data_dir"] = str(self._root_data_dir / folder)

# blocks_storage:
# bucket_store:
# sync_dir: /etc/mimir/tsdb-sync
# data_dir: /data/tsdb-sync
if config.get("blocks_storage"):
config["blocks_storage"] = {
"bucket_store": {"sync_dir": str(self._root_data_dir / "tsdb-sync")}
}

return config

def _running_mimir_config(self) -> Optional[dict]:
"""Return the Mimir config as dict, or None if retrieval failed."""
if not self._container.can_connect():
Expand Down
Loading