Switch monitoring of haproxy to prometheus

PORT-ALLOCATION

@@ -35,6 +35,7 @@ Internal ports: 7500-7600
 	    RPC:        7579
 	Prometheus:
 	    node_exporter: 7580
+	HAProxy PROM:   7581
 	Promtail:       7590
 
 Public ports:

config/haproxy/APKBUILD

@@ -3,7 +3,7 @@
 
 . ../APKBUILD-config.template
 
-pkgver=2021.08.27.01
+pkgver=2022.02.19.01
 pkgrel=0
 depends="redxen-secret-letsencrypt-full redxen-data-haproxy-errorpages"
 checkdepends="haproxy"
@@ -15,5 +15,5 @@ check() {
 }
 
 sha512sums="
-faa54c311f6682bf783e5d5595a0b24c790adf308fc4ed75aac1a1f4117fbf2e65aaa6149e6ffea10ba06bbf09341f370c7e5b0e6344d4138196cca18cc4e0ba  main.cfg
+fd02b1735e6a3dbc931209e73d25a754f8ba9431024dfeb787a57dfb0384b92fff0127f948ddb49ac99f0065d9fd6843f33fe783fc3caef23371b2775e941cd0  main.cfg
 "

config/haproxy/main.cfg

@@ -4,9 +4,6 @@ global
 
 	log 127.0.0.1:514 local0 info
 
-	stats socket /run/haproxy.sock mode 600 user telegraf
-	stats timeout 2m
-
 defaults
 	mode                        http
 
@@ -60,6 +57,12 @@ listen git-gitea
 	option tcp-check
 	server-template gitssh 1 _gitssh._tcp.routinginfo.internal
 
+frontend metrics
+	mode http
+	bind ipv4@:7581,ipv6@:7581
+
+	http-request use-service prometheus-exporter if { path /metrics }
+
 frontend http
 	mode http
 	bind ipv4@:443,ipv6@:443 ssl crt /etc/redxen/letsencrypt/full.crt alpn h2,http/1.1

config/prometheus/APKBUILD

@@ -3,7 +3,7 @@
 
 . ../APKBUILD-config.template
 
-pkgver=2022.02.03.01
+pkgver=2022.02.19.01
 pkgrel=0
 source="
 	config.yaml
@@ -15,5 +15,5 @@ package() {
 }
 
 sha512sums="
-a8fae8e3f808fa42599e20c098b36fd598260ff8390ba8da0aabe7940c8e9880f7945855eba710e9520be88d8cfb7c4c54cceb2ebbe9d53aa2318117a98cd5af  config.yaml
+3c75373c1f06ac3d99ea422bcaaeecdc749c8073e68a1cebf1dbb1c2528ec0f263c91a11919bb990a185d9565d69fb7e00ca7f185f0c8688c11c2d64bbf5b9be  config.yaml
 "

config/prometheus/config.yaml

@@ -6,3 +6,7 @@ scrape_configs:
           dns_sd_configs:
                 - names: [ 'node_exporters.prometheus.routinginfo.internal' ]
                   type: 'SRV'
+        - job_name: "haproxy"
+          dns_sd_configs:
+                - names: [ 'frontends.prometheus.routinginfo.internal' ]
+                  type: 'SRV'

data/bindzone/APKBUILD

@@ -3,7 +3,7 @@
 
 . ../APKBUILD-data.template
 
-pkgver=2022.02.03.01
+pkgver=2022.02.19.01
 pkgrel=0
 checkdepends="bind-tools"
 makedepends="
@@ -70,5 +70,5 @@ internal() {
 
 sha512sums="
 7232c54d1b07910631af39424ae58e7749b9411ba79aae31e8ff90547faadc9219a7c878fc48d3380aee80eb57dea4493781cfdaae3bf55bfc25411a7412d1b2  redxen.eu
-154ba153566d198159ec4f007677e3a595a4ba9949ae9246b89a3ebfceac0b6c37296fc1b2f1d4cc0f23175736f3ac975213605dfe3026723ad098f10574aa68  internal
+7b03c3984450db16be855543eb2f3732c0aa51286695991b5c2ff01b7e973d1046dac73ef4159f615b72a090149153f46de6c0ba4df0470febdb12ce4dbef815  internal
 "

data/bindzone/internal

@@ -28,6 +28,8 @@ node_exporters.prometheus.routinginfo                   SRV    0 5 7580 12180623
                                                         SRV    0 5 7580 12180625.nbg1-dc3.hetzner
                                                         SRV    0 5 7580 12180710.fsn1-dc14.hetzner
                                                         SRV    0 5 7580 12180711.fsn1-dc14.hetzner
+frontends.prometheus.routinginfo                        SRV    0 5 7581 12180621.nbg1-dc3.hetzner
+                                                        SRV    0 5 7581 12180711.fsn1-dc14.hetzner
 _grafana._tcp.routinginfo                               SRV    0 5 7577 12180621.nbg1-dc3.hetzner
                                                         SRV    0 5 7577 12180710.fsn1-dc14.hetzner
 _gitea._tcp.routinginfo                                 SRV    0 5 7570 12180711.fsn1-dc14.hetzner