Ottomata has submitted this change and it was merged.
Change subject: Sending bits esams EventLogging traffic to gadolinium for
vandium relay.
......................................................................
Sending bits esams EventLogging traffic to gadolinium for vandium relay.
Also some formatting style cleanup.
Change-Id: I32eb5dfefb3fbca7073147c8c36a159a5ad9955d
---
M manifests/role/cache.pp
1 file changed, 24 insertions(+), 20 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
diff --git a/manifests/role/cache.pp b/manifests/role/cache.pp
index 4c6b3ee..e61aa55 100644
--- a/manifests/role/cache.pp
+++ b/manifests/role/cache.pp
@@ -632,35 +632,39 @@
}
class logging {
- if $::realm == "production" {
+ if $::realm == 'production' {
$event_listener = $::site ? {
/^(pmtpa|eqiad)$/ => '10.64.21.123', #
vanadium
- 'esams' => '208.80.154.15', # oxygen
+ 'esams' => '208.80.154.73', #
gadolinium
}
- varnish::logging { "kraken" :
+
+ varnish::logging { 'kraken' :
listener_address => '208.80.154.154', #
analytics1001
- port => "8422",
- instance_name => "",
- cli_args => '-m RxURL:^/event\.gif\?.
-D',
- log_fmt => "%U %q %{Host}i
%t %h %{X-Forwarded-For}i %{Referer}i %{Accept-Language}i
%{Cookie}i %{X-WAP-Profile}i %{User-agent}i %l %n",
- monitor => false,
+ port => '8422',
+ instance_name => '',
+ cli_args => '-m
RxURL:^/event\.gif\?. -D',
+ log_fmt => '%U %q
%{Host}i %t %h %{X-Forwarded-For}i %{Referer}i
%{Accept-Language}i %{Cookie}i %{X-WAP-Profile}i %{User-agent}i
%l %n',
+ monitor => false,
}
- varnish::logging { "locke" :
- listener_address => "208.80.152.138",
- port => "8420",
- instance_name => "",
- cli_args => "-m RxRequest:^(?!PURGE\$)
-D"
+
+ varnish::logging { 'locke' :
+ listener_address => '208.80.152.138',
+ port => '8420',
+ instance_name => '',
+ cli_args => '-m
RxRequest:^(?!PURGE\$) -D',
}
- } else {
+ }
+ else {
$event_listener = '10.4.1.14' #
deployment-eventlogging
}
- varnish::logging { "vanadium" :
+
+ varnish::logging { 'vanadium' :
listener_address => $event_listener,
- port => "8422",
- instance_name => "",
- cli_args => '-m RxURL:^/event\.gif\?. -D',
- log_fmt => "%q %l %n %t %h",
- monitor => false,
+ port => '8422',
+ instance_name => '',
+ cli_args => '-m RxURL:^/event\.gif\?.
-D',
+ log_fmt => '%q %l %n %t
%h',
+ monitor => false,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/61985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I32eb5dfefb3fbca7073147c8c36a159a5ad9955d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
