Merge pull request #243 from metno/custom_metrics_patch_2

use GunicornInternalPrometheusMetrics

Dockerfile

@@ -101,10 +101,6 @@ ENTRYPOINT ["dumb-init", "--"]
 
 ENV PROMETHEUS_MULTIPROC_DIR /tmp
 ENV prometheus_multiproc_dir /tmp
-ENV METRICS_PORT 9200
-EXPOSE 9200
-
-COPY container/gunicorn_promexp_config.py /src/
 
 # Start application
-CMD gunicorn -c /src/gunicorn_promexp_config.py --worker-class sync --workers 5 --bind 0.0.0.0:8000 wsgi:app --keep-alive 5 --log-level info
+CMD gunicorn --worker-class sync --workers 5 --bind 0.0.0.0:8000 wsgi:app --keep-alive 5 --log-level info

container/wsgi.py

@@ -20,18 +20,21 @@
 import os
 import sys
 
-from prometheus_flask_exporter.multiprocess import GunicornPrometheusMetrics
+from prometheus_flask_exporter.multiprocess import GunicornInternalPrometheusMetrics
 from werkzeug.middleware.dispatcher import DispatcherMiddleware
-from prometheus_client import make_wsgi_app
+from prometheus_client import make_wsgi_app, CollectorRegistry
+from prometheus_client.core import REGISTRY
 
 from dmci.api import App
 from dmci import CONFIG
 
 if not CONFIG.readConfig(configFile=os.environ.get("DMCI_CONFIG", None)):
     sys.exit(1)
 
+
 app = App()
+REGISTRY.register(CollectorRegistry())
 app.wsgi_app = DispatcherMiddleware(app.wsgi_app, {
-    '/metrics': make_wsgi_app()
+    '/metrics': make_wsgi_app(REGISTRY)
 })
-GunicornPrometheusMetrics(app)
+GunicornInternalPrometheusMetrics(app, path='/metrics', registry=REGISTRY)