Add prometheus-exporter to HAProxy (#659)

* add prometheus-exporter to HAProxy build params. https://www.haproxy.com/blog/haproxy-exposes-a-prometheus-metrics-endpoint/ * update tests. add endpoint to readme Co-authored-by: Kamil Kayumov <kamil.kayumov@diginetica.com>
mesosphere · Mar 24, 2020 · fd1c710 · fd1c710
1 parent d0b0ade
commit fd1c710
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 56 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -81,6 +81,7 @@ RUN set -x \
         USE_REGPARM=1 \
         USE_STATIC_PCRE=1 \
         USE_ZLIB=1 \
+	    EXTRA_OBJS="contrib/prometheus-exporter/service-prometheus.o" \
         all \
         install-bin \
     && rm -rf /usr/src/haproxy \

diff --git a/Longhelp.md b/Longhelp.md
diff --git a/README.md b/README.md
@@ -171,6 +171,7 @@ Marathon-lb exposes a few endpoints on port 9090 (by default). They are:
 | `:9090/_haproxy_getpids`      | Returns the PIDs for all HAProxy instances within the current process namespace. This literally returns `$(pidof haproxy)`. Implemented in [`getpids.lua`](getpids.lua). This is also used by the [`zdd.py`](zdd.py) script to determine if connections have finished draining during a deploy. |
 | `:9090/_mlb_signal/hup`*      | Sends a `SIGHUP` signal to the marathon-lb process, causing it to fetch the running apps from Marathon and reload the HAProxy config as though an event was received from Marathon.                                                                                                             |
 | `:9090/_mlb_signal/usr1`*     | Sends a `SIGUSR1` signal to the marathon-lb process, causing it to restart HAProxy with the existing config, without checking Marathon for changes.                                                                                                                                             |
+| `:9090/metrics`               | Exposes HAProxy metrics in prometheus format.                                                                                                                                                                                                                                                   |
 
 \* These endpoints won't function when marathon-lb is in `poll` mode as there is no marathon-lb process to be signaled in this mode (marathon-lb exits after each poll).
 

diff --git a/config.py b/config.py
@@ -82,6 +82,7 @@ def load(self):
   balance
   mode http
   stats enable
+  http-request use-service prometheus-exporter if { path /metrics }
   monitor-uri /_haproxy_health_check
   acl getpid path /_haproxy_getpids
   http-request use-service lua.getpids if getpid

diff --git a/tests/test_marathon_lb.py b/tests/test_marathon_lb.py
@@ -65,6 +65,7 @@ def setUp(self):
   balance
   mode http
   stats enable
+  http-request use-service prometheus-exporter if { path /metrics }
   monitor-uri /_haproxy_health_check
   acl getpid path /_haproxy_getpids
   http-request use-service lua.getpids if getpid

diff --git a/tests/test_marathon_lb_haproxy_options.py b/tests/test_marathon_lb_haproxy_options.py
@@ -59,6 +59,7 @@ def template_option(opt):
   balance
   mode http
   stats enable
+  http-request use-service prometheus-exporter if { path /metrics }
   monitor-uri /_haproxy_health_check
   acl getpid path /_haproxy_getpids
   http-request use-service lua.getpids if getpid