diff options
| author | Nicolas Vollmar <nvollmar@gmail.com> | 2024-04-19 23:59:17 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2024-04-21 12:53:42 +0200 |
| commit | 98a0fdbef343c20c5054abea478a81e5b86c254f (patch) | |
| tree | 791414e77bccd814e505051fd2306d3deb8f35fc /interface-definitions/load-balancing_reverse-proxy.xml.in | |
| parent | 5a8310147b858ab85ed5a00fa6cb1f2e856f6a0c (diff) | |
| download | vyos-1x-98a0fdbef343c20c5054abea478a81e5b86c254f.tar.gz vyos-1x-98a0fdbef343c20c5054abea478a81e5b86c254f.zip | |
T6246: improve haproxy http check configuration
(cherry picked from commit 050f24770aec7a74c1a07ba64cf2cb83afb72f1a)
Diffstat (limited to 'interface-definitions/load-balancing_reverse-proxy.xml.in')
| -rw-r--r-- | interface-definitions/load-balancing_reverse-proxy.xml.in | 42 |
1 files changed, 34 insertions, 8 deletions
diff --git a/interface-definitions/load-balancing_reverse-proxy.xml.in b/interface-definitions/load-balancing_reverse-proxy.xml.in index 645fe30c7..eb01580da 100644 --- a/interface-definitions/load-balancing_reverse-proxy.xml.in +++ b/interface-definitions/load-balancing_reverse-proxy.xml.in @@ -110,29 +110,55 @@ <leafNode name="method"> <properties> <help>HTTP method used for health check</help> + <completionHelp> + <list>options head get post put</list> + </completionHelp> <valueHelp> - <format>options|get|post|put</format> + <format>options|head|get|post|put</format> <description>HTTP method used for health checking</description> </valueHelp> <constraint> - <regex>options|get|post|put</regex> + <regex>(options|head|get|post|put)</regex> </constraint> </properties> </leafNode> <leafNode name="uri"> <properties> <help>URI used for HTTP health check (Example: '/' or '/health')</help> + <constraint> + <regex>^\/([^?#\s]*)(\?[^#\s]*)?$</regex> + </constraint> </properties> </leafNode> - <leafNode name="expect"> + <node name="expect"> <properties> <help>Expected response for the health check to pass</help> - <valueHelp> - <format>txt</format> - <description>expected response (Example: 'status 200-299' or 'string success')</description> - </valueHelp> </properties> - </leafNode> + <children> + <leafNode name="status"> + <properties> + <help>Expected response status code for the health check to pass</help> + <valueHelp> + <format>u32:200-399</format> + <description>Expected response code</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 200-399"/> + </constraint> + <constraintErrorMessage>Status code must be in range 200-399</constraintErrorMessage> + </properties> + </leafNode> + <leafNode name="string"> + <properties> + <help>Expected to be in response body for the health check to pass</help> + <valueHelp> + <format>txt</format> + <description>A string expected to be in the response</description> + </valueHelp> + </properties> + </leafNode> + </children> + </node> </children> </node> #include <include/haproxy/rule-backend.xml.i> |