From 8a569560cd81bb2d723e11ec1c7752e7331ead28 Mon Sep 17 00:00:00 2001
From: Frank Wall <fw@moov.de>
Date: Sun, 4 Mar 2018 19:50:01 +0100
Subject: [PATCH] net/haproxy: support rise/fall parameters in health checks

---
 .../OPNsense/HAProxy/forms/dialogBackend.xml       | 14 ++++++++++++++
 .../mvc/app/models/OPNsense/HAProxy/HAProxy.xml    | 12 ++++++++++++
 .../templates/OPNsense/HAProxy/haproxy.conf        |  8 ++++++++
 3 files changed, 34 insertions(+)

diff --git a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
index 5c6111295..592d39369 100644
--- a/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
+++ b/net/haproxy/src/opnsense/mvc/app/controllers/OPNsense/HAProxy/forms/dialogBackend.xml
@@ -77,6 +77,20 @@
         <type>checkbox</type>
         <help><![CDATA[Enable to log health check status updates.]]></help>
     </field>
+    <field>
+        <id>backend.healthCheckFall</id>
+        <label>Unhealthy Threshold</label>
+        <type>text</type>
+        <help><![CDATA[The number of consecutive unsuccessful health checks before a server is considered as unavailable.]]></help>
+        <advanced>true</advanced>
+    </field>
+    <field>
+        <id>backend.healthCheckRise</id>
+        <label>Healthy Threshold</label>
+        <type>text</type>
+        <help><![CDATA[The number of consecutive successful health checks before a server is considered as available.]]></help>
+        <advanced>true</advanced>
+    </field>
     <field>
         <label>Stick-table persistence</label>
         <type>header</type>
diff --git a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
index 4a3e48460..8896d6f82 100644
--- a/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
+++ b/net/haproxy/src/opnsense/mvc/app/models/OPNsense/HAProxy/HAProxy.xml
@@ -664,6 +664,18 @@
                     <default>0</default>
                     <Required>N</Required>
                 </healthCheckLogStatus>
+                <healthCheckFall type="IntegerField">
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>100</MaximumValue>
+                    <ValidationMessage>Please specify a value between 1 and 100.</ValidationMessage>
+                    <Required>N</Required>
+                </healthCheckFall>
+                <healthCheckRise type="IntegerField">
+                    <MinimumValue>1</MinimumValue>
+                    <MaximumValue>100</MaximumValue>
+                    <ValidationMessage>Please specify a value between 1 and 100.</ValidationMessage>
+                    <Required>N</Required>
+                </healthCheckRise>
                 <stickiness_pattern type="OptionField">
                     <Required>N</Required>
                     <default>sourceipv4</default>
diff --git a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
index c3392cfa6..cb58fc47b 100644
--- a/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
+++ b/net/haproxy/src/opnsense/service/templates/OPNsense/HAProxy/haproxy.conf
@@ -1012,6 +1012,14 @@ backend {{backend.name}}
 {%             if server_data.checkDownInterval|default("") != "" %}
 {%               do server_options.append('downinter ' ~ server_data.checkDownInterval) %}
 {%             endif %}
+{#             # unhealthy threshold #}
+{%             if backend.healthCheckFall|default("") != "" %}
+{%               do server_options.append('fall ' ~ backend.healthCheckFall) %}
+{%             endif %}
+{#             # healthy threshold #}
+{%             if backend.healthCheckRise|default("") != "" %}
+{%               do server_options.append('rise ' ~ backend.healthCheckRise) %}
+{%             endif %}
 {#             # use a different port for health check #}
 {%             if healthcheck_data.checkport|default("") != "" %}
 {#               # prefer port from health check template #}