Merge branch 'main' into renovate/rpds-py-0.x

canonical · Nov 8, 2024 · ea30e6c · ea30e6c
2 parents 6fc7104 + ac05a91
commit ea30e6c
Show file tree

Hide file tree

Showing 10 changed files with 8,011 additions and 5 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -18,7 +18,5 @@ jobs:
       channel: 1.28-strict/stable
       charmcraft-channel: latest/edge
       juju-channel: 3.4/stable
-      self-hosted-runner: true
-      self-hosted-runner-label: "edge"
       microk8s-addons: "dns ingress rbac storage metallb:10.64.140.43-10.64.140.49"
       pre-run-script: tests/integration/prepare.sh
diff --git a/.trivyignore b/.trivyignore
@@ -13,10 +13,11 @@ CVE-2022-1471
 CVE-2024-21634
 CVE-2024-22871
 CVE-2024-7885
-CVE-2024-1635 
+CVE-2024-1635
+CVE-2024-47554
 # nodejs
 CVE-2024-37890
 # clojure
 CVE-2024-22871
 # pebble
-CVE-2024-34156
+CVE-2024-34156
diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -64,6 +64,17 @@ requires:
     interface: oauth
     limit: 1
     optional: true
+  logging:
+    interface: loki_push_api
+    optional: true
+
+provides:
+  metrics-endpoint:
+    interface: prometheus_scrape
+    optional: true
+  grafana-dashboard:
+    interface: grafana_dashboard
+    optional: true
 
 resources:
   penpot-image: