Alert history

CHANGELOG.md

@@ -1,6 +1,11 @@
 # CHANGELOG
 
 ## Release 2.9.0 (in development)
+### Features Added
+- [#3180](https://github.com/scality/metalk8s/issues/3180) - All alerts from
+  Alertmanager are now stored in Loki database for persistence
+  (PR[#3191](https://github.com/scality/metalk8s/pull/))
+
 ### Enhancements
 - Bump Kubernetes version to 1.20.4 (PR[#3139](https://github.com/scality/metalk8s/pull/3139))
 

buildchain/buildchain/constants.py

@@ -130,6 +130,7 @@ def git_ref() -> Optional[str]:
 STORAGE_OPERATOR_SOURCES: FrozenSet[Path] = frozenset(
     filepath for filepath in STORAGE_OPERATOR_ROOT.rglob("*.go")
 )
+GO_SOURCES: FrozenSet[Path] = frozenset(filepath for filepath in ROOT.rglob("*.go"))
 
 # For mypy, see `--no-implicit-reexport` documentation.
 __all__ = ["ROOT"]

buildchain/buildchain/format.py

@@ -23,15 +23,14 @@ def task_format() -> Iterator[types.TaskDict]:
 
 def format_go() -> types.TaskDict:
     """Format Go code using gofmt."""
-    cwd = constants.STORAGE_OPERATOR_ROOT
     cmd = " ".join(
         map(
             shlex.quote,
             [
                 config.ExtCommand.GOFMT.value,
                 "-s",
                 "-w",
-                *tuple(constants.STORAGE_OPERATOR_FMT_ARGS),
+                *tuple(str(path) for path in constants.GO_SOURCES),
             ],
         )
     )
@@ -40,9 +39,9 @@ def format_go() -> types.TaskDict:
         "name": "go",
         "title": utils.title_with_subtask_name("FORMAT"),
         "doc": format_go.__doc__,
-        "actions": [doit.action.CmdAction(cmd, cwd=cwd)],
+        "actions": [doit.action.CmdAction(cmd, cwd=constants.ROOT).execute],
         "task_dep": ["check_for:gofmt"],
-        "file_dep": list(constants.STORAGE_OPERATOR_SOURCES),
+        "file_dep": list(constants.GO_SOURCES),
     }
 
 

buildchain/buildchain/image.py

@@ -236,6 +236,9 @@ def _operator_image(name: str, **kwargs: Any) -> targets.OperatorImage:
 # }}}
 # Container images to build {{{
 TO_BUILD: Tuple[targets.LocalImage, ...] = (
+    _local_image(
+        name="metalk8s-alert-logger",
+    ),
     _local_image(
         name="salt-master",
         build_args={"SALT_VERSION": versions.SALT_VERSION},

buildchain/buildchain/lint.py

@@ -140,14 +140,13 @@ def lint_sls() -> types.TaskDict:
 
 def check_go_fmt() -> Optional[doit.exceptions.TaskError]:
     """Check if Go code is properly formatted."""
-    cwd = constants.STORAGE_OPERATOR_ROOT
     cmd = [
         config.ExtCommand.GOFMT.value,
         "-s",
         "-d",
-        *tuple(constants.STORAGE_OPERATOR_FMT_ARGS),
+        *tuple(str(path) for path in constants.GO_SOURCES),
     ]
-    diff = subprocess.check_output(cmd, cwd=cwd)
+    diff = subprocess.check_output(cmd, cwd=constants.ROOT)
     if diff:
         return doit.exceptions.TaskError(
             msg="badly formatted Go code, please run `doit.sh format:go`"
@@ -181,7 +180,7 @@ def lint_go() -> types.TaskDict:
         "doc": lint_go.__doc__,
         "actions": [check_go_fmt, check_go_codegen],
         "task_dep": ["check_for:gofmt", "check_for:operator-sdk", "check_for:git"],
-        "file_dep": list(constants.STORAGE_OPERATOR_SOURCES),
+        "file_dep": list(constants.GO_SOURCES),
     }
 
 

buildchain/buildchain/salt_tree.py

@@ -206,6 +206,9 @@ def _get_parts(self) -> Iterator[str]:
         data=versions.SALT_VERSIONS_JSON,
         renderer=targets.Renderer.JSON,
     ),
+    Path("salt/metalk8s/addons/alert-logger/deployed/deployment.sls"),
+    Path("salt/metalk8s/addons/alert-logger/deployed/init.sls"),
+    Path("salt/metalk8s/addons/alert-logger/deployed/service.sls"),
     Path("salt/metalk8s/addons/dex/ca/init.sls"),
     Path("salt/metalk8s/addons/dex/ca/installed.sls"),
     Path("salt/metalk8s/addons/dex/ca/advertised.sls"),

buildchain/buildchain/versions.py

@@ -205,6 +205,11 @@ def _version_prefix(version: str, prefix: str = "v") -> str:
         digest="sha256:240b10b07e15e95c3009da938e3abb8bef2fa47ea1f719ae58f7dd116bcb2f10",
     ),
     # Local images
+    Image(
+        name="metalk8s-alert-logger",
+        version=VERSION,
+        digest=None,
+    ),
     Image(
         name="metalk8s-ui",
         version=VERSION,

docs/Dockerfile

@@ -3,7 +3,7 @@
 # NOTE: the MetalK8s repository root is supposed to be mounted at
 # `/usr/src/metalk8s` when running the container
 
-FROM docker.io/ubuntu:18.04
+FROM docker.io/ubuntu:20.04
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update && \
@@ -16,8 +16,8 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
         make \
         plantuml \
         graphviz \
-        python3.6 \
         python3-buildbot-worker \
+        python3 \
         python3-pip \
         python3-setuptools \
         texlive-fonts-extra \
@@ -30,7 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
 
 # NOTE: the tox package available is too old; we want tox >= 3.4, for the
 # `commands_pre` syntax
-RUN python3.6 -m pip install six==1.14.0 tox==3.14.3 && \
+RUN python3 -m pip install six==1.14.0 tox==3.14.3 && \
     rm -rf ~/.cache/pip
 
 WORKDIR /usr/src/metalk8s