Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375772 )
Change subject: Thumbor: only use lua in nginx config if "extras" variant
......................................................................
Thumbor: only use lua in nginx config if "extras" variant
Bug: T174746
Change-Id: I0bbf32ea74c024934cec0e5f1da5a056b43a70fc
---
M modules/thumbor/templates/nginx.conf.erb
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/modules/thumbor/templates/nginx.conf.erb
b/modules/thumbor/templates/nginx.conf.erb
index 9343de1..4873865 100644
--- a/modules/thumbor/templates/nginx.conf.erb
+++ b/modules/thumbor/templates/nginx.conf.erb
@@ -1,3 +1,4 @@
+<%- if scope.function_hiera(['nginx::variant']) == 'extras' -%>
lua_shared_dict prometheus_metrics 10M;
lua_package_path "/etc/nginx/prometheus.lua";
@@ -17,6 +18,7 @@
metric_requests:inc(1, {host, ngx.var.status})
metric_latency:observe(ngx.now() - ngx.req.start_time(), {host})
';
+<%- end -%>
upstream thumbor {
least_conn;
@@ -53,6 +55,7 @@
add_header X-Upstream $upstream_addr;
}
+<%- if scope.function_hiera(['nginx::variant']) == 'extras' -%>
location /metrics {
content_by_lua '
metric_connections:set(ngx.var.connections_reading, {"reading"})
@@ -61,4 +64,5 @@
prometheus:collect()
';
}
+<%- end -%>
}
--
To view, visit https://gerrit.wikimedia.org/r/375772
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0bbf32ea74c024934cec0e5f1da5a056b43a70fc
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gilles <gdu...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Filippo Giunchedi <fgiunch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
