[MediaWiki-commits] [Gerrit] operations/puppet[production]: vcl: add hostname/layer info to syntethic healthcheck response

[Ema (Code Review)]

Ema has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/393251 )

Change subject: vcl: add hostname/layer info to syntethic healthcheck response
......................................................................

vcl: add hostname/layer info to syntethic healthcheck response

Varnish currently returns an empty 200 OK as healthcheck response. Add
hostname/layer informationon to the body.

Change-Id: I3d0a8f4f75a92105e1192925da3beafa5cdfcc0e
---
M modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
M modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
3 files changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/393251/1

diff --git a/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
index 59236fb..2d94a8e 100644
--- a/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-backend.vcl.erb
@@ -220,6 +220,7 @@
        if (resp.status >= 400) {
                call synth_errorpage;
        }
+       call wm_common_synth;
        return (deliver);
 }
 
diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
index 9419e35..969ee33 100644
--- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
@@ -346,7 +346,7 @@
        }
 
        if ( req.http.host ~ "^varnishcheck" ) {
-               return (synth(200, "OK"));
+               return (synth(200, "healthcheck"));
        }
 }
 
@@ -382,6 +382,13 @@
        set req.http.X-CDIS = "pass";
 }
 
+sub wm_common_synth {
+       if (resp.reason == "healthcheck") {
+               set resp.reason = "OK";
+               synthetic("Varnish <%= @inst %> running on <%= @hostname %> is 
up");
+       }
+}
+
 sub wm_common_backend_response {
        // This prevents the application layer from setting this in a response.
        // We'll be setting this same variable internally in VCL in hit-for-pass
diff --git a/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
index 29ed71d..2afc976 100644
--- a/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
@@ -514,6 +514,8 @@
                        call synth_errorpage;
                }
        }
+
+       call wm_common_synth;
        return (deliver);
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/393251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3d0a8f4f75a92105e1192925da3beafa5cdfcc0e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits