From 213a659f8dfbb5f6f9e139b5867ef730d213ccb4 Mon Sep 17 00:00:00 2001
From: Samuel Allan <samuel.allan@canonical.com>
Date: Fri, 11 Oct 2024 15:25:17 +1030
Subject: [PATCH] Enable cache in openstack-exporter

Also remove the scrape_timeout override.
This is discouraged by the prometheus_scrape lib,
and should no longer be necessary if the exporter has a cache.

We also need to use a newer build of the oci-image
that has the cache feature.

Change-Id: Ibac014171a084798ec1731553bbd896497d232a0
---
 charms/openstack-exporter-k8s/charmcraft.yaml | 2 +-
 charms/openstack-exporter-k8s/src/charm.py    | 2 +-
 tests/misc/smoke.yaml.j2                      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/charms/openstack-exporter-k8s/charmcraft.yaml b/charms/openstack-exporter-k8s/charmcraft.yaml
index d68baa17..10981e7a 100644
--- a/charms/openstack-exporter-k8s/charmcraft.yaml
+++ b/charms/openstack-exporter-k8s/charmcraft.yaml
@@ -31,7 +31,7 @@ resources:
   openstack-exporter-image:
     type: oci-image
     description: OCI image for OpenStack openstack-exporter
-    upstream-source: ghcr.io/canonical/openstack-exporter:1.7.0
+    upstream-source: ghcr.io/canonical/openstack-exporter:1.7.0-3be9ddb
 
 requires:
   identity-ops:
diff --git a/charms/openstack-exporter-k8s/src/charm.py b/charms/openstack-exporter-k8s/src/charm.py
index 40dc378d..439a76d3 100755
--- a/charms/openstack-exporter-k8s/src/charm.py
+++ b/charms/openstack-exporter-k8s/src/charm.py
@@ -90,6 +90,7 @@ class OSExporterPebbleHandler(sunbeam_chandlers.ServicePebbleHandler):
                     "command": (
                         "openstack-exporter"
                         " --os-client-config /etc/os-exporter/clouds.yaml"
+                        " --cache --cache-ttl=5m"
                         # Using legacy mode as params are not
                         # supported by prometheus_scrape interface
                         " default"
@@ -244,7 +245,6 @@ class OSExporterOperatorCharm(sunbeam_charm.OSBaseOperatorCharmK8S):
                 # this will become the internal exporter metrics when
                 # probe can be configured with params
                 "job_name": "openstack-cloud-metrics",
-                "scrape_timeout": "60s",
                 "static_configs": [
                     {
                         "targets": [
diff --git a/tests/misc/smoke.yaml.j2 b/tests/misc/smoke.yaml.j2
index 2af907ac..50b12aee 100644
--- a/tests/misc/smoke.yaml.j2
+++ b/tests/misc/smoke.yaml.j2
@@ -89,7 +89,7 @@ applications:
     base: ubuntu@24.04
     scale: 1
     resources:
-      openstack-exporter-image: ghcr.io/canonical/openstack-exporter:1.6.0-7533071
+      openstack-exporter-image: ghcr.io/canonical/openstack-exporter:1.7.0-3be9ddb
   horizon:
     {% if horizon_k8s is defined and horizon_k8s is sameas true -%}
     charm: ../../../horizon-k8s.charm