X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fprometheus%2Fsrc%2Fcharm.py;h=e79de6985a3e3cf610a26a9b32d885092a95871b;hb=refs%2Fchanges%2F27%2F11127%2F2;hp=3d72cace76d0ebed42174c5cffc222205d82739c;hpb=49379ced23b5e344a773ce77ac9cb59c1864e19b;p=osm%2Fdevops.git

diff --git a/installers/charm/prometheus/src/charm.py b/installers/charm/prometheus/src/charm.py
index 3d72cace..e79de698 100755
--- a/installers/charm/prometheus/src/charm.py
+++ b/installers/charm/prometheus/src/charm.py
@@ -22,30 +22,28 @@
 
 # pylint: disable=E0213
 
-import logging
-from typing import Optional, NoReturn
 from ipaddress import ip_network
+import logging
+from typing import NoReturn, Optional
+from urllib.parse import urlparse
 
+from oci_image import OCIImageResource
 from ops.framework import EventBase
 from ops.main import main
-
 from opslib.osm.charm import CharmedOsmBase
-
+from opslib.osm.interfaces.prometheus import PrometheusServer
 from opslib.osm.pod import (
-    IngressResourceV3Builder,
-    FilesV3Builder,
     ContainerV3Builder,
+    FilesV3Builder,
+    IngressResourceV3Builder,
     PodSpecV3Builder,
 )
-
-
 from opslib.osm.validator import (
     ModelValidator,
     validator,
 )
+import requests
 
-from opslib.osm.interfaces.prometheus import PrometheusServer
-from urllib.parse import urlparse
 
 logger = logging.getLogger(__name__)
 
@@ -57,9 +55,12 @@ class ConfigModel(ModelValidator):
     default_target: str
     max_file_size: int
     site_url: Optional[str]
+    cluster_issuer: Optional[str]
+    ingress_class: Optional[str]
     ingress_whitelist_source_range: Optional[str]
     tls_secret_name: Optional[str]
     enable_web_admin_api: bool
+    image_pull_policy: str
 
     @validator("web_subpath")
     def validate_web_subpath(cls, v):
@@ -87,6 +88,18 @@ class ConfigModel(ModelValidator):
             ip_network(v)
         return v
 
+    @validator("image_pull_policy")
+    def validate_image_pull_policy(cls, v):
+        values = {
+            "always": "Always",
+            "ifnotpresent": "IfNotPresent",
+            "never": "Never",
+        }
+        v = v.lower()
+        if v not in values.keys():
+            raise ValueError("value must be always, ifnotpresent or never")
+        return values[v]
+
 
 class PrometheusCharm(CharmedOsmBase):
 
@@ -103,9 +116,24 @@ class PrometheusCharm(CharmedOsmBase):
             self._publish_prometheus_info,
         )
 
+        # Registering actions
+        self.framework.observe(
+            self.on.backup_action,  # pylint: disable=E1101
+            self._on_backup_action,
+        )
+
     def _publish_prometheus_info(self, event: EventBase) -> NoReturn:
         self.prometheus.publish_info(self.app.name, PORT)
 
+    def _on_backup_action(self, event: EventBase) -> NoReturn:
+        url = f"http://{self.model.app.name}:{PORT}/api/v1/admin/tsdb/snapshot"
+        result = requests.post(url)
+
+        if result.status_code == 200:
+            event.set_results({"backup-name": result.json()["name"]})
+        else:
+            event.fail(f"status-code: {result.status_code}")
+
     def _build_files(self, config: ConfigModel):
         files_builder = FilesV3Builder()
         files_builder.add_file(
@@ -132,8 +160,19 @@ class PrometheusCharm(CharmedOsmBase):
         config = ConfigModel(**dict(self.config))
         # Create Builder for the PodSpec
         pod_spec_builder = PodSpecV3Builder()
+
+        # Build Backup Container
+        backup_image = OCIImageResource(self, "backup-image")
+        backup_image_info = backup_image.fetch()
+        backup_container_builder = ContainerV3Builder("prom-backup", backup_image_info)
+        backup_container = backup_container_builder.build()
+        # Add backup container to pod spec
+        pod_spec_builder.add_container(backup_container)
+
         # Build Container
-        container_builder = ContainerV3Builder(self.app.name, image_info)
+        container_builder = ContainerV3Builder(
+            self.app.name, image_info, config.image_pull_policy
+        )
         container_builder.add_port(name=self.app.name, port=PORT)
         container_builder.add_http_readiness_probe(
             "/-/ready",
@@ -173,8 +212,10 @@ class PrometheusCharm(CharmedOsmBase):
                     str(config.max_file_size) + "m"
                     if config.max_file_size > 0
                     else config.max_file_size
-                ),
+                )
             }
+            if config.ingress_class:
+                annotations["kubernetes.io/ingress.class"] = config.ingress_class
             ingress_resource_builder = IngressResourceV3Builder(
                 f"{self.app.name}-ingress", annotations
             )
@@ -184,6 +225,9 @@ class PrometheusCharm(CharmedOsmBase):
                     "nginx.ingress.kubernetes.io/whitelist-source-range"
                 ] = config.ingress_whitelist_source_range
 
+            if config.cluster_issuer:
+                annotations["cert-manager.io/cluster-issuer"] = config.cluster_issuer
+
             if parsed.scheme == "https":
                 ingress_resource_builder.add_tls(
                     [parsed.hostname], config.tls_secret_name