Ottomata has submitted this change and it was merged.
Change subject: Adding gadolinium as a webrequest udp2log receiver.
......................................................................
Adding gadolinium as a webrequest udp2log receiver.
See RT 4720.
This also requires that squid's frontend.conf.php is edited to add
gadolinium as a udp2log logging destination. A patch is available on
fenari:/home/otto/frontend.conf.php.rt.4720.patch
Change-Id: I4c6c8a257b9a58be00904f9857d8315a94e9e356
---
M manifests/misc/blogs.pp
M manifests/role/cache.pp
M templates/nginx/nginx.conf.erb
3 files changed, 10 insertions(+), 6 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/misc/blogs.pp b/manifests/misc/blogs.pp
index 5e55a53..05bba76 100644
--- a/manifests/misc/blogs.pp
+++ b/manifests/misc/blogs.pp
@@ -63,6 +63,7 @@
}
# send blog access logs to udp2log instances.
varnish::logging { "locke" : listener_address =>
"208.80.152.138" }
+ varnish::logging { "gadolinium" : listener_address =>
"208.80.154.73" }
varnish::logging { "emery" : listener_address =>
"208.80.152.184" }
varnish::logging { "multicast_relay" : listener_address =>
"208.80.154.15", port => "8419" }
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 4f6b228..5b8d909 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -479,8 +479,9 @@
xff_sources =>
$network::constants::all_networks,
}
- varnish::logging { "locke" : listener_address =>
"208.80.152.138" , cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
- varnish::logging { "emery" : listener_address =>
"208.80.152.184" , cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
+ varnish::logging { "locke" : listener_address
=> "208.80.152.138" , cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
+ varnish::logging { "gadolinium" : listener_address
=> "208.80.154.73" , cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
+ varnish::logging { "emery" : listener_address
=> "208.80.152.184" , cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
varnish::logging { "multicast_relay" : listener_address
=> "208.80.154.15" , port => "8419", cli_args => "-m RxRequest:^(?!PURGE\$) -D"
}
# HTCP packet loss monitoring on the ganglia aggregators
@@ -681,8 +682,9 @@
xff_sources => $network::constants::all_networks,
}
- varnish::logging { "locke" : listener_address =>
"208.80.152.138", cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
- varnish::logging { "emery" : listener_address =>
"208.80.152.184", cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
+ varnish::logging { "locke" : listener_address =>
"208.80.152.138", cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
+ varnish::logging { "gadolinium" : listener_address =>
"208.80.154.73" , cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
+ varnish::logging { "emery" : listener_address =>
"208.80.152.184", cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
varnish::logging { "multicast_relay" : listener_address =>
"208.80.154.15", port => "8419", cli_args => "-m RxRequest:^(?!PURGE\$) -D" }
}
}
diff --git a/templates/nginx/nginx.conf.erb b/templates/nginx/nginx.conf.erb
index 4d8dba5..183c843 100644
--- a/templates/nginx/nginx.conf.erb
+++ b/templates/nginx/nginx.conf.erb
@@ -29,8 +29,9 @@
access_log /var/log/nginx/access.log;
<% if has_variable?("nginx_use_ssl") then %>
log_format squid_combined '$hostname $udplog_sequence
$udplog_time $request_time $remote_addr -/$status $bytes_sent
$request_method $scheme://$host$uri NONE/$proxy_host $content_type
$http_referer $http_x_forwarded_for $udplog_escaped_user_agent
$http_accept_language $http_x_cs';
- access_udplog 208.80.152.138:8420 squid_combined;
- access_udplog 208.80.152.184:8420 squid_combined;
+ access_udplog 208.80.152.138:8420 squid_combined;
+ access_udplog 208.80.154.73:8420 squid_combined;
+ access_udplog 208.80.152.184:8420 squid_combined;
client_max_body_size 100m;
large_client_header_buffers 4 16k;
<% end %>
--
To view, visit https://gerrit.wikimedia.org/r/54686
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4c6c8a257b9a58be00904f9857d8315a94e9e356
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Ottomata <o...@wikimedia.org>
Gerrit-Reviewer: Pyoungmeister <p...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
