observability team mailing list archive

[Marcus Boden <mp+489679@xxxxxxxxxxxxxxxxxx>]

Marcus Boden has proposed merging strongswan-snap:exporter into strongswan-snap:main.

Requested reviews:
  Llama (LMA) Charmers (llama-charmers)

For more details, see:
https://code.launchpad.net/~llama-charmers/strongswan-snap/+git/strongswan-snap/+merge/489679
-- 
Your team Llama (LMA) Charmers is requested to review the proposed merge of strongswan-snap:exporter into strongswan-snap:main.

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 67a99b9..cdd8df4 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -42,6 +42,14 @@ apps:
       - network-bind
       - network-control
 
+  exporter:
+    daemon: simple
+    command: /bin/ipsec-prometheus-exporter --vici-network unix --vici-address $SNAP_COMMON/run/charon.vici
+    plugs:
+      - network-bind
+    after:
+      - daemon
+
 layout:
   /usr/libexec/ipsec:
     bind: $SNAP/usr/libexec/ipsec
@@ -119,9 +127,15 @@ parts:
       echo "setting version to: $VER"
       craftctl set version=$VER
       craftctl default
+      # The --sysconfdir puts everything into the snapped path by default. We don't want that yet
       rsync -a $CRAFT_PART_INSTALL/var/snap/strongswan-ipsec/current/etc/ $CRAFT_PART_INSTALL/etc/
       # See https://github.com/strongswan/strongswan/discussions/1542
       sed -i -e "s/\/var\/lock\/subsys/\/var\/snap\/strongswan-ipsec\/common\/lock\/subsys/g" $CRAFT_PART_INSTALL/usr/sbin/ipsec
-    override-prime: |
-      craftctl default
-
+      #    override-prime: |
+      #      craftctl default
+  exporter:
+    plugin: go
+    build-snaps: [go/latest/stable]
+    source: https://github.com/torilabs/ipsec-prometheus-exporter
+    source-type: git
+    source-tag: v1.3.1