Merge ~peppepetra/prometheus-openstack-exporter-snap:lp1998152 into prometheus-openstack-exporter-snap:master

[Giuseppe Petralia]

Fix broken symlink python3 and unmet dependencies warnings.

0a2d223... by Giuseppe Petralia on 2022-12-07

Fix exporter hitting systemd tasks limit.

[Giuseppe Petralia (peppepetra)]

This MP fixes the two issues reported on the bug.

1. Fix the broken symlinks to python3 so that now the exporter uses the python3 installed by the snap

2. Remove the usage of ForkingHTTPServer that is causing the exporter to fork a new thread on each execution and incrementing the tasks count until the limit is reached and then throws BlockingIOError

Test build: https://private-fileshare.canonical.com/~peppepetra/prometheus-openstack-exporter_0.1.9+git1.a696049-dirty_amd64.snap

2380c82... by Giuseppe Petralia on 2022-12-07

Replace the python38 stage snap with python3.8 stage-packages

[Gabriel Cocenza (gabrielcocenza)]

The patch LGTM, but I would like to ask a little change inline.

review: Needs Information

[Martin Kalcok (martin-kalcok)]

LGTM, thanks Giuseppe.

review: Approve

[Giuseppe Petralia (peppepetra)]

reply inline

e15f24f... by Giuseppe Petralia on 2022-12-15

Address review comments

[Gabriel Cocenza (gabrielcocenza)]

LGTM. Thanks

review: Approve

[Erhan Sunar (esunar)]

review: Approve

[Mustafa Kemal Gilor (mustafakemalgilor)]

Hello,

Any ETA on when this is going to be merged?

[Shunde Zhang (shunde-zhang)]

Hello,

Can we merge this and release the fix?
A customer is waiting for this.

[Gabriel Cocenza (gabrielcocenza)]

Hello folks.

A small mistake happened about this patch that was landed on launchpad when the repo is designed to use github[0].

I'll open a new PR on github and try to merge and release as soon as posible to have this fixed.

Thanks for the comprehension and I'll let you know when everything is fixed and released.

[0] https://github.com/canonical/prometheus-openstack-exporter

[Chuan Li (lccn)]

Hello,

Is there any update so far?
A customer is still waiting for this.

[Gabriel Cocenza (gabrielcocenza)]

Hello, it seems that version 0.1.10 that contains this patch is available since 28 July 2023 on the stable channel.

Thanks

Unmerged commits

e15f24f... by Giuseppe Petralia on 2022-12-15

Address review comments

2380c82... by Giuseppe Petralia on 2022-12-07

Replace the python38 stage snap with python3.8 stage-packages

0a2d223... by Giuseppe Petralia on 2022-12-07

Fix exporter hitting systemd tasks limit.

a696049... by Giuseppe Petralia on 2022-12-07

Fix broken symlink python3 and unmet dependencies warnings.

Closes-Bug: #1998152

diff --git a/prometheus-openstack-exporter b/prometheus-openstack-exporter
index 72bb234..5cc300c 100755
--- a/prometheus-openstack-exporter
+++ b/prometheus-openstack-exporter
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 OpenStack exporter for the prometheus monitoring system.
 
@@ -1008,10 +1008,6 @@ class SwiftAccountUsage:
         return generate_latest(self.registry)
 
 
-class ForkingHTTPServer(ForkingMixIn, HTTPServer):  # noqa: D101
-    pass
-
-
 # This could perhaps be cleverer, but surely not simpler.
 COLLECTORS = {
     "cinder": Cinder,
@@ -1132,7 +1128,7 @@ if __name__ == "__main__":
     if data_gatherer_needed(config):
         data_gatherer = DataGatherer()
         data_gatherer.start()
-    server = ForkingHTTPServer(("", config.get("listen_port")), handler)
+    server = HTTPServer(("", config.get("listen_port")), handler)
     server.timeout = config.get("cache_refresh_interval", 900)
     while True:
         sleep(0)
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 6ae8945..37fdfb9 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -22,6 +22,19 @@ parts:
     stage-packages:
       - libdb5.3
       - liberasurecode-dev
+      - libncursesw5
+      - libtinfo5
+      - libpython3-stdlib
+      - libpython3.8-minimal
+      - libpython3.8-stdlib
+      - python3.8-minimal
+      - python3-distutils
+      - python3-minimal
+      - python3-pkg-resources
+      - python3-pip
+      - python3-setuptools
+      - python3-venv
+      - python3-wheel
   example-config:
     plugin: dump
     source: .
diff --git a/snap_cmd_wrapper b/snap_cmd_wrapper
index ef5611d..5ead4e8 100755
--- a/snap_cmd_wrapper
+++ b/snap_cmd_wrapper
@@ -5,4 +5,4 @@
 # Copy only if not existing
 cp -pn $SNAP/etc/prometheus/prometheus-openstack-exporter.yaml.example $SNAP_DATA/prometheus-openstack-exporter.yaml
 test -r $SNAP_DATA/admin.novarc && . $SNAP_DATA/admin.novarc
-exec $SNAP/bin/prometheus-openstack-exporter $SNAP_DATA/prometheus-openstack-exporter.yaml
+exec $SNAP/bin/python3 $SNAP/bin/prometheus-openstack-exporter $SNAP_DATA/prometheus-openstack-exporter.yaml