stack/erp5: socat wrapper to get haproxy stats

haproxy can be controlled with this socket, so it might be useful
to "expose" it - it's not really expose because we only use a
UNIX socket.

component/socat/buildout.cfg

@@ -7,6 +7,7 @@ parts =
 
 [socat]
 recipe = slapos.recipe.cmmi
+shared = true
 url = http://www.dest-unreach.org/socat/download/socat-${:version}.tar.gz
 version = 1.7.3.2
 md5sum = aec3154f7854580cfab0c2d81e910519

software/erp5/test/test/test_balancer.py

@@ -360,6 +360,24 @@ class TestBalancer(BalancerTestCase):
         requests.get(self.default_balancer_url, verify=False, cookies=cookies).text,
         'backend_web_server1')
 
+  def test_balancer_stats_socket(self):
+    # real time statistics can be obtained by using the stats socket and there
+    # is a wrapper which makes this a bit easier.
+    socat_process = subprocess.Popen(
+        [self.computer_partition_root_path + '/bin/haproxy-socat-stats'],
+        stdin=subprocess.PIPE,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.STDOUT
+    )
+    try:
+      output, _ = socat_process.communicate("show stat\n")
+    except:
+      socat_process.kill()
+      socat_process.wait()
+      raise
+    self.assertEqual(socat_process.poll(), 0)
+    # output is a csv
+    self.assertIn('family_default,FRONTEND,', output)
 
 
 class TestTestRunnerEntryPoints(BalancerTestCase):

stack/erp5/buildout.cfg

@@ -11,6 +11,7 @@ extends =
   ../../component/gzip/buildout.cfg
   ../../component/xz-utils/buildout.cfg
   ../../component/haproxy/buildout.cfg
+  ../../component/socat/buildout.cfg
   ../../component/rsyslogd/buildout.cfg
   ../../component/findutils/buildout.cfg
   ../../component/librsvg/buildout.cfg
@@ -180,6 +181,7 @@ context =
     key gzip_location gzip:location
     key xz_utils_location xz-utils:location
     key haproxy_location haproxy:location
+    key socat_location socat:location
     key rsyslogd_location rsyslogd:location
     key instance_common_cfg instance-common:rendered
     key jsl_location jsl:location

stack/erp5/buildout.hash.cfg

@@ -70,7 +70,7 @@ md5sum = cc19560b9400cecbd23064d55c501eec
 
 [template]
 filename = instance.cfg.in
-md5sum = f16326000790ce18bb0f9d275cbdcd84
+md5sum = 2ccfd6e2eb803a0d5e23e36a5e6c50ad
 
 [monitor-template-dummy]
 filename = dummy.cfg
@@ -90,7 +90,7 @@ md5sum = 2f3ddd328ac1c375e483ecb2ef5ffb57
 
 [template-balancer]
 filename = instance-balancer.cfg.in
-md5sum = 02cf39b7f0dd387f08fe73e1b6cbd011
+md5sum = 4a119083eab1eadbaf44468eb4f3381f
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

stack/erp5/instance-balancer.cfg.in

@@ -243,6 +243,11 @@ context = key content {{content_section_name}}:content
 mode = {{ mode }}
 {%- endmacro %}
 
+[{{ section('haproxy-socat-stats')}}]
+recipe = slapos.cookbook:wrapper
+wrapper-path = ${directory:bin}/${:_buildout_section_name_}
+command-line = "{{ parameter_dict['socat'] }}/bin/socat" unix-connect:${haproxy-cfg-parameter-dict:stats-socket} stdio
+
 [rsyslogd-cfg-parameter-dict]
 log-socket = ${directory:run}/log.sock
 access-log-file = ${directory:log}/apache-access.log

stack/erp5/instance.cfg.in

@@ -59,6 +59,7 @@ openssl-location = {{ openssl_location }}
 openssl = {{ openssl_location }}
 haproxy = {{ haproxy_location }}
 rsyslogd = {{ rsyslogd_location }}
+socat = {{ socat_location }}
 apachedex-location = {{ bin_directory }}/apachedex
 run-apachedex-location = {{ bin_directory }}/runApacheDex
 promise-check-apachedex-result = {{ bin_directory }}/check-apachedex-result