from:"Ema \(Code Review\)"

[MediaWiki-commits] [Gerrit] etcd.py: remove unused local variable 'e' - change (operations...pybal)

2016-01-07 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/263022

Change subject: etcd.py: remove unused local variable 'e'
..

etcd.py: remove unused local variable 'e'

Change-Id: I838d047f2e37bc65113c511bb5a0cdddbf544369
---
M pybal/etcd.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/pybal 
refs/changes/22/263022/1

diff --git a/pybal/etcd.py b/pybal/etcd.py
index eee4896..c0f3f20 100644
--- a/pybal/etcd.py
+++ b/pybal/etcd.py
@@ -65,7 +65,7 @@
 else:
 try:
 config = json.loads(response)
-except Exception as e:
+except Exception:
 self.factory.onFailure(failure.Failure())
 else:
 self.factory.onUpdate(config, self.etcdIndex)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I838d047f2e37bc65113c511bb5a0cdddbf544369
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/pybal
Gerrit-Branch: master
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] standard_packages: add dstat and ncdu - change (operations/puppet)

2016-01-13 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/263824

Change subject: standard_packages: add dstat and ncdu
..

standard_packages: add dstat and ncdu

Add dstat and ncdu to standard_packages.

Dstat allows to view and compare resource usage (disk, cpu, network and
so on). Ncdu is a convenient du interface.

All dependencies should already be installed as far as I can tell:
libncursesw5, libtinfo5, python.

Change-Id: I408abac2c2501172eb014c38f6bff98aa298018c
---
M modules/base/manifests/standard_packages.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/263824/1

diff --git a/modules/base/manifests/standard_packages.pp 
b/modules/base/manifests/standard_packages.pp
index e6b6b43..7b3d597 100644
--- a/modules/base/manifests/standard_packages.pp
+++ b/modules/base/manifests/standard_packages.pp
@@ -17,6 +17,7 @@
 'atop',
 'coreutils',
 'debian-goodies',
+'dstat',
 'ethtool',
 'htop',
 'httpry',
@@ -24,6 +25,7 @@
 'jq',
 'lldpd',
 'molly-guard',
+'ncdu',
 'ngrep',
 'pv',
 'screen',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I408abac2c2501172eb014c38f6bff98aa298018c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] nagios: add myself to sms contactgroup - change (operations/puppet)

2016-01-12 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/263602

Change subject: nagios: add myself to sms contactgroup
..

nagios: add myself to sms contactgroup

Bug: T123257
Change-Id: I04d5c5694c0ef980265ac95baa32f66a84de23ba
---
M modules/nagios_common/files/contactgroups.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/263602/1

diff --git a/modules/nagios_common/files/contactgroups.cfg 
b/modules/nagios_common/files/contactgroups.cfg
index ae7b10d..3de6f46 100644
--- a/modules/nagios_common/files/contactgroups.cfg
+++ b/modules/nagios_common/files/contactgroups.cfg
@@ -41,7 +41,7 @@
 
 define contactgroup {
 contactgroup_name   sms
-members 
akosiaris,andrew,ariel,bblack,cmjohnson,dzahn,faidon,fgiunchedi,jgreen,mark,otto,robh,springle,tstarling,rush,glavagetto,yuvipanda,jmm,jcrespo,team-operations
+members 
akosiaris,andrew,ariel,bblack,cmjohnson,dzahn,ema,faidon,fgiunchedi,jgreen,mark,otto,robh,springle,tstarling,rush,glavagetto,yuvipanda,jmm,jcrespo,team-operations
 }
 
 define contactgroup {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04d5c5694c0ef980265ac95baa32f66a84de23ba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] etcd::client: sort keys in the config files - change (operations/puppet)

2016-01-12 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: etcd::client: sort keys in the config files
..


etcd::client: sort keys in the config files

So we can overcome ruby 1.8's limitations with dictionaries and order

Change-Id: Ib7349beb365b319a29d94535682b3d0d20b806b8
---
M modules/etcd/templates/client_config.erb
1 file changed, 4 insertions(+), 2 deletions(-)

Approvals:
  Ema: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/etcd/templates/client_config.erb 
b/modules/etcd/templates/client_config.erb
index 729cee7..338c6bf 100644
--- a/modules/etcd/templates/client_config.erb
+++ b/modules/etcd/templates/client_config.erb
@@ -1,3 +1,5 @@
-<% @settings.each do |k,v| -%>
-<% if v != :undef %><%= k %>: <%= v %><% end %>
+<% @settings.keys.sort.each do |k| -%>
+<%- if @settings[k] != :undef -%>
+<%= k %>: <%= @settings[k] %>
+<%- end -%>
 <% end %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib7349beb365b319a29d94535682b3d0d20b806b8
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Don't install apt-show-versions - change (operations/puppet)

2016-06-07 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Don't install apt-show-versions
..


Don't install apt-show-versions

apt-show-versions is responsible for frequent cronspam and does not seem
to be in use.

Bug: T132324
Change-Id: I72f424c34ce8dcfee538edb28bc19c769922fbeb
---
D modules/apt/files/apt-show-versions.crondaily
M modules/apt/manifests/init.pp
2 files changed, 0 insertions(+), 20 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/modules/apt/files/apt-show-versions.crondaily 
b/modules/apt/files/apt-show-versions.crondaily
deleted file mode 100644
index cecf185..000
--- a/modules/apt/files/apt-show-versions.crondaily
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# Note: This file is managed by Puppet
-
-[ -f /usr/bin/apt-show-versions ] || exit 0
-
-apt-show-versions -i > /dev/null 2>&1
diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 36a6130..3c8e49d 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -18,19 +18,6 @@
 purge   => true,
 }
 
-package { 'apt-show-versions':
-ensure => installed,
-}
-
-file { '/etc/cron.daily/apt-show-versions':
-ensure  => present,
-owner   => 'root',
-group   => 'root',
-mode=> '0755',
-source  => 'puppet:///modules/apt/apt-show-versions.crondaily',
-require => Package['apt-show-versions'],
-}
-
 package { 'python-apt':
 ensure => installed,
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I72f424c34ce8dcfee538edb28bc19c769922fbeb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add 'varnish_version' salt grain - change (operations/puppet)

2016-06-08 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Add 'varnish_version' salt grain
..


Add 'varnish_version' salt grain

Bug: T131499
Change-Id: Ib50ac2829ef0cbcb494d62a7ca84205c5fc2075b
---
M modules/role/manifests/cache/2layer.pp
1 file changed, 16 insertions(+), 1 deletion(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  Muehlenhoff: Looks good to me, but someone else must approve
  BBlack: Looks good to me, but someone else must approve



diff --git a/modules/role/manifests/cache/2layer.pp 
b/modules/role/manifests/cache/2layer.pp
index 32ee1a4..4724cb7 100644
--- a/modules/role/manifests/cache/2layer.pp
+++ b/modules/role/manifests/cache/2layer.pp
@@ -4,6 +4,22 @@
 ) {
 include role::cache::base
 
+$varnish_version4 = hiera('varnish_version4', false)
+
+if $varnish_version4 {
+salt::grain { 'varnish_version':
+ensure  => present,
+replace => true,
+value   => 4,
+}
+} else {
+salt::grain { 'varnish_version':
+ensure  => present,
+replace => true,
+value   => 3,
+}
+}
+
 # Ganglia monitoring
 if $::standard::has_ganglia {
 class { 'varnish::monitoring::ganglia':
@@ -41,7 +57,6 @@
 varnish::setup_filesystem { $filesystems: }
 Varnish::Setup_filesystem <| |> -> Varnish::Instance <| |>
 
-$varnish_version4 = hiera('varnish_version4', false)
 if ($varnish_version4) {
 # https://www.varnish-cache.org/docs/trunk/phk/persistent.html
 $persistent_name = 'deprecated_persistent'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib50ac2829ef0cbcb494d62a7ca84205c5fc2075b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Muehlenhoff 

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

[MediaWiki-commits] [Gerrit] Add 'varnish_version' salt grain - change (operations/puppet)

2016-06-08 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293296

Change subject: Add 'varnish_version' salt grain
..

Add 'varnish_version' salt grain

Bug: T131499
Change-Id: Ib50ac2829ef0cbcb494d62a7ca84205c5fc2075b
---
M modules/role/manifests/cache/2layer.pp
1 file changed, 16 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/293296/1

diff --git a/modules/role/manifests/cache/2layer.pp 
b/modules/role/manifests/cache/2layer.pp
index 32ee1a4..4724cb7 100644
--- a/modules/role/manifests/cache/2layer.pp
+++ b/modules/role/manifests/cache/2layer.pp
@@ -4,6 +4,22 @@
 ) {
 include role::cache::base
 
+$varnish_version4 = hiera('varnish_version4', false)
+
+if $varnish_version4 {
+salt::grain { 'varnish_version':
+ensure  => present,
+replace => true,
+value   => 4,
+}
+} else {
+salt::grain { 'varnish_version':
+ensure  => present,
+replace => true,
+value   => 3,
+}
+}
+
 # Ganglia monitoring
 if $::standard::has_ganglia {
 class { 'varnish::monitoring::ganglia':
@@ -41,7 +57,6 @@
 varnish::setup_filesystem { $filesystems: }
 Varnish::Setup_filesystem <| |> -> Varnish::Instance <| |>
 
-$varnish_version4 = hiera('varnish_version4', false)
 if ($varnish_version4) {
 # https://www.varnish-cache.org/docs/trunk/phk/persistent.html
 $persistent_name = 'deprecated_persistent'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib50ac2829ef0cbcb494d62a7ca84205c5fc2075b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] update-ocsp-all: write output to logfile - change (operations/puppet)

2016-06-06 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: update-ocsp-all: write output to logfile
..


update-ocsp-all: write output to logfile

Use a logfile (and rotate it) instead of cronspamming.

Bug: T132835
Bug: T132324
Change-Id: Id4a73844d6218a0e257191690feec898f48db371
---
A modules/sslcert/files/update-ocsp-all-logrotate
A modules/sslcert/files/update-ocsp-all.rsyslog.conf
M modules/sslcert/manifests/ocsp/init.pp
3 files changed, 20 insertions(+), 1 deletion(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/sslcert/files/update-ocsp-all-logrotate 
b/modules/sslcert/files/update-ocsp-all-logrotate
new file mode 100644
index 000..5807eb9
--- /dev/null
+++ b/modules/sslcert/files/update-ocsp-all-logrotate
@@ -0,0 +1,6 @@
+/var/log/update-ocsp-all.log {
+rotate 7
+daily
+compress
+missingok
+}
diff --git a/modules/sslcert/files/update-ocsp-all.rsyslog.conf 
b/modules/sslcert/files/update-ocsp-all.rsyslog.conf
new file mode 100644
index 000..db3c471
--- /dev/null
+++ b/modules/sslcert/files/update-ocsp-all.rsyslog.conf
@@ -0,0 +1,3 @@
+# NOTE: This file is managed by Puppet.
+
+if $programname == 'update-ocsp-all' then /var/log/update-ocsp-all.log
diff --git a/modules/sslcert/manifests/ocsp/init.pp 
b/modules/sslcert/manifests/ocsp/init.pp
index aada7e4..26ca9ab 100644
--- a/modules/sslcert/manifests/ocsp/init.pp
+++ b/modules/sslcert/manifests/ocsp/init.pp
@@ -50,7 +50,7 @@
 }
 
 cron { 'update-ocsp-all':
-command => '/usr/local/sbin/update-ocsp-all',
+command => '/usr/local/sbin/update-ocsp-all 2>&1 | logger -t 
update-ocsp-all',
 minute  => fqdn_rand(60, '1adf3dd699e51805'),
 hour=> '*',
 require => [
@@ -58,4 +58,14 @@
 File['/etc/update-ocsp.d'],
 ],
 }
+
+rsyslog::conf { 'update-ocsp-all':
+source   => 'puppet:///modules/sslcert/update-ocsp-all.rsyslog.conf',
+}
+
+# Rotate /var/log/update-ocsp-all.log
+logrotate::conf { 'update-ocsp-all':
+ensure => present,
+source => 'puppet:///modules/sslcert/update-ocsp-all-logrotate',
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4a73844d6218a0e257191690feec898f48db371
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Don't install apt-show-versions - change (operations/puppet)

2016-06-06 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/292936

Change subject: Don't install apt-show-versions
..

Don't install apt-show-versions

apt-show-versions is responsible for frequent cronspam and does not seem
to be in use.

Bug: T132324
Change-Id: I72f424c34ce8dcfee538edb28bc19c769922fbeb
---
D modules/apt/files/apt-show-versions.crondaily
M modules/apt/manifests/init.pp
2 files changed, 0 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/292936/1

diff --git a/modules/apt/files/apt-show-versions.crondaily 
b/modules/apt/files/apt-show-versions.crondaily
deleted file mode 100644
index cecf185..000
--- a/modules/apt/files/apt-show-versions.crondaily
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# Note: This file is managed by Puppet
-
-[ -f /usr/bin/apt-show-versions ] || exit 0
-
-apt-show-versions -i > /dev/null 2>&1
diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index 36a6130..3c8e49d 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -18,19 +18,6 @@
 purge   => true,
 }
 
-package { 'apt-show-versions':
-ensure => installed,
-}
-
-file { '/etc/cron.daily/apt-show-versions':
-ensure  => present,
-owner   => 'root',
-group   => 'root',
-mode=> '0755',
-source  => 'puppet:///modules/apt/apt-show-versions.crondaily',
-require => Package['apt-show-versions'],
-}
-
 package { 'python-apt':
 ensure => installed,
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I72f424c34ce8dcfee538edb28bc19c769922fbeb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] varnishlog4.py: log errors in execute() - change (operations/puppet)

2016-06-07 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293123

Change subject: varnishlog4.py: log errors in execute()
..

varnishlog4.py: log errors in execute()

We should log errors set by python-varnishapi instead of ignoring them.

Bug: T137114
Change-Id: I8e4186089fffcb3ea9351bec7a24e03eb141edba
---
M modules/varnish/files/varnishlog4.py
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/23/293123/1

diff --git a/modules/varnish/files/varnishlog4.py 
b/modules/varnish/files/varnishlog4.py
index 3392ab8..e5372e3 100755
--- a/modules/varnish/files/varnishlog4.py
+++ b/modules/varnish/files/varnishlog4.py
@@ -41,6 +41,7 @@
   limitations under the License.
 """
 
+import sys
 import time
 import signal
 import inspect
@@ -79,6 +80,9 @@
 """Loop and execute callback"""
 while self.keep_running:
 ret = self.vap.Dispatch(self.vap_callback)
+if self.vap.error:
+sys.stderr.write("Error in execute(): %s\n" % self.vap.error)
+
 if ret == 0:
 time.sleep(0.01)
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e4186089fffcb3ea9351bec7a24e03eb141edba
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] varnishapi.py: reset error message - change (operations/puppet)

2016-06-07 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293132

Change subject: varnishapi.py: reset error message
..

varnishapi.py: reset error message

Once the log has been reacquired we should not keep telling the
application there has been an error.

Change-Id: I5416641ef3674eae530e09c8450a0591aab13f4b
---
M modules/varnish/files/varnishapi.py
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/293132/1

diff --git a/modules/varnish/files/varnishapi.py 
b/modules/varnish/files/varnishapi.py
index 7fa71ac..1f5fe84 100644
--- a/modules/varnish/files/varnishapi.py
+++ b/modules/varnish/files/varnishapi.py
@@ -631,6 +631,9 @@
 self.vslq = self.lva.VSLQ_New(
 self.vsl, z, self.__g_arg, self.__q_arg)
 self.error = 'Log reacquired'
+else:
+self.error = ''
+
 i = self.lib.VSLQ_Dispatch(
 self.vslq, VSLQ_dispatch_f(self.__callBack), None)
 return(i)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5416641ef3674eae530e09c8450a0591aab13f4b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] varnish{xcache, xcps, ...}: subscribe to varnishlog.py - change (operations/puppet)

2016-06-10 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293705

Change subject: varnish{xcache,xcps,...}: subscribe to varnishlog.py
..

varnish{xcache,xcps,...}: subscribe to varnishlog.py

Upon modification of varnishlog.py, we want to make sure that all
scripts depeding on it are restarted.

Change-Id: I0e3053a9c8c15e4414f84b24d92101819391fe02
---
M modules/varnish/files/varnishlog4.py
M modules/varnish/manifests/logging/media.pp
M modules/varnish/manifests/logging/reqstats.pp
M modules/varnish/manifests/logging/rls.pp
M modules/varnish/manifests/logging/statsd.pp
M modules/varnish/manifests/logging/xcache.pp
M modules/varnish/manifests/logging/xcps.pp
7 files changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/05/293705/1

diff --git a/modules/varnish/files/varnishlog4.py 
b/modules/varnish/files/varnishlog4.py
index 433e4d3..9bfa358 100755
--- a/modules/varnish/files/varnishlog4.py
+++ b/modules/varnish/files/varnishlog4.py
@@ -23,6 +23,7 @@
 
   By default, varnishlog will group transactions by request. A specific
   transaction grouping mode can be used to override the default.
+
   For example:
 
 varnishlog(
diff --git a/modules/varnish/manifests/logging/media.pp 
b/modules/varnish/manifests/logging/media.pp
index 6f3376e..f39e0a1 100644
--- a/modules/varnish/manifests/logging/media.pp
+++ b/modules/varnish/manifests/logging/media.pp
@@ -33,6 +33,7 @@
 strict => false,
 template_name  => 'varnishmedia',
 require=> File['/usr/local/bin/varnishmedia'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 enable => true,
 },
diff --git a/modules/varnish/manifests/logging/reqstats.pp 
b/modules/varnish/manifests/logging/reqstats.pp
index d22dc6a..86ec68f 100644
--- a/modules/varnish/manifests/logging/reqstats.pp
+++ b/modules/varnish/manifests/logging/reqstats.pp
@@ -58,6 +58,7 @@
 strict => false,
 template_name  => 'varnishreqstats',
 require=> File['/usr/local/bin/varnishreqstats'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 require => Service[$varnish_service_name],
 enable  => true,
diff --git a/modules/varnish/manifests/logging/rls.pp 
b/modules/varnish/manifests/logging/rls.pp
index 5c12286..6e70173 100644
--- a/modules/varnish/manifests/logging/rls.pp
+++ b/modules/varnish/manifests/logging/rls.pp
@@ -33,6 +33,7 @@
 strict => false,
 template_name  => 'varnishrls',
 require=> File['/usr/local/bin/varnishrls'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 enable => true,
 },
diff --git a/modules/varnish/manifests/logging/statsd.pp 
b/modules/varnish/manifests/logging/statsd.pp
index 982ea38..98ce970 100644
--- a/modules/varnish/manifests/logging/statsd.pp
+++ b/modules/varnish/manifests/logging/statsd.pp
@@ -60,6 +60,7 @@
 strict => false,
 template_name  => 'varnishstatsd',
 require=> File['/usr/local/bin/varnishstatsd'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 enable => true,
 },
diff --git a/modules/varnish/manifests/logging/xcache.pp 
b/modules/varnish/manifests/logging/xcache.pp
index eb863f8..8af3d84 100644
--- a/modules/varnish/manifests/logging/xcache.pp
+++ b/modules/varnish/manifests/logging/xcache.pp
@@ -47,6 +47,7 @@
 strict => false,
 template_name  => 'varnishxcache',
 require=> File['/usr/local/bin/varnishxcache'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 require => Service['varnish-frontend'],
 enable  => true,
diff --git a/modules/varnish/manifests/logging/xcps.pp 
b/modules/varnish/manifests/logging/xcps.pp
index 4951c37..8d0e442 100644
--- a/modules/varnish/manifests/logging/xcps.pp
+++ b/modules/varnish/manifests/logging/xcps.pp
@@ -39,6 +39,7 @@
 strict => false,
 template_name  => 'varnishxcps',
 require=> File['/usr/local/bin/varnishxcps'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 require => Service['varnish-frontend'],
 enable  => true,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e3053a9c8c15e4414f84b24d92101819391fe02
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet

[MediaWiki-commits] [Gerrit] varnishlog4: default to request grouping - change (operations/puppet)

2016-06-10 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: varnishlog4: default to request grouping
..


varnishlog4: default to request grouping

We observed high CPU usage under load when using varnishlog4 without
explicitly specifying a transaction grouping mode.

This patch makes varnishlog4 default to request grouping if no specific
transaction grouping mode has been chosen.

Bug: T137114
Ref: https://www.varnish-cache.org/docs/trunk/reference/vsl-query.html#grouping
Change-Id: Ib1540ff811f4159844cdc1288364ab889b9bff78
---
M modules/varnish/files/varnishlog4.py
1 file changed, 22 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve



diff --git a/modules/varnish/files/varnishlog4.py 
b/modules/varnish/files/varnishlog4.py
index 3392ab8..f3fed5d 100755
--- a/modules/varnish/files/varnishlog4.py
+++ b/modules/varnish/files/varnishlog4.py
@@ -21,6 +21,20 @@
 ],
 my_callback)
 
+  By default, varnishlog will group transactions by request. A specific
+  transaction grouping mode can be used to override the default.
+  For example:
+
+varnishlog(
+[
+('g', 'session'),
+# ...
+],
+my_callback)
+
+  See https://www.varnish-cache.org/docs/trunk/reference/vsl-query.html for
+  more details.
+
   This module depends on python-varnishapi:
   https://github.com/xcir/python-varnishapi
 
@@ -132,16 +146,24 @@
 [ '-i', 'ReqURL', 'c', '-i', 'ReqMethod' ]"""
 vapi = varnishapi.VarnishAPI()
 
+grouping = False
 parsed_args = []
 for switch, value in args:
 # eg: switch = "i", value = "ReqUrl"
 if switch == "i" and value not in vapi.VSL_tags_rev:
 raise Exception("Unknown Tag: %s" % value)
 
+if switch == "g":
+grouping = True
+
 parsed_args.append("-%s" % switch)
 if value:
 parsed_args.append(value)
 
+if not grouping:
+# Use request grouping by default. T137114
+parsed_args += ["-g", "request"]
+
 return parsed_args
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib1540ff811f4159844cdc1288364ab889b9bff78
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] varnishlog4.py: log errors in execute() - change (operations/puppet)

2016-06-10 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: varnishlog4.py: log errors in execute()
..


varnishlog4.py: log errors in execute()

We should log errors set by python-varnishapi instead of ignoring them.

Bug: T137114
Change-Id: I8e4186089fffcb3ea9351bec7a24e03eb141edba
---
M modules/varnish/files/varnishlog4.py
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/modules/varnish/files/varnishlog4.py 
b/modules/varnish/files/varnishlog4.py
index f3fed5d..433e4d3 100755
--- a/modules/varnish/files/varnishlog4.py
+++ b/modules/varnish/files/varnishlog4.py
@@ -55,6 +55,7 @@
   limitations under the License.
 """
 
+import sys
 import time
 import signal
 import inspect
@@ -93,6 +94,10 @@
 """Loop and execute callback"""
 while self.keep_running:
 ret = self.vap.Dispatch(self.vap_callback)
+if self.vap.error:
+sys.stderr.write("Error in execute(): %s\n" % self.vap.error)
+self.vap.error = ''
+
 if ret == 0:
 time.sleep(0.01)
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8e4186089fffcb3ea9351bec7a24e03eb141edba
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] varnishlog4: default to request grouping - change (operations/puppet)

2016-06-09 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/293530

Change subject: varnishlog4: default to request grouping
..

varnishlog4: default to request grouping

We observed high CPU usage under load when using varnishlog4 without
explicitly specifying a transaction grouping mode.

This patch makes varnishlog4 default to request grouping if no specific
transaction grouping mode has been chosen.

Bug: T137114
Ref: https://www.varnish-cache.org/docs/trunk/reference/vsl-query.html#grouping
Change-Id: Ib1540ff811f4159844cdc1288364ab889b9bff78
---
M modules/varnish/files/varnishlog4.py
1 file changed, 22 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/293530/1

diff --git a/modules/varnish/files/varnishlog4.py 
b/modules/varnish/files/varnishlog4.py
index 3392ab8..f3fed5d 100755
--- a/modules/varnish/files/varnishlog4.py
+++ b/modules/varnish/files/varnishlog4.py
@@ -21,6 +21,20 @@
 ],
 my_callback)
 
+  By default, varnishlog will group transactions by request. A specific
+  transaction grouping mode can be used to override the default.
+  For example:
+
+varnishlog(
+[
+('g', 'session'),
+# ...
+],
+my_callback)
+
+  See https://www.varnish-cache.org/docs/trunk/reference/vsl-query.html for
+  more details.
+
   This module depends on python-varnishapi:
   https://github.com/xcir/python-varnishapi
 
@@ -132,16 +146,24 @@
 [ '-i', 'ReqURL', 'c', '-i', 'ReqMethod' ]"""
 vapi = varnishapi.VarnishAPI()
 
+grouping = False
 parsed_args = []
 for switch, value in args:
 # eg: switch = "i", value = "ReqUrl"
 if switch == "i" and value not in vapi.VSL_tags_rev:
 raise Exception("Unknown Tag: %s" % value)
 
+if switch == "g":
+grouping = True
+
 parsed_args.append("-%s" % switch)
 if value:
 parsed_args.append(value)
 
+if not grouping:
+# Use request grouping by default. T137114
+parsed_args += ["-g", "request"]
+
 return parsed_args
 
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1540ff811f4159844cdc1288364ab889b9bff78
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] varnish{xcache, xcps, ...}: subscribe to varnishlog.py - change (operations/puppet)

2016-06-10 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: varnish{xcache,xcps,...}: subscribe to varnishlog.py
..


varnish{xcache,xcps,...}: subscribe to varnishlog.py

Upon modification of varnishlog.py, we want to make sure that all
scripts depeding on it are restarted.

Change-Id: I0e3053a9c8c15e4414f84b24d92101819391fe02
---
M modules/varnish/files/varnishlog4.py
M modules/varnish/manifests/logging/media.pp
M modules/varnish/manifests/logging/reqstats.pp
M modules/varnish/manifests/logging/rls.pp
M modules/varnish/manifests/logging/statsd.pp
M modules/varnish/manifests/logging/xcache.pp
M modules/varnish/manifests/logging/xcps.pp
7 files changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve



diff --git a/modules/varnish/files/varnishlog4.py 
b/modules/varnish/files/varnishlog4.py
index 433e4d3..9bfa358 100755
--- a/modules/varnish/files/varnishlog4.py
+++ b/modules/varnish/files/varnishlog4.py
@@ -23,6 +23,7 @@
 
   By default, varnishlog will group transactions by request. A specific
   transaction grouping mode can be used to override the default.
+
   For example:
 
 varnishlog(
diff --git a/modules/varnish/manifests/logging/media.pp 
b/modules/varnish/manifests/logging/media.pp
index 6f3376e..f39e0a1 100644
--- a/modules/varnish/manifests/logging/media.pp
+++ b/modules/varnish/manifests/logging/media.pp
@@ -33,6 +33,7 @@
 strict => false,
 template_name  => 'varnishmedia',
 require=> File['/usr/local/bin/varnishmedia'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 enable => true,
 },
diff --git a/modules/varnish/manifests/logging/reqstats.pp 
b/modules/varnish/manifests/logging/reqstats.pp
index d22dc6a..86ec68f 100644
--- a/modules/varnish/manifests/logging/reqstats.pp
+++ b/modules/varnish/manifests/logging/reqstats.pp
@@ -58,6 +58,7 @@
 strict => false,
 template_name  => 'varnishreqstats',
 require=> File['/usr/local/bin/varnishreqstats'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 require => Service[$varnish_service_name],
 enable  => true,
diff --git a/modules/varnish/manifests/logging/rls.pp 
b/modules/varnish/manifests/logging/rls.pp
index 5c12286..6e70173 100644
--- a/modules/varnish/manifests/logging/rls.pp
+++ b/modules/varnish/manifests/logging/rls.pp
@@ -33,6 +33,7 @@
 strict => false,
 template_name  => 'varnishrls',
 require=> File['/usr/local/bin/varnishrls'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 enable => true,
 },
diff --git a/modules/varnish/manifests/logging/statsd.pp 
b/modules/varnish/manifests/logging/statsd.pp
index 982ea38..98ce970 100644
--- a/modules/varnish/manifests/logging/statsd.pp
+++ b/modules/varnish/manifests/logging/statsd.pp
@@ -60,6 +60,7 @@
 strict => false,
 template_name  => 'varnishstatsd',
 require=> File['/usr/local/bin/varnishstatsd'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 enable => true,
 },
diff --git a/modules/varnish/manifests/logging/xcache.pp 
b/modules/varnish/manifests/logging/xcache.pp
index eb863f8..8af3d84 100644
--- a/modules/varnish/manifests/logging/xcache.pp
+++ b/modules/varnish/manifests/logging/xcache.pp
@@ -47,6 +47,7 @@
 strict => false,
 template_name  => 'varnishxcache',
 require=> File['/usr/local/bin/varnishxcache'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 require => Service['varnish-frontend'],
 enable  => true,
diff --git a/modules/varnish/manifests/logging/xcps.pp 
b/modules/varnish/manifests/logging/xcps.pp
index 4951c37..8d0e442 100644
--- a/modules/varnish/manifests/logging/xcps.pp
+++ b/modules/varnish/manifests/logging/xcps.pp
@@ -39,6 +39,7 @@
 strict => false,
 template_name  => 'varnishxcps',
 require=> File['/usr/local/bin/varnishxcps'],
+subscribe  => 
File['/usr/local/lib/python2.7/dist-packages/varnishlog.py'],
 service_params => {
 require => Service['varnish-frontend'],
 enable  => true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e3053a9c8c15e4414f84b24d92101819391fe02
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch:

[MediaWiki-commits] [Gerrit] zerofetch icinga check - change (operations/puppet)

2016-06-13 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/294072

Change subject: zerofetch icinga check
..

zerofetch icinga check

Generate an icinga alert if zerofetch has not been running successfully.
Warn after 4 hours, critical after one day.

Bug: T132835
Change-Id: Ifa1b5605b5b6aba916ce1407438cc852bcecb82b
---
M modules/varnish/manifests/zero_update.pp
1 file changed, 9 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/72/294072/1

diff --git a/modules/varnish/manifests/zero_update.pp 
b/modules/varnish/manifests/zero_update.pp
index 197ee25..af47067 100644
--- a/modules/varnish/manifests/zero_update.pp
+++ b/modules/varnish/manifests/zero_update.pp
@@ -14,6 +14,15 @@
 require => Package['python-requests'],
 }
 
+# Generate icinga alert if zerofetch has not been running successfully.
+# Warn after 4 hours, generate a critical alert after 24 hours.
+$check_args = '-w 14400 -c 86400 -d /var/netmapper/ -g .update-success'
+nrpe::monitor_service { 'zerofetch-freshness':
+description  => 'Freshness of zerofetch successful run file',
+nrpe_command => "/usr/lib/nagios/plugins/check-fresh-files-in-dir.py 
${check_args}",
+require  => 
File['/usr/lib/nagios/plugins/check-fresh-files-in-dir.py'],
+}
+
 file { '/etc/zerofetcher':
 ensure => directory,
 owner  => 'root',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifa1b5605b5b6aba916ce1407438cc852bcecb82b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] zerofetch icinga check - change (operations/puppet)

2016-06-13 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: zerofetch icinga check
..


zerofetch icinga check

Generate an icinga alert if zerofetch has not been running successfully.
Warn after 4 hours, critical after one day.

Bug: T132835
Change-Id: Ifa1b5605b5b6aba916ce1407438cc852bcecb82b
---
M modules/varnish/manifests/zero_update.pp
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/varnish/manifests/zero_update.pp 
b/modules/varnish/manifests/zero_update.pp
index 197ee25..af47067 100644
--- a/modules/varnish/manifests/zero_update.pp
+++ b/modules/varnish/manifests/zero_update.pp
@@ -14,6 +14,15 @@
 require => Package['python-requests'],
 }
 
+# Generate icinga alert if zerofetch has not been running successfully.
+# Warn after 4 hours, generate a critical alert after 24 hours.
+$check_args = '-w 14400 -c 86400 -d /var/netmapper/ -g .update-success'
+nrpe::monitor_service { 'zerofetch-freshness':
+description  => 'Freshness of zerofetch successful run file',
+nrpe_command => "/usr/lib/nagios/plugins/check-fresh-files-in-dir.py 
${check_args}",
+require  => 
File['/usr/lib/nagios/plugins/check-fresh-files-in-dir.py'],
+}
+
 file { '/etc/zerofetcher':
 ensure => directory,
 owner  => 'root',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifa1b5605b5b6aba916ce1407438cc852bcecb82b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] zerofetch: write output to logfile - change (operations/puppet)

2016-06-13 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: zerofetch: write output to logfile
..


zerofetch: write output to logfile

Use a logfile (and rotate it) instead of cronspamming.

Bug: T132835
Change-Id: I1a65cc6b287c5d174e1a28d6bdd9eb39477ebe2c
---
A modules/varnish/files/zerofetch-logrotate
A modules/varnish/files/zerofetch.rsyslog.conf
M modules/varnish/manifests/zero_update.pp
3 files changed, 20 insertions(+), 1 deletion(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/varnish/files/zerofetch-logrotate 
b/modules/varnish/files/zerofetch-logrotate
new file mode 100644
index 000..8508f5f
--- /dev/null
+++ b/modules/varnish/files/zerofetch-logrotate
@@ -0,0 +1,6 @@
+/var/log/zerofetch.log {
+rotate 7
+daily
+compress
+missingok
+}
diff --git a/modules/varnish/files/zerofetch.rsyslog.conf 
b/modules/varnish/files/zerofetch.rsyslog.conf
new file mode 100644
index 000..f1d2d27
--- /dev/null
+++ b/modules/varnish/files/zerofetch.rsyslog.conf
@@ -0,0 +1,3 @@
+# NOTE: This file is managed by Puppet.
+
+if $programname == 'zerofetch' then /var/log/zerofetch.log
diff --git a/modules/varnish/manifests/zero_update.pp 
b/modules/varnish/manifests/zero_update.pp
index af47067..673bca6 100644
--- a/modules/varnish/manifests/zero_update.pp
+++ b/modules/varnish/manifests/zero_update.pp
@@ -38,7 +38,7 @@
 require => File['/etc/zerofetcher'],
 }
 
-$cmd = "/usr/share/varnish/zerofetch.py -s \"${site}\" -a 
/etc/zerofetcher/zerofetcher.auth -d /var/netmapper"
+$cmd = "/usr/share/varnish/zerofetch.py -s \"${site}\" -a 
/etc/zerofetcher/zerofetcher.auth -d /var/netmapper 2>&1 | logger -t zerofetch"
 
 exec { 'zero_update_initial':
 user=> 'netmap',
@@ -57,4 +57,14 @@
 hour=> '*',
 require => File['/etc/zerofetcher/zerofetcher.auth'],
 }
+
+rsyslog::conf { 'zerofetch':
+source   => 'puppet:///modules/varnish/zerofetch.rsyslog.conf',
+}
+
+# Rotate /var/log/zerofetch.log
+logrotate::conf { 'zerofetch':
+ensure => present,
+source => 'puppet:///modules/varnish/zerofetch-logrotate',
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a65cc6b287c5d174e1a28d6bdd9eb39477ebe2c
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] zerofetch.py: track successful executions - change (operations/puppet)

2016-06-13 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/294063

Change subject: zerofetch.py: track successful executions
..

zerofetch.py: track successful executions

Update the mtime of a "success-file" on successful runs.

Bug: T132835
Change-Id: I9ae8b344bcc3c9a5209a982897ce86c51f93483a
---
M modules/varnish/files/zerofetch.py
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/294063/1

diff --git a/modules/varnish/files/zerofetch.py 
b/modules/varnish/files/zerofetch.py
index 310ebeb..e85adf6 100755
--- a/modules/varnish/files/zerofetch.py
+++ b/modules/varnish/files/zerofetch.py
@@ -136,5 +136,13 @@
 os.rmdir(tempdir)
 
 
+def update_success(fname):
+"""Update mtime of the given file"""
+with open(fname, 'a'):
+os.utime(fname, None)
+
 if __name__ == "__main__":
 main()
+# If no exception has been risen by main(), this has been a successful run.
+# Update mtime of success file.
+update_success("/var/cache/ocsp/.update-success")

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ae8b344bcc3c9a5209a982897ce86c51f93483a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] zerofetch.py: track successful executions - change (operations/puppet)

2016-06-13 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: zerofetch.py: track successful executions
..


zerofetch.py: track successful executions

Update the mtime of a "success-file" on successful runs.

Bug: T132835
Change-Id: I9ae8b344bcc3c9a5209a982897ce86c51f93483a
---
M modules/varnish/files/zerofetch.py
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/varnish/files/zerofetch.py 
b/modules/varnish/files/zerofetch.py
index 310ebeb..9169185 100755
--- a/modules/varnish/files/zerofetch.py
+++ b/modules/varnish/files/zerofetch.py
@@ -135,6 +135,11 @@
 # Remove the tempdir, which should be empty now via rename-or-remove above
 os.rmdir(tempdir)
 
+# This has been a successful run, update mtime of the success file
+# (by default: /var/netmapper/.update-success)
+success_file = os.path.join(args.directory, ".update-success")
+with open(success_file, 'a'):
+os.utime(success_file, None)
 
 if __name__ == "__main__":
 main()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ae8b344bcc3c9a5209a982897ce86c51f93483a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] zerofetch: write output to logfile - change (operations/puppet)

2016-06-13 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/294077

Change subject: zerofetch: write output to logfile
..

zerofetch: write output to logfile

Use a logfile (and rotate it) instead of cronspamming.

Bug: T132835
Change-Id: I1a65cc6b287c5d174e1a28d6bdd9eb39477ebe2c
---
A modules/varnish/files/zerofetch-logrotate
A modules/varnish/files/zerofetch.rsyslog.conf
M modules/varnish/manifests/zero_update.pp
3 files changed, 20 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/77/294077/1

diff --git a/modules/varnish/files/zerofetch-logrotate 
b/modules/varnish/files/zerofetch-logrotate
new file mode 100644
index 000..395f4af
--- /dev/null
+++ b/modules/varnish/files/zerofetch-logrotate
@@ -0,0 +1,6 @@
+/var/log/zerofecth.log {
+rotate 7
+daily
+compress
+missingok
+}
diff --git a/modules/varnish/files/zerofetch.rsyslog.conf 
b/modules/varnish/files/zerofetch.rsyslog.conf
new file mode 100644
index 000..f1d2d27
--- /dev/null
+++ b/modules/varnish/files/zerofetch.rsyslog.conf
@@ -0,0 +1,3 @@
+# NOTE: This file is managed by Puppet.
+
+if $programname == 'zerofetch' then /var/log/zerofetch.log
diff --git a/modules/varnish/manifests/zero_update.pp 
b/modules/varnish/manifests/zero_update.pp
index af47067..673bca6 100644
--- a/modules/varnish/manifests/zero_update.pp
+++ b/modules/varnish/manifests/zero_update.pp
@@ -38,7 +38,7 @@
 require => File['/etc/zerofetcher'],
 }
 
-$cmd = "/usr/share/varnish/zerofetch.py -s \"${site}\" -a 
/etc/zerofetcher/zerofetcher.auth -d /var/netmapper"
+$cmd = "/usr/share/varnish/zerofetch.py -s \"${site}\" -a 
/etc/zerofetcher/zerofetcher.auth -d /var/netmapper 2>&1 | logger -t zerofetch"
 
 exec { 'zero_update_initial':
 user=> 'netmap',
@@ -57,4 +57,14 @@
 hour=> '*',
 require => File['/etc/zerofetcher/zerofetcher.auth'],
 }
+
+rsyslog::conf { 'zerofetch':
+source   => 'puppet:///modules/varnish/zerofetch.rsyslog.conf',
+}
+
+# Rotate /var/log/zerofetch.log
+logrotate::conf { 'zerofetch':
+ensure => present,
+source => 'puppet:///modules/varnish/zerofetch-logrotate',
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a65cc6b287c5d174e1a28d6bdd9eb39477ebe2c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] tlsproxy: trim indentation in localssl.erb - change (operations/puppet)

2016-05-30 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: tlsproxy: trim indentation in localssl.erb
..


tlsproxy: trim indentation in localssl.erb

Change-Id: If1c33df8f7a201a7cb8695a0ea43f94c85f21cb2
---
M modules/tlsproxy/templates/localssl.erb
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/tlsproxy/templates/localssl.erb 
b/modules/tlsproxy/templates/localssl.erb
index 0277b60..91d30df 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -17,14 +17,14 @@
error_log   /var/log/nginx/<%= @name %>.error.log;
access_log   off;
 
-   <% @certs.each do |cert| -%>
+   <%- @certs.each do |cert| -%>
ssl_certificate /etc/ssl/localcerts/<%= cert %>.chained.crt;
ssl_certificate_key /etc/ssl/private/<%= cert %>.key;
-   <% end -%>
-   <% if @do_ocsp -%>
+   <%- end -%>
+   <%- if @do_ocsp -%>
ssl_stapling on;
ssl_stapling_file /var/cache/ocsp/<%= @name %>.ocsp;
-   <% end -%>
+   <%- end -%>
 
keepalive_timeout 60;
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1c33df8f7a201a7cb8695a0ea43f94c85f21cb2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] update-ocsp-all: write output to logfile - change (operations/puppet)

2016-05-30 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/291752

Change subject: update-ocsp-all: write output to logfile
..

update-ocsp-all: write output to logfile

Use a logfile (and rotate it) instead of cronspamming.

Bug: T132835
Bug: T132324
Change-Id: Id4a73844d6218a0e257191690feec898f48db371
---
A modules/sslcert/files/update-ocsp-all-logrotate
M modules/sslcert/manifests/ocsp/init.pp
2 files changed, 13 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/291752/1

diff --git a/modules/sslcert/files/update-ocsp-all-logrotate 
b/modules/sslcert/files/update-ocsp-all-logrotate
new file mode 100644
index 000..5807eb9
--- /dev/null
+++ b/modules/sslcert/files/update-ocsp-all-logrotate
@@ -0,0 +1,6 @@
+/var/log/update-ocsp-all.log {
+rotate 7
+daily
+compress
+missingok
+}
diff --git a/modules/sslcert/manifests/ocsp/init.pp 
b/modules/sslcert/manifests/ocsp/init.pp
index aada7e4..1412f92 100644
--- a/modules/sslcert/manifests/ocsp/init.pp
+++ b/modules/sslcert/manifests/ocsp/init.pp
@@ -50,7 +50,7 @@
 }
 
 cron { 'update-ocsp-all':
-command => '/usr/local/sbin/update-ocsp-all',
+command => '/usr/local/sbin/update-ocsp-all >> 
/var/log/update-ocsp-all.log 2>&1',
 minute  => fqdn_rand(60, '1adf3dd699e51805'),
 hour=> '*',
 require => [
@@ -58,4 +58,10 @@
 File['/etc/update-ocsp.d'],
 ],
 }
+
+# Rotate /var/log/update-ocsp-all.log
+logrotate::conf { 'update-ocsp-all':
+ensure => present,
+source => 'puppet:///modules/sslcert/update-ocsp-all-logrotate',
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4a73844d6218a0e257191690feec898f48db371
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Remove unused varnishncsa-related code - change (operations/puppet)

2016-05-27 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/291226

Change subject: Remove unused varnishncsa-related code
..

Remove unused varnishncsa-related code

The last usage of varnish::logging (and varnishncsa in general) has been
removed in https://gerrit.wikimedia.org/r/#/c/259051/. Get rid of all
varnishncsa-related puppet code.

Change-Id: Iebe6a707bf133169e7a8a1e62746ad7f4731d16a
---
M modules/nagios_common/files/checkcommands.cfg
M modules/nrpe/templates/nrpe_local.cfg.erb
D modules/varnish/files/varnishncsa.default
D modules/varnish/manifests/logging.pp
D modules/varnish/manifests/logging/config.pp
D modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb
M modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
7 files changed, 3 insertions(+), 202 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/291226/1

diff --git a/modules/nagios_common/files/checkcommands.cfg 
b/modules/nagios_common/files/checkcommands.cfg
index 8c014fa..fabbcc0 100644
--- a/modules/nagios_common/files/checkcommands.cfg
+++ b/modules/nagios_common/files/checkcommands.cfg
@@ -344,10 +344,6 @@
 command_line$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_udp2log_procs
 }
 define command {
-command_namenrpe_check_varnishncsa
-command_line$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_varnishncsa
-}
-define command {
 command_namecheck_eventlogging_jobs
 command_line$USER1$/check_eventlogging_jobs
 }
diff --git a/modules/nrpe/templates/nrpe_local.cfg.erb 
b/modules/nrpe/templates/nrpe_local.cfg.erb
index 68b3137..e99e4c9 100644
--- a/modules/nrpe/templates/nrpe_local.cfg.erb
+++ b/modules/nrpe/templates/nrpe_local.cfg.erb
@@ -10,11 +10,3 @@
 <% end -%>
 
 command[check_ram]=/usr/lib/nagios/plugins/check_ram.sh 20 5 b
-
-# process checks, we can't make this generic because we don't pass args via 
nrpe (security)
-<%# text caches run an extra varnishncsa for statsv eventlogging -%>
-<% if @cluster == "cache_text" -%>
-command[check_varnishncsa]=/usr/lib/nagios/plugins/check_procs -w 3:3 -c 3:6 
-C varnishncsa
-<% else -%>
-command[check_varnishncsa]=/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2:6 
-C varnishncsa
-<% end -%>
diff --git a/modules/varnish/files/varnishncsa.default 
b/modules/varnish/files/varnishncsa.default
deleted file mode 100644
index c119080..000
--- a/modules/varnish/files/varnishncsa.default
+++ /dev/null
@@ -1,9 +0,0 @@
-## THIS FILE MANAGED BY PUPPET ##
-VARNISHNCSA_ENABLED=1
-
-# set LOG_FORMAT so that varnishncsa logs
-# the Content-Type.  This is the same as
-# the Wikimedia default log format, except
-# for the addition of the Content-Type 
-# response header.  See T80476.
-LOG_FORMAT="%l %n  %t  %{Varnish:time_firstbyte}x  %h  
%{Varnish:handling}x/%s %b  %m  http://%{Host}i%U%q -   
%{Content-Type}o%{Referer}i %{X-Forwarded-For}i %{User-agent}i  
%{Accept-Language}i %{X-Analytics}o"
diff --git a/modules/varnish/manifests/logging.pp 
b/modules/varnish/manifests/logging.pp
deleted file mode 100644
index 93a9dc6..000
--- a/modules/varnish/manifests/logging.pp
+++ /dev/null
@@ -1,39 +0,0 @@
-define varnish::logging(
-$listener_address,
-$port='8420',
-$cli_args='',
-$log_fmt=false,
-$instance_name='frontend',
-$monitor=true,
-$ensure='present',
-) {
-require varnish::packages
-require varnish::logging::config
-
-$varnishservice = $instance_name ? {
-''  => 'varnish',
-default => "varnish-${instance_name}"
-}
-
-$shm_name = $instance_name ? {
-''  => $::hostname,
-default => $instance_name
-}
-
-base::service_unit { "varnishncsa-${name}":
-ensure=> $ensure,
-template_name => 'varnishncsa',
-sysvinit  => true,
-}
-
-Service[$varnishservice] -> Service["varnishncsa-${name}"]
-File['/etc/default/varnishncsa'] ~> Service["varnishncsa-${name}"]
-
-if $monitor {
-nrpe::monitor_service { "varnishncsa-${name}":
-ensure   => $ensure,
-description  => "Varnish traffic logger - ${name}",
-nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1:1 -a 
varnishncsa-${name}.pid -u varnishlog",
-}
-}
-}
diff --git a/modules/varnish/manifests/logging/config.pp 
b/modules/varnish/manifests/logging/config.pp
deleted file mode 100644
index da8dba6..000
--- a/modules/varnish/manifests/logging/config.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class varnish::logging::config {
-file { '/etc/default/varnishncsa':
-source => "puppet:///modules/${module_name}/varnishncsa.default",
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-}
-}
diff --git a/modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb

[MediaWiki-commits] [Gerrit] Remove unused varnishncsa-related code - change (operations/puppet)

2016-05-27 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Remove unused varnishncsa-related code
..


Remove unused varnishncsa-related code

The last usage of varnish::logging (and varnishncsa in general) has been
removed in https://gerrit.wikimedia.org/r/#/c/259051/. Get rid of all
varnishncsa-related puppet code.

Change-Id: Iebe6a707bf133169e7a8a1e62746ad7f4731d16a
---
M modules/nagios_common/files/checkcommands.cfg
M modules/nrpe/templates/nrpe_local.cfg.erb
D modules/varnish/files/varnishncsa.default
D modules/varnish/manifests/logging.pp
D modules/varnish/manifests/logging/config.pp
D modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb
M modules/varnish/templates/vcl/wikimedia-frontend.vcl.erb
7 files changed, 3 insertions(+), 202 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve



diff --git a/modules/nagios_common/files/checkcommands.cfg 
b/modules/nagios_common/files/checkcommands.cfg
index 8c014fa..fabbcc0 100644
--- a/modules/nagios_common/files/checkcommands.cfg
+++ b/modules/nagios_common/files/checkcommands.cfg
@@ -344,10 +344,6 @@
 command_line$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_udp2log_procs
 }
 define command {
-command_namenrpe_check_varnishncsa
-command_line$USER1$/check_nrpe -H $HOSTADDRESS$ -c check_varnishncsa
-}
-define command {
 command_namecheck_eventlogging_jobs
 command_line$USER1$/check_eventlogging_jobs
 }
diff --git a/modules/nrpe/templates/nrpe_local.cfg.erb 
b/modules/nrpe/templates/nrpe_local.cfg.erb
index 68b3137..e99e4c9 100644
--- a/modules/nrpe/templates/nrpe_local.cfg.erb
+++ b/modules/nrpe/templates/nrpe_local.cfg.erb
@@ -10,11 +10,3 @@
 <% end -%>
 
 command[check_ram]=/usr/lib/nagios/plugins/check_ram.sh 20 5 b
-
-# process checks, we can't make this generic because we don't pass args via 
nrpe (security)
-<%# text caches run an extra varnishncsa for statsv eventlogging -%>
-<% if @cluster == "cache_text" -%>
-command[check_varnishncsa]=/usr/lib/nagios/plugins/check_procs -w 3:3 -c 3:6 
-C varnishncsa
-<% else -%>
-command[check_varnishncsa]=/usr/lib/nagios/plugins/check_procs -w 2:2 -c 2:6 
-C varnishncsa
-<% end -%>
diff --git a/modules/varnish/files/varnishncsa.default 
b/modules/varnish/files/varnishncsa.default
deleted file mode 100644
index c119080..000
--- a/modules/varnish/files/varnishncsa.default
+++ /dev/null
@@ -1,9 +0,0 @@
-## THIS FILE MANAGED BY PUPPET ##
-VARNISHNCSA_ENABLED=1
-
-# set LOG_FORMAT so that varnishncsa logs
-# the Content-Type.  This is the same as
-# the Wikimedia default log format, except
-# for the addition of the Content-Type 
-# response header.  See T80476.
-LOG_FORMAT="%l %n  %t  %{Varnish:time_firstbyte}x  %h  
%{Varnish:handling}x/%s %b  %m  http://%{Host}i%U%q -   
%{Content-Type}o%{Referer}i %{X-Forwarded-For}i %{User-agent}i  
%{Accept-Language}i %{X-Analytics}o"
diff --git a/modules/varnish/manifests/logging.pp 
b/modules/varnish/manifests/logging.pp
deleted file mode 100644
index 93a9dc6..000
--- a/modules/varnish/manifests/logging.pp
+++ /dev/null
@@ -1,39 +0,0 @@
-define varnish::logging(
-$listener_address,
-$port='8420',
-$cli_args='',
-$log_fmt=false,
-$instance_name='frontend',
-$monitor=true,
-$ensure='present',
-) {
-require varnish::packages
-require varnish::logging::config
-
-$varnishservice = $instance_name ? {
-''  => 'varnish',
-default => "varnish-${instance_name}"
-}
-
-$shm_name = $instance_name ? {
-''  => $::hostname,
-default => $instance_name
-}
-
-base::service_unit { "varnishncsa-${name}":
-ensure=> $ensure,
-template_name => 'varnishncsa',
-sysvinit  => true,
-}
-
-Service[$varnishservice] -> Service["varnishncsa-${name}"]
-File['/etc/default/varnishncsa'] ~> Service["varnishncsa-${name}"]
-
-if $monitor {
-nrpe::monitor_service { "varnishncsa-${name}":
-ensure   => $ensure,
-description  => "Varnish traffic logger - ${name}",
-nrpe_command => "/usr/lib/nagios/plugins/check_procs -c 1:1 -a 
varnishncsa-${name}.pid -u varnishlog",
-}
-}
-}
diff --git a/modules/varnish/manifests/logging/config.pp 
b/modules/varnish/manifests/logging/config.pp
deleted file mode 100644
index da8dba6..000
--- a/modules/varnish/manifests/logging/config.pp
+++ /dev/null
@@ -1,8 +0,0 @@
-class varnish::logging::config {
-file { '/etc/default/varnishncsa':
-source => "puppet:///modules/${module_name}/varnishncsa.default",
-owner  => 'root',
-group  => 'root',
-mode   => '0444',
-}
-}
diff --git a/modules/varnish/templates/initscripts/varnishncsa.sysvinit.erb

[MediaWiki-commits] [Gerrit] Stop varnishncsa - change (operations/puppet)

2016-05-27 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/291238

Change subject: Stop varnishncsa
..

Stop varnishncsa

We have noticed a FD leak caused by varnishncsa, similar to the one
described in T135700. Given that we don't use it, make sure varnishncsa
is stopped.

Change-Id: Ie44cedd0061f63c7964b4e68a02bd30cfa914b5d
---
M modules/varnish/manifests/common.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/291238/1

diff --git a/modules/varnish/manifests/common.pp 
b/modules/varnish/manifests/common.pp
index b438c6b..b454a69 100644
--- a/modules/varnish/manifests/common.pp
+++ b/modules/varnish/manifests/common.pp
@@ -43,6 +43,11 @@
 force   => true,
 }
 
+# We are not using varnishncsa, make sure it's stopped
+service { 'varnishncsa':
+ensure => 'stopped'
+}
+
 if (hiera('varnish_version4', false)) {
 # varnishlog4.py depends on varnishapi. Install it.
 file { '/usr/local/lib/python2.7/dist-packages/varnishapi.py':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie44cedd0061f63c7964b4e68a02bd30cfa914b5d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Stop varnishncsa - change (operations/puppet)

2016-05-27 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Stop varnishncsa
..


Stop varnishncsa

We have noticed a FD leak caused by varnishncsa, similar to the one
described in T135700. Given that we don't use it, make sure varnishncsa
is stopped.

Change-Id: Ie44cedd0061f63c7964b4e68a02bd30cfa914b5d
---
M modules/varnish/manifests/common.pp
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve



diff --git a/modules/varnish/manifests/common.pp 
b/modules/varnish/manifests/common.pp
index b438c6b..74aa288 100644
--- a/modules/varnish/manifests/common.pp
+++ b/modules/varnish/manifests/common.pp
@@ -43,6 +43,12 @@
 force   => true,
 }
 
+# We are not using varnishncsa, make sure it's stopped
+service { 'varnishncsa':
+ensure => 'stopped',
+enable => false,
+}
+
 if (hiera('varnish_version4', false)) {
 # varnishlog4.py depends on varnishapi. Install it.
 file { '/usr/local/lib/python2.7/dist-packages/varnishapi.py':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie44cedd0061f63c7964b4e68a02bd30cfa914b5d
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tlsproxy: trim indentation in localssl.erb - change (operations/puppet)

2016-05-27 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/291253

Change subject: tlsproxy: trim indentation in localssl.erb
..

tlsproxy: trim indentation in localssl.erb

Change-Id: If1c33df8f7a201a7cb8695a0ea43f94c85f21cb2
---
M modules/tlsproxy/templates/localssl.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/291253/1

diff --git a/modules/tlsproxy/templates/localssl.erb 
b/modules/tlsproxy/templates/localssl.erb
index 0277b60..d339f98 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -17,11 +17,11 @@
error_log   /var/log/nginx/<%= @name %>.error.log;
access_log   off;
 
-   <% @certs.each do |cert| -%>
+   <%- @certs.each do |cert| -%>
ssl_certificate /etc/ssl/localcerts/<%= cert %>.chained.crt;
ssl_certificate_key /etc/ssl/private/<%= cert %>.key;
<% end -%>
-   <% if @do_ocsp -%>
+   <%- if @do_ocsp -%>
ssl_stapling on;
ssl_stapling_file /var/cache/ocsp/<%= @name %>.ocsp;
<% end -%>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If1c33df8f7a201a7cb8695a0ea43f94c85f21cb2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] tlsproxy: enable client/server TFO support in the kernel - change (operations/puppet)

2016-06-21 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295331

Change subject: tlsproxy: enable client/server TFO support in the kernel
..

tlsproxy: enable client/server TFO support in the kernel

Enable client/server support for TCP Fast Open (TFO).

The values (bitmap) are:

1: Enables sending data in the opening SYN on the client w/ SG_FASTOPEN
2: Enables TCP Fast Open on the server side, i.e., allowing data
   in a SYN packet to be accepted and passed to the application before the
   3-way hand shake finishes

This is the first step towards enabling TCP Fast Open on tlsproxy. An
nginx configuration change is also necessary (fastopen=N).

Bug: T108827
Ref: https://www.rfc-editor.org/rfc/rfc7413.txt
Change-Id: Id0b37f26225e26d94e31d6948f4679a9d80fdd41
---
M modules/tlsproxy/manifests/instance.pp
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/31/295331/1

diff --git a/modules/tlsproxy/manifests/instance.pp 
b/modules/tlsproxy/manifests/instance.pp
index e62d222..a2b7b27 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -3,6 +3,19 @@
 # Tune kernel settings
 include base::mysterious_sysctl
 
+# Enable client/server TCP Fast Open (TFO)
+#
+# The values (bitmap) are
+# 1: Enables sending data in the opening SYN on the client w/ MSG_FASTOPEN
+# 2: Enables TCP Fast Open on the server side, i.e., allowing data in
+#a SYN packet to be accepted and passed to the application before
+#3-way hand shake finishes
+sysctl::parameters { 'TCP Fast Open':
+values => {
+'net.ipv4.tcp_fastopen' => 3,
+},
+}
+
 $varnish_version4 = hiera('varnish_version4', false)
 $keepalives_per_worker = 
hiera('tlsproxy::localssl::keepalives_per_worker', 0)
 $websocket_support = hiera('cache::websocket_support', false)

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0b37f26225e26d94e31d6948f4679a9d80fdd41
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] tlsproxy: enable client/server TFO support in the kernel - change (operations/puppet)

2016-06-22 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: tlsproxy: enable client/server TFO support in the kernel
..


tlsproxy: enable client/server TFO support in the kernel

Enable client/server support for TCP Fast Open (TFO).

The values (bitmap) are:

1: Enables sending data in the opening SYN on the client w/ MSG_FASTOPEN
2: Enables TCP Fast Open on the server side, i.e., allowing data
   in a SYN packet to be accepted and passed to the application before the
   3-way hand shake finishes

This is the first step towards enabling TCP Fast Open on tlsproxy. An
nginx configuration change is also necessary (fastopen=N).

Bug: T108827
Ref: https://www.rfc-editor.org/rfc/rfc7413.txt
Change-Id: Id0b37f26225e26d94e31d6948f4679a9d80fdd41
---
M modules/tlsproxy/manifests/instance.pp
1 file changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/modules/tlsproxy/manifests/instance.pp 
b/modules/tlsproxy/manifests/instance.pp
index e62d222..bbdcdf8 100644
--- a/modules/tlsproxy/manifests/instance.pp
+++ b/modules/tlsproxy/manifests/instance.pp
@@ -3,6 +3,22 @@
 # Tune kernel settings
 include base::mysterious_sysctl
 
+# Enable client/server TCP Fast Open (TFO)
+#
+# The values (bitmap) are:
+# 1: Enables sending data in the opening SYN on the client w/ MSG_FASTOPEN
+# 2: Enables TCP Fast Open on the server side, i.e., allowing data in
+#a SYN packet to be accepted and passed to the application before the
+#3-way hand shake finishes
+#
+# Note that, despite the name, this setting is *not* IPv4-specific. TFO
+# support will be enabled on both IPv4 and IPv6
+sysctl::parameters { 'TCP Fast Open':
+values => {
+'net.ipv4.tcp_fastopen' => 3,
+},
+}
+
 $varnish_version4 = hiera('varnish_version4', false)
 $keepalives_per_worker = 
hiera('tlsproxy::localssl::keepalives_per_worker', 0)
 $websocket_support = hiera('cache::websocket_support', false)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0b37f26225e26d94e31d6948f4679a9d80fdd41
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Port varnishrls to new VSL API - change (operations/puppet)

2016-06-20 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295207

Change subject: Port varnishrls to new VSL API
..

Port varnishrls to new VSL API

Bug: T131353
Change-Id: Iaaa469fcc46c690216da97d28d1715548af5aaf8
---
A modules/varnish/files/varnishrls4
M modules/varnish/manifests/logging/rls.pp
2 files changed, 90 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/295207/1

diff --git a/modules/varnish/files/varnishrls4 
b/modules/varnish/files/varnishrls4
new file mode 100755
index 000..6624343
--- /dev/null
+++ b/modules/varnish/files/varnishrls4
@@ -0,0 +1,82 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+"""
+  varnishrls
+  ~~
+
+  Accumulate browser cache hit ratio and total request volume statistics
+  for ResourceLoader requests (/w/load.php) and report to StatsD.
+
+  Usage: varnishrls [--statsd-server SERVER] [--key-prefix PREFIX]
+
+--statsd-server SERVER  statsd server (default: none; echo to stdout)
+--key-prefix PREFIX metric key prefix (default: varnish.clients)
+
+  Copyright 2015 Ori Livneh 
+  Copyright 2015 Gilles Dubuc 
+  Copyright 2016 Emanuele Rocca 
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+"""
+from __future__ import division
+
+import re
+import varnishlog
+import varnishprocessor
+
+class ResourceLoaderVarnishLogProcessor(varnishprocessor.VarnishLogProcessor):
+description = 'ResourceLoader Browser Cache Hit Ratio StatsD Reporter'
+key_prefix = 'ResourceLoader'
+
+def process_transaction(self, transaction):
+"""Process a single completed transaction."""
+status_code = transaction['RespStatus']
+metric_keys = ['reqs.all', 'resps.' + status_code]
+
+if 'BerespHeader' in transaction:
+metric_keys.append('reqs.if_none_match')
+
+cache_control_header = transaction.get('BereqHeader')
+cache_control = 'no'
+if cache_control_header:
+match = re.search(r'(?<=max-age=)\d+', cache_control_header)
+if match:
+cache_control = 'short' if match.group() == '300' else 'long'
+metric_keys.append('responses.%s_cache_control.%s' %
+   (cache_control, status_code))
+
+for key in metric_keys:
+self.stats[key] = self.stats.get(key, 0) + 1
+
+if self.stats['reqs.all'] > 1:
+self.flush_stats()
+
+def start(self):
+varnishlog.varnishlog((
+('n', 'frontend'), # Consider the frontend Varnish instance
+('c', None),   # Only consider interactions with the client
+('i', 'RespStatus'),   # Get RespStatus for the HTTP status code
+('i', 'BerespHeader'), # Get BerespHeader for If-None-Match header
+('i', 'BereqHeader'),  # Get BereqHeader for Cache-control header
+('i', 'ReqURL'),   # Get ReqURL to match /w/load.php
+('i', 'Timestamp'),   # Get Timestamp to delimit requests
+('C', ''), # Use case-insensitive matching
+('I', '^(/w/load\.php'  # ...to match ResourceLoader ReqURLs
+  '|if-none-match:' # ...or If-None-Match BerespHeaders
+  '|cache-control:' # ...or Cache-control BereqHeaders
+  '|([\d.]+ ?){6}$' # ...or Timestamp lines
+  '|[1-5]\d{2}$)'), # ...or RxStatus codes
+), self.handle_log_record)
+
+lp = ResourceLoaderVarnishLogProcessor()
diff --git a/modules/varnish/manifests/logging/rls.pp 
b/modules/varnish/manifests/logging/rls.pp
index 6e70173..7a9514c 100644
--- a/modules/varnish/manifests/logging/rls.pp
+++ b/modules/varnish/manifests/logging/rls.pp
@@ -18,8 +18,15 @@
 define varnish::logging::rls( $statsd_server = 'statsd' ) {
 include varnish::common
 
+if (hiera('varnish_version4', false)) {
+# Use v4 version of varnishreqstats
+$varnish4_python_suffix = '4'
+} else {
+$varnish4_python_suffix = ''
+}
+
 file { '/usr/local/bin/varnishrls':
-source  => 'puppet:///modules/varnish/varnishrls',
+source  => 
"puppet:///modules/varnish/varnishrls${varnish4_python_suffix}",
 owner   => 'root',
 group   => 'root',
 mode=> '0555',

-- 
To view, visit

[MediaWiki-commits] [Gerrit] diamond TCP collector: add TFO-related metrics - change (operations/puppet)

2016-06-24 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: diamond TCP collector: add TFO-related metrics
..


diamond TCP collector: add TFO-related metrics

The diamond TCP collector exposes a configuration option allowing to
specify additional TCP metrics to be reported.

This commit adds the following TFO-related metrics:

- TCPFastOpenActive
- TCPFastOpenActiveFail
- TCPFastOpenPassive
- TCPFastOpenPassiveFail
- TCPFastOpenCookieReqd
- TCPFastOpenListenOverflow
- TCPSynRetrans
- TCPOrigDataSent

See https://wikitech.wikimedia.org/wiki/TCP_Fast_Open for an explanation
of those.

Bug: T108827
Change-Id: I78253380f4dee42085bcb2925b2a281e6cafae34
---
M modules/diamond/manifests/init.pp
1 file changed, 18 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Ema: Verified; Looks good to me, approved



diff --git a/modules/diamond/manifests/init.pp 
b/modules/diamond/manifests/init.pp
index f3de736..bb489c1 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -117,7 +117,24 @@
 
 diamond::collector { 'Network': }
 
-diamond::collector { 'TCP': }
+diamond::collector { 'TCP':
+settings => {
+allowed_names => [
+  'ListenOverflows', 'ListenDrops',
+  'TCPLoss', 'TCPTimeouts',
+  'TCPFastRetrans', 'TCPLostRetransmit',
+  'TCPForwardRetrans', 'TCPSlowStartRetrans',
+  'CurrEstab', 'TCPAbortOnMemory',
+  'TCPBacklogDrop', 'AttemptFails',
+  'EstabResets', 'InErrs',
+  'ActiveOpens', 'PassiveOpens',
+  'TCPFastOpenActive', 'TCPFastOpenActiveFail',
+  'TCPFastOpenPassive', 'TCPFastOpenPassiveFail',
+  'TCPFastOpenListenOverflow', 'TCPFastOpenCookieReqd',
+  'TCPSynRetrans', 'TCPOrigDataSent'
+]
+}
+}
 
 diamond::collector { 'Ntpd': }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78253380f4dee42085bcb2925b2a281e6cafae34
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tlsproxy: document safe/unsafe TFO usage - change (operations/puppet)

2016-06-24 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: tlsproxy: document safe/unsafe TFO usage
..


tlsproxy: document safe/unsafe TFO usage

Mention that using TFO is not necessarily always safe, with references
to the relevant RFC section.

Bug: T108827
Change-Id: I7309033da3c2673985940b716e5f8133be7f3617
---
M modules/tlsproxy/templates/localssl.erb
1 file changed, 7 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/modules/tlsproxy/templates/localssl.erb 
b/modules/tlsproxy/templates/localssl.erb
index 553c7eb..9c6dd3f 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -9,6 +9,9 @@
 
 # SSL proxying
 server {
+   # Enabling TCP Fast Open is safe for HTTP over TLS. There is no 
idempotency
+   # concern replaying TLS Client Hello.
+   # https://tools.ietf.org/html/rfc7413#section-6.3.2
listen [::]:443 <%= @default_server ? "default_server deferred 
backlog=16384 reuseport ipv6only=on fastopen=#{fastopen_pending_max} " : "" 
%>ssl http2;
listen 443 <%= @default_server ? "default_server deferred backlog=16384 
reuseport fastopen=#{fastopen_pending_max} " : "" %>ssl http2;
ssl on;
@@ -62,6 +65,10 @@
 }
 <% if @redir_port -%>
 server {
+   # Enable TCP Fast Open for http -> https redirects since there are no
+   # idempotency concerns with HTTPS.
+   # Note that TFO is *not* safe in general for non-TLS HTTP. See
+   # https://tools.ietf.org/html/rfc7413#section-6.3.1
listen [::]:<%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport ipv6only=on fastopen=#{fastopen_pending_max} " 
: "" %>;
listen <%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport fastopen=#{fastopen_pending_max} " : "" %>;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7309033da3c2673985940b716e5f8133be7f3617
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] tlsproxy: document safe/unsafe TFO usage - change (operations/puppet)

2016-06-24 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295925

Change subject: tlsproxy: document safe/unsafe TFO usage
..

tlsproxy: document safe/unsafe TFO usage

Mention that using TFO is not necessarily always safe, with references
to the relevant RFC section.

Bug: T108827
Change-Id: I7309033da3c2673985940b716e5f8133be7f3617
---
M modules/tlsproxy/templates/localssl.erb
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/295925/1

diff --git a/modules/tlsproxy/templates/localssl.erb 
b/modules/tlsproxy/templates/localssl.erb
index 553c7eb..9c6dd3f 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -9,6 +9,9 @@
 
 # SSL proxying
 server {
+   # Enabling TCP Fast Open is safe for HTTP over TLS. There is no 
idempotency
+   # concern replaying TLS Client Hello.
+   # https://tools.ietf.org/html/rfc7413#section-6.3.2
listen [::]:443 <%= @default_server ? "default_server deferred 
backlog=16384 reuseport ipv6only=on fastopen=#{fastopen_pending_max} " : "" 
%>ssl http2;
listen 443 <%= @default_server ? "default_server deferred backlog=16384 
reuseport fastopen=#{fastopen_pending_max} " : "" %>ssl http2;
ssl on;
@@ -62,6 +65,10 @@
 }
 <% if @redir_port -%>
 server {
+   # Enable TCP Fast Open for http -> https redirects since there are no
+   # idempotency concerns with HTTPS.
+   # Note that TFO is *not* safe in general for non-TLS HTTP. See
+   # https://tools.ietf.org/html/rfc7413#section-6.3.1
listen [::]:<%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport ipv6only=on fastopen=#{fastopen_pending_max} " 
: "" %>;
listen <%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport fastopen=#{fastopen_pending_max} " : "" %>;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7309033da3c2673985940b716e5f8133be7f3617
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] tlsproxy: only enable TFO on default_server - change (operations/puppet)

2016-06-24 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295810

Change subject: tlsproxy: only enable TFO on default_server
..

tlsproxy: only enable TFO on default_server

socket-related options should not be specified in more than one listen
directive. Only include fastopen=N on default_server, similarly to how
we deal with backlog=N and similar options.

Bug: T108827
Change-Id: I50d27cfadbd161782da2daeb57f696dea331a6e2
---
M modules/tlsproxy/templates/localssl.erb
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/295810/1

diff --git a/modules/tlsproxy/templates/localssl.erb 
b/modules/tlsproxy/templates/localssl.erb
index 6b67bb9..553c7eb 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -9,8 +9,8 @@
 
 # SSL proxying
 server {
-   listen [::]:443 <%= @default_server ? "default_server deferred 
backlog=16384 reuseport ipv6only=on " : "" %>ssl http2 fastopen=<%= 
@fastopen_pending_max %>;
-   listen 443 <%= @default_server ? "default_server deferred backlog=16384 
reuseport " : "" %>ssl http2 fastopen=<%= @fastopen_pending_max %>;
+   listen [::]:443 <%= @default_server ? "default_server deferred 
backlog=16384 reuseport ipv6only=on fastopen=#{fastopen_pending_max} " : "" 
%>ssl http2;
+   listen 443 <%= @default_server ? "default_server deferred backlog=16384 
reuseport fastopen=#{fastopen_pending_max} " : "" %>ssl http2;
ssl on;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;
 
@@ -62,8 +62,8 @@
 }
 <% if @redir_port -%>
 server {
-   listen [::]:<%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport ipv6only=on " : "" %> fastopen=<%= 
@fastopen_pending_max %>;
-   listen <%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport " : "" %> fastopen=<%= @fastopen_pending_max %>;
+   listen [::]:<%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport ipv6only=on fastopen=#{fastopen_pending_max} " 
: "" %>;
+   listen <%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport fastopen=#{fastopen_pending_max} " : "" %>;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;
 
error_log   /var/log/nginx/<%= @name %>.error.log;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50d27cfadbd161782da2daeb57f696dea331a6e2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] diamond TCP collector: add TFO-related metrics - change (operations/puppet)

2016-06-24 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295900

Change subject: diamond TCP collector: add TFO-related metrics
..

diamond TCP collector: add TFO-related metrics

The diamond TCP collector exposes a configuration option allowing to
specify additional TCP metrics to be reported.

This commit adds the following TFO-related metrics:

- TCPFastOpenActive
- TCPFastOpenActiveFail
- TCPFastOpenPassive
- TCPFastOpenPassiveFail
- TCPFastOpenCookieReqd
- TCPFastOpenListenOverflow
- TCPSynRetrans
- TCPOrigDataSent

See https://wikitech.wikimedia.org/wiki/TCP_Fast_Open for an explanation
of those.

Bug: T108827
Change-Id: I78253380f4dee42085bcb2925b2a281e6cafae34
---
M modules/diamond/manifests/init.pp
1 file changed, 18 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/295900/1

diff --git a/modules/diamond/manifests/init.pp 
b/modules/diamond/manifests/init.pp
index f3de736..32853b0 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -117,7 +117,24 @@
 
 diamond::collector { 'Network': }
 
-diamond::collector { 'TCP': }
+diamond::collector { 'TCP':
+settings  => {
+allowed_names => [
+  'ListenOverflows', 'ListenDrops',
+  'TCPLoss', 'TCPTimeouts',
+  'TCPFastRetrans', 'TCPLostRetransmit',
+  'TCPForwardRetrans', 'TCPSlowStartRetrans',
+  'CurrEstab', 'TCPAbortOnMemory',
+  'TCPBacklogDrop', 'AttemptFails',
+  'EstabResets', 'InErrs',
+  'ActiveOpens', 'PassiveOpens',
+  'TCPFastOpenActive', 'TCPFastOpenActiveFail',
+  'TCPFastOpenPassive', 'TCPFastOpenPassiveFail',
+  'TCPFastOpenListenOverflow', 'TCPFastOpenCookieReqd',
+  'TCPSynRetrans', 'TCPOrigDataSent'
+]
+}
+}
 
 diamond::collector { 'Ntpd': }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I78253380f4dee42085bcb2925b2a281e6cafae34
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] tlsproxy: only enable TFO on default_server - change (operations/puppet)

2016-06-24 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: tlsproxy: only enable TFO on default_server
..


tlsproxy: only enable TFO on default_server

socket-related options should not be specified in more than one listen
directive. Only include fastopen=N on default_server, similarly to how
we deal with backlog=N and similar options.

Bug: T108827
Change-Id: I50d27cfadbd161782da2daeb57f696dea331a6e2
---
M modules/tlsproxy/templates/localssl.erb
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/modules/tlsproxy/templates/localssl.erb 
b/modules/tlsproxy/templates/localssl.erb
index 6b67bb9..553c7eb 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -9,8 +9,8 @@
 
 # SSL proxying
 server {
-   listen [::]:443 <%= @default_server ? "default_server deferred 
backlog=16384 reuseport ipv6only=on " : "" %>ssl http2 fastopen=<%= 
@fastopen_pending_max %>;
-   listen 443 <%= @default_server ? "default_server deferred backlog=16384 
reuseport " : "" %>ssl http2 fastopen=<%= @fastopen_pending_max %>;
+   listen [::]:443 <%= @default_server ? "default_server deferred 
backlog=16384 reuseport ipv6only=on fastopen=#{fastopen_pending_max} " : "" 
%>ssl http2;
+   listen 443 <%= @default_server ? "default_server deferred backlog=16384 
reuseport fastopen=#{fastopen_pending_max} " : "" %>ssl http2;
ssl on;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;
 
@@ -62,8 +62,8 @@
 }
 <% if @redir_port -%>
 server {
-   listen [::]:<%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport ipv6only=on " : "" %> fastopen=<%= 
@fastopen_pending_max %>;
-   listen <%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport " : "" %> fastopen=<%= @fastopen_pending_max %>;
+   listen [::]:<%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport ipv6only=on fastopen=#{fastopen_pending_max} " 
: "" %>;
+   listen <%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport fastopen=#{fastopen_pending_max} " : "" %>;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;
 
error_log   /var/log/nginx/<%= @name %>.error.log;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I50d27cfadbd161782da2daeb57f696dea331a6e2
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Run configtest upon config file modification - change (operations...nginx)

2016-06-24 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295937

Change subject: Run configtest upon config file modification
..

Run configtest upon config file modification

We want puppet to fail in case of nginx configuration file errors.
Notify `service nginx configtest` upon configuration file modification.

Change-Id: Id0315273791ee22328ba36076fabe5a2fc8c450a
---
M manifests/init.pp
M manifests/site.pp
2 files changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/nginx 
refs/changes/37/295937/1

diff --git a/manifests/init.pp b/manifests/init.pp
index 3ffa8df..7194f72 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -57,6 +57,11 @@
 hasrestart => true,
 }
 
+exec { 'nginx-configtest':
+command => 'service nginx configtest',
+refreshonly => true,
+}
+
 file { [ '/etc/nginx/conf.d', '/etc/nginx/sites-available', 
'/etc/nginx/sites-enabled' ]:
 ensure  => ensure_directory($ensure),
 recurse => true,
diff --git a/manifests/site.pp b/manifests/site.pp
index cfcbca1..b985a44 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -39,6 +39,7 @@
 content => $content,
 source  => $source,
 tag => 'nginx', # workaround PUP-2689, can remove w/ puppetmaster 
3.6.2+
+notify  => Exec['nginx-configtest'],
 }
 
 file { "/etc/nginx/sites-enabled/${basename}":

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0315273791ee22328ba36076fabe5a2fc8c450a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/nginx
Gerrit-Branch: master
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] tlsproxy: enable TCP Fast Open - change (operations/puppet)

2016-06-24 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/295783

Change subject: tlsproxy: enable TCP Fast Open
..

tlsproxy: enable TCP Fast Open

After enabling client/server TFO support in the kernel in 2b8b99d and
verifying that LVS does not interfere with the modifications to the 3WHS
introduced by TCP Fast Open, we are now ready to enable TFO support on
all tlsproxies.

We introduce a new hiera setting to limit the number of concurrent
pending TFO requests: tlsproxy::localssl::fastopen_pending_max. See RFC
7413 section 5.1 for an explanation of why this is needed.

The TCPFastOpenListenOverflow counter gets incremented every time an
inbound SYN packet with TFO gets treated as a non-TFO SYN because the
fastopen_pending_max threshold has been exceeded. We will keep an eye on
such counter and likely increase fastopen_pending_max as soon as client
adoption of TFO becomes significant.

Bug: T108827
Change-Id: I96e3b6f64d73346a7a6d94d475fcbbcdd071d5c0
Ref: http://nginx.org/en/docs/http/ngx_http_core_module.html#listen
Ref: https://tools.ietf.org/html/rfc7413#section-5.1
Ref: https://bradleyf.id.au/nix/shaving-your-rtt-wth-tfo/
---
M modules/tlsproxy/manifests/localssl.pp
M modules/tlsproxy/templates/localssl.erb
2 files changed, 7 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/83/295783/1

diff --git a/modules/tlsproxy/manifests/localssl.pp 
b/modules/tlsproxy/manifests/localssl.pp
index b318e8e..3ea355f 100644
--- a/modules/tlsproxy/manifests/localssl.pp
+++ b/modules/tlsproxy/manifests/localssl.pp
@@ -48,6 +48,9 @@
 $varnish_version4 = hiera('varnish_version4', false)
 $keepalives_per_worker = 
hiera('tlsproxy::localssl::keepalives_per_worker', 0)
 $websocket_support = hiera('cache::websocket_support', false)
+# Maximum number of pending TCP Fast Open requests before falling back to
+# regular 3WHS. https://tools.ietf.org/html/rfc7413#section-5.1
+$fastopen_pending_max = hiera('tlsproxy::localssl::fastopen_pending_max', 
150)
 
 # Ensure that exactly one definition exists with default_server = true
 # if multiple defines have default_server set to true, this
diff --git a/modules/tlsproxy/templates/localssl.erb 
b/modules/tlsproxy/templates/localssl.erb
index d4b0635..589956b 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -9,8 +9,8 @@
 
 # SSL proxying
 server {
-   listen [::]:443 <%= @default_server ? "default_server deferred 
backlog=16384 reuseport ipv6only=on " : "" %>ssl http2;
-   listen 443 <%= @default_server ? "default_server deferred backlog=16384 
reuseport " : "" %>ssl http2;
+listen [::]:443 <%= @default_server ? "default_server deferred 
backlog=16384 reuseport ipv6only=on " : "" %>ssl http2 fastopen=<%= 
@fastopen_pending_max %>;
+listen 443 <%= @default_server ? "default_server deferred backlog=16384 
reuseport " : "" %>ssl http2 fastopen=<%= @fastopen_pending_max %>;
ssl on;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;
 
@@ -62,8 +62,8 @@
 }
 <% if @redir_port -%>
 server {
-   listen [::]:<%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport ipv6only=on " : "" %>;
-   listen <%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport " : "" %>;
+listen [::]:<%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport ipv6only=on " : "" %> fastopen=<%= 
@fastopen_pending_max %>;
+listen <%= @redir_port %> <%= @default_server ? "default_server deferred 
backlog=4096 reuseport " : "" %> fastopen=<%= @fastopen_pending_max %>;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;
 
error_log   /var/log/nginx/<%= @name %>.error.log;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I96e3b6f64d73346a7a6d94d475fcbbcdd071d5c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] tlsproxy: enable TCP Fast Open - change (operations/puppet)

2016-06-24 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: tlsproxy: enable TCP Fast Open
..


tlsproxy: enable TCP Fast Open

After enabling client/server TFO support in the kernel in 2b8b99d and
verifying that LVS does not interfere with the modifications to the 3WHS
introduced by TCP Fast Open, we are now ready to enable TFO support on
all tlsproxies.

We introduce a new hiera setting to limit the number of concurrent
pending TFO requests: tlsproxy::localssl::fastopen_pending_max. See RFC
7413 section 5.1 for an explanation of why this is needed.

The TCPFastOpenListenOverflow counter gets incremented every time an
inbound SYN packet with TFO gets treated as a non-TFO SYN because the
fastopen_pending_max threshold has been exceeded. We will keep an eye on
such counter and likely increase fastopen_pending_max as soon as client
adoption of TFO becomes significant.

Bug: T108827
Ref: http://nginx.org/en/docs/http/ngx_http_core_module.html#listen
Ref: https://tools.ietf.org/html/rfc7413#section-5.1
Ref: https://bradleyf.id.au/nix/shaving-your-rtt-wth-tfo/
Change-Id: I96e3b6f64d73346a7a6d94d475fcbbcdd071d5c0
---
M modules/tlsproxy/manifests/localssl.pp
M modules/tlsproxy/templates/localssl.erb
2 files changed, 7 insertions(+), 4 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/tlsproxy/manifests/localssl.pp 
b/modules/tlsproxy/manifests/localssl.pp
index b318e8e..3ea355f 100644
--- a/modules/tlsproxy/manifests/localssl.pp
+++ b/modules/tlsproxy/manifests/localssl.pp
@@ -48,6 +48,9 @@
 $varnish_version4 = hiera('varnish_version4', false)
 $keepalives_per_worker = 
hiera('tlsproxy::localssl::keepalives_per_worker', 0)
 $websocket_support = hiera('cache::websocket_support', false)
+# Maximum number of pending TCP Fast Open requests before falling back to
+# regular 3WHS. https://tools.ietf.org/html/rfc7413#section-5.1
+$fastopen_pending_max = hiera('tlsproxy::localssl::fastopen_pending_max', 
150)
 
 # Ensure that exactly one definition exists with default_server = true
 # if multiple defines have default_server set to true, this
diff --git a/modules/tlsproxy/templates/localssl.erb 
b/modules/tlsproxy/templates/localssl.erb
index d4b0635..6b67bb9 100644
--- a/modules/tlsproxy/templates/localssl.erb
+++ b/modules/tlsproxy/templates/localssl.erb
@@ -9,8 +9,8 @@
 
 # SSL proxying
 server {
-   listen [::]:443 <%= @default_server ? "default_server deferred 
backlog=16384 reuseport ipv6only=on " : "" %>ssl http2;
-   listen 443 <%= @default_server ? "default_server deferred backlog=16384 
reuseport " : "" %>ssl http2;
+   listen [::]:443 <%= @default_server ? "default_server deferred 
backlog=16384 reuseport ipv6only=on " : "" %>ssl http2 fastopen=<%= 
@fastopen_pending_max %>;
+   listen 443 <%= @default_server ? "default_server deferred backlog=16384 
reuseport " : "" %>ssl http2 fastopen=<%= @fastopen_pending_max %>;
ssl on;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;
 
@@ -62,8 +62,8 @@
 }
 <% if @redir_port -%>
 server {
-   listen [::]:<%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport ipv6only=on " : "" %>;
-   listen <%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport " : "" %>;
+   listen [::]:<%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport ipv6only=on " : "" %> fastopen=<%= 
@fastopen_pending_max %>;
+   listen <%= @redir_port %> <%= @default_server ? "default_server 
deferred backlog=4096 reuseport " : "" %> fastopen=<%= @fastopen_pending_max %>;
server_name <%= ([@server_name] + @server_aliases).join(" ") %>;
 
error_log   /var/log/nginx/<%= @name %>.error.log;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I96e3b6f64d73346a7a6d94d475fcbbcdd071d5c0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] admin: add myself (ema) to users - change (operations/puppet)

2016-01-11 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/263378

Change subject: admin: add myself (ema) to users
..

admin: add myself (ema) to users

Add a user for myself with username ema. Add ema to the ops group.

Change-Id: I05ab635d1066203b9cb0a89acf2ee9e4ae85e475
---
M modules/admin/data/data.yaml
1 file changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/263378/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 28caa2d..38527fd 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -14,7 +14,7 @@
 description: include everywhere ops folks
 members: [filippo, jgreen, bblack, andrew, faidon, rush, oblivian, laner, 
yuvipanda,
   dzahn, akosiaris, springle, mark, ariel, cmjohnson, otto, robh, 
tstarling,
-  ori, midom, jmm, jynus, aaron]
+  ori, midom, jmm, jynus, aaron, ema]
 privileges: ['ALL = (ALL) NOPASSWD: ALL']
   parsoid-roots:
 gid: 701
@@ -1747,3 +1747,11 @@
 realname: Casey Dentinger
 ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQDhB5NxsYxf82q8N2/xUZXRUJNlgUB8moiLxFnrS8989pXs4wiilEFpYgMIZ0V30lu7xIeHzCWdJYEq0ySeQ8Wm5BVdM8APpiLZ4YNheG+gTtRaESSjyj6x/VcCxLjiXwzuXSEikmwXKhXeVFIO8s2FaOrb3JYizaWJxbA6DAQiD3ILR8pjuJtaUkZcmVO86qjdOFGqeRMMB1kVye9JYDRYow8QM13v0TDeP+5EY+6yTG5jlGNscTwYO6Xn/BPi+LS/X1AJYQ6qmWjUky3g6TJEREDmpZBmSfl5bGWBVohOZLuQWTxXAuQ/a5tuCbF+fVsJLZv4dRlEINgxyuEbTSwN]
 uid: 12179
+  ema:
+ensure: present
+gid: 500
+name: ema
+realname: Emanuele Rocca
+ssh_keys:
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCfoCT4+pXcLRk3jsZsxFsAtVP38Rs4pfdxSS05+hkMcN1yxi2R1ZeNFkQkCPo6s25Gq863ru5E/vxSjy9mDS4HeaxNSJlPPWD0iEmGdyCg+wEGAZ01n1muFDyb+oiSNy5JcgOk0ZqAPNPYlISKVp+vLro5txdEK8cySy4BIbiM5ygKIjmq1xP+dM9zVdd/UbVQPPBFS2UDBzLX3AeYen4biMx2GkHBpZ/nJLqtb9JE4LLzQAtrqi4+J9jKQGepeTemVQ/n3lbheiGmTDZbRsUx7GTXmdIOPqN4k6FEXEgMIe5plxV8YeAoWqMsGpln4J4bz9HCtM1dL5mdLsa7tkq/
 ema@orion
+uid: 13380

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I05ab635d1066203b9cb0a89acf2ee9e4ae85e475
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] puppet-merge: auto-run conftool-merge - change (operations/puppet)

2016-01-14 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: puppet-merge: auto-run conftool-merge
..


puppet-merge: auto-run conftool-merge

Since conftool-merge is the tool we're using to sync the conftool-data
git repo with what is in the datastore, it should run with every
puppet-merge.

Change-Id: Idfd881ea0bb1fdb8a00dcba5f7744fc583247f30
---
M modules/puppetmaster/files/puppet-merge
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/modules/puppetmaster/files/puppet-merge 
b/modules/puppetmaster/files/puppet-merge
index 2816eff..f076f12 100755
--- a/modules/puppetmaster/files/puppet-merge
+++ b/modules/puppetmaster/files/puppet-merge
@@ -19,6 +19,8 @@
 If the changes are acceptable, HEAD will be fast-forwarded
 to FETCH_HEAD.
 
+It also runs the conftool merge if necessary.
+
  defaults to /var/lib/git/operations/puppet
 
 "
@@ -111,6 +113,8 @@
 
 echo "HEAD is now $(git rev-parse HEAD)."
 cd -
+echo "Now running conftool-merge to sync any changes to conftool data"
+/usr/local/bin/conftool-merge
 exit 0
 else
 echo "Aborting merge."

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idfd881ea0bb1fdb8a00dcba5f7744fc583247f30
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add 0009-tcp-collector-specify-gauges.patch - change (operations...python-diamond)

2016-06-28 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/296380

Change subject: Add 0009-tcp-collector-specify-gauges.patch
..

Add 0009-tcp-collector-specify-gauges.patch

- TCP collector: add a new 'gauges' config option to specify which
  metrics should be published as gauges
- Add upstream-{branch,tree} to gbp.conf
- Other minor packaging updates

Bug: T138758
Change-Id: If4512c66569984f44cfc3b724c31d2da52744380
---
M debian/changelog
M debian/control
M debian/gbp.conf
A debian/patches/0009-tcp-collector-specify-gauges.patch
M debian/patches/series
5 files changed, 73 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-diamond 
refs/changes/80/296380/1

diff --git a/debian/changelog b/debian/changelog
index 40f2bbc..5f5485a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+diamond (3.5-6) jessie; urgency=medium
+
+  * TCP collector: add config option to specify metrics published as gauges
+debian/patches/0009-tcp-collector-specify-gauges.patch
+  * Add upstream-{branch,tree} to debian/gbp.conf
+  * Bump Standards-Version
+  * Add myself to Uploaders
+
+ -- Emanuele Rocca   Tue, 28 Jun 2016 11:37:00 +0200
+
 diamond (3.5-5) jessie; urgency=medium
 
   * Stop forcing logging to stdout which also forces DEBUG logging level, use
diff --git a/debian/control b/debian/control
index af665b0..9c07ebd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@
 Section: python
 Priority: optional
 Maintainer: Filippo Giunchedi 
+Uploaders: Emanuele Rocca 
 Build-Depends: debhelper (>= 9), python-all (>= 2.7), python-mock, 
python-configobj, dh-python, dh-systemd
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 X-Python-Version: >= 2.7
 
 Package: diamond
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 7437c39..ed58312 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -2,3 +2,7 @@
 [import-orig]
 filter = debian/*
 filter = */debian/*
+
+[DEFAULT]
+upstream-branch=upstream
+upstream-tree=branch
diff --git a/debian/patches/0009-tcp-collector-specify-gauges.patch 
b/debian/patches/0009-tcp-collector-specify-gauges.patch
new file mode 100644
index 000..737f8f6
--- /dev/null
+++ b/debian/patches/0009-tcp-collector-specify-gauges.patch
@@ -0,0 +1,56 @@
+From: Emanuele Rocca 
+Date: Tue, 28 Jun 2016 11:38:35 +0200
+Subject: TCP collector: allow to specify metrics to be published as gauges
+
+Add a new 'gauges' config option to specify which metrics should be published
+as gauges.
+---
+ tcp.py |   12 ++--
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/src/collectors/tcp/tcp.py b/src/collectors/tcp/tcp.py
+index 76859fb..4048088 100644
+--- a/src/collectors/tcp/tcp.py
 b/src/collectors/tcp/tcp.py
+@@ -187,20 +187,19 @@ class TCPCollector(diamond.collector.Collector):
+ '/proc/net/snmp'
+ ]
+ 
+-GAUGES = [
+-'CurrEstab',
+-'MaxConn',
+-]
+-
+ def __init__(self, config, handlers):
+ super(TCPCollector, self).__init__(config, handlers)
+ if self.config['allowed_names'] is None:
+ self.config['allowed_names'] = []
+ 
++if self.config['gauges'] is None:
++self.config['gauges'] = []
++
+ def get_default_config_help(self):
+ config_help = super(TCPCollector, self).get_default_config_help()
+ config_help.update({
+ 'allowed_names': 'list of entries to collect, empty to collect 
all',
++'gauges': 'list of metrics to be pushed as gauges',
+ })
+ return config_help
+ 
+@@ -216,6 +215,7 @@ class TCPCollector(diamond.collector.Collector):
+ + 'TCPForwardRetrans, TCPSlowStartRetrans, CurrEstab, '
+ + 'TCPAbortOnMemory, TCPBacklogDrop, AttemptFails, '
+ + 'EstabResets, InErrs, ActiveOpens, PassiveOpens',
++'gauges':'CurrEstab, MaxConn',
+ })
+ return config
+ 
+@@ -270,7 +270,7 @@ class TCPCollector(diamond.collector.Collector):
+ value = long(metrics[metric_name])
+ 
+ # Publish the metric
+-if metric_name in self.GAUGES:
++if metric_name in self.config['gauges']:
+ self.publish_gauge(metric_name, value, 0)
+ else:
+ self.publish_counter(metric_name, value, 0)
diff --git a/debian/patches/series b/debian/patches/series
index 1abbed3..4d73520 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 0006-remove-distro-detection-from-setup.py.patch
 0007-add-transitional-dastatsd.patch
 0008-statsd-use-pystatsd-pipeline-to-send-batches.patch
+0009-tcp-collector-specify-gauges.patch

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

Gerrit-MessageType:

[MediaWiki-commits] [Gerrit] Port Varnish systemd unit file to Varnish 4 - change (operations/puppet)

2016-02-10 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Port Varnish systemd unit file to Varnish 4
..


Port Varnish systemd unit file to Varnish 4

- Use thread_pool_min, thread_pool_max and thread_pool_timeout instead
  of -w INT,INT,INT
- Rename shm_reclen into vsl_reclen. Although shm_reclen is still
  accepted, varnishd(1) suggests to use vsl_reclen instead
- Drop -p user=varnish, Varnish 4 runs as user varnish by default
- Drop -p shm_workspace, it is gone without much explanation

Bug: T122880
Change-Id: I6dd3a0da9e2645a3dfc58da5599e24c921a88e80
---
M modules/varnish/templates/initscripts/varnish.systemd.erb
1 file changed, 10 insertions(+), 2 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve



diff --git a/modules/varnish/templates/initscripts/varnish.systemd.erb 
b/modules/varnish/templates/initscripts/varnish.systemd.erb
index 7fb8692..6d3f020 100644
--- a/modules/varnish/templates/initscripts/varnish.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnish.systemd.erb
@@ -16,12 +16,20 @@
 -a <%= @ports.map { |p| ":"+p }.join(",") -%> \
 -T 127.0.0.1:<%= @admin_port -%> \
 -f /etc/varnish/wikimedia_<%= @vcl -%>.vcl \
+<% if @varnish_version4 -%>
+-p thread_pool_min=250 -p thread_pool_max=<%= @processorcount.to_i * 250 -%> 
-p thread_pool_timeout=120 \
+-p vsl_reclen=2048 \
+<% else -%>
 -w 250,<%= @processorcount.to_i * 250 -%>,120 \
+-p shm_reclen=2048 \
+-p user=varnish \
+-p shm_workspace=16384 \
+<% end -%>
 -S /etc/varnish/secret \
 <%= @storage -%> \
--p user=varnish -p thread_pool_add_delay=1 -p thread_pool_stack=131072 \
+-p thread_pool_add_delay=1 -p thread_pool_stack=131072 \
 -p listen_depth=4096 -p session_max=20 -p vcc_err_unref=off \
--p nuke_limit=300 -p shm_workspace=16384 -p shm_reclen=2048 \
+-p nuke_limit=300 \
 -p http_req_size=24576 \
 <%= @runtime_params -%> \
 <%= @extraopts -%> \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6dd3a0da9e2645a3dfc58da5599e24c921a88e80
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Omit thread_pool_add_delay on Varnish 4 - change (operations/puppet)

2016-02-10 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/269686

Change subject: Omit thread_pool_add_delay on Varnish 4
..

Omit thread_pool_add_delay on Varnish 4

With Varnish 4 running on modern software/hardware it might not be
necessary to wait after creating a thread.

As we deploy experimental hosts with real traffic we will check
threads_failed and set thread_pool_add_delay (in floating-point
seconds!) only if necessary.

Bug: T126206
Change-Id: I0332374ed44d42a9b2aa0e5957515c826793779d
---
M modules/varnish/templates/initscripts/varnish.systemd.erb
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/269686/1

diff --git a/modules/varnish/templates/initscripts/varnish.systemd.erb 
b/modules/varnish/templates/initscripts/varnish.systemd.erb
index 6d3f020..a16418a 100644
--- a/modules/varnish/templates/initscripts/varnish.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnish.systemd.erb
@@ -24,10 +24,11 @@
 -p shm_reclen=2048 \
 -p user=varnish \
 -p shm_workspace=16384 \
+-p thread_pool_add_delay=1 \
 <% end -%>
 -S /etc/varnish/secret \
 <%= @storage -%> \
--p thread_pool_add_delay=1 -p thread_pool_stack=131072 \
+-p thread_pool_stack=131072 \
 -p listen_depth=4096 -p session_max=20 -p vcc_err_unref=off \
 -p nuke_limit=300 \
 -p http_req_size=24576 \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0332374ed44d42a9b2aa0e5957515c826793779d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] WIP: Maps VCL forward-porting to Varnish 4 - change (operations/puppet)

2016-02-09 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/269466

Change subject: WIP: Maps VCL forward-porting to Varnish 4
..

WIP: Maps VCL forward-porting to Varnish 4

There is still quite a lot to do, see comments marked with TODO.
However, this is a good point to upload everything to gerrit, mostly to
get some initial feedback (and as a backup of my work so far). :-)

Bug: T124279
Change-Id: Iee05d5f712093c0a1d939e74a340627982979404
---
M modules/varnish/manifests/common/vcl.pp
M modules/varnish/manifests/instance.pp
A modules/varnish/templates/vcl/wikimedia_v4.vcl.erb
A templates/varnish/analytics_v4.inc.vcl.erb
A templates/varnish/errorpage_v4.inc.vcl.erb
A templates/varnish/maps-backend_v4.inc.vcl.erb
A templates/varnish/maps-frontend_v4.inc.vcl.erb
7 files changed, 1,011 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/66/269466/1

diff --git a/modules/varnish/manifests/common/vcl.pp 
b/modules/varnish/manifests/common/vcl.pp
index cff2aff..d79b164 100644
--- a/modules/varnish/manifests/common/vcl.pp
+++ b/modules/varnish/manifests/common/vcl.pp
@@ -1,6 +1,13 @@
 class varnish::common::vcl {
 require varnish::common
 
+if hiera('varnish_version4', false) {
+$vcl_version_suffix = '_v4'
+}
+else {
+$vcl_version_suffix = ''
+}
+
 file { '/etc/varnish/geoip.inc.vcl':
 owner   => 'root',
 group   => 'root',
@@ -8,18 +15,18 @@
 content => template('varnish/geoip.inc.vcl.erb'),
 }
 
-file { '/etc/varnish/errorpage.inc.vcl':
+file { "/etc/varnish/errorpage${vcl_version_suffix}.inc.vcl":
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => template('varnish/errorpage.inc.vcl.erb'),
+content => 
template("varnish/errorpage${vcl_version_suffix}.inc.vcl.erb"),
 }
 
-file { '/etc/varnish/analytics.inc.vcl':
+file { "/etc/varnish/analytics${vcl_version_suffix}.inc.vcl":
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => template('varnish/analytics.inc.vcl.erb'),
+content => 
template("varnish/analytics${vcl_version_suffix}.inc.vcl.erb"),
 }
 
 # VCL unit tests
diff --git a/modules/varnish/manifests/instance.pp 
b/modules/varnish/manifests/instance.pp
index dfeefd0..f11857b 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -24,6 +24,13 @@
 $extraopts = "-n ${name}"
 }
 
+if hiera('varnish_version4', false) {
+$vcl_version_suffix = '_v4'
+}
+else {
+$vcl_version_suffix = ''
+}
+
 # Initialize variables for templates
 $backends_str = inline_template("<%= @directors.map{|k,v|  v['backends'] 
}.flatten.join('|') %>")
 $varnish_backends = sort(unique(split($backends_str, '\|')))
@@ -74,14 +81,14 @@
 group   => 'root',
 mode=> '0444',
 require => File["/etc/varnish/${vcl}.inc.vcl"],
-content => template("${module_name}/vcl/wikimedia.vcl.erb"),
+content => 
template("${module_name}/vcl/wikimedia${vcl_version_suffix}.vcl.erb"),
 }
 
 file { "/etc/varnish/${vcl}.inc.vcl":
 owner   => 'root',
 group   => 'root',
 mode=> '0444',
-content => template("varnish/${vcl}.inc.vcl.erb"),
+content => template("varnish/${vcl}${vcl_version_suffix}.inc.vcl.erb"),
 notify  => Exec["load-new-vcl-file${instancesuffix}"],
 }
 
diff --git a/modules/varnish/templates/vcl/wikimedia_v4.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia_v4.vcl.erb
new file mode 100644
index 000..f573d48
--- /dev/null
+++ b/modules/varnish/templates/vcl/wikimedia_v4.vcl.erb
@@ -0,0 +1,680 @@
+# This file is managed by Puppet!
+
+vcl 4.0;
+import std;
+import directors;
+
+# this is needed by geoip.inc.vcl and zero.inc.vcl, and in general is the only
+#   way to sanely do Set-Cookie in the face of multiple independent cookies
+#   being set from different code.
+import header;
+
+<% if @vcl_config.fetch("layer", "") == "frontend" -%>
+# only used in recv_fe_ip_processing on frontends
+import netmapper;
+// TODO: possible replacement for chash in varnish 4
+import vslp;
+<% end %>
+
+<%
+def backend_option(backend, option, default)
+   if @varnish_backend_options.kind_of?(Array)
+   # List of hashes of options, 'backend_match' key is a regexp 
against the FQDN
+   @varnish_backend_options.each do |be_options|
+   if Regexp.new(be_options.fetch("backend_match", 
"^.*$")).match(backend)
+   if be_options.has_key?(option)
+   return be_options[option]
+   end
+   end
+   end
+   return default
+   else
+

[MediaWiki-commits] [Gerrit] Display a message in motd if puppet agent is disabled - change (operations/puppet)

2016-02-05 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/268684

Change subject: Display a message in motd if puppet agent is disabled
..

Display a message in motd if puppet agent is disabled

Change-Id: I37039ddc47a265e4c314a2536a6c073691d0fa05
---
A modules/base/files/puppet/98-puppet-agent-disabled
M modules/base/manifests/puppet.pp
2 files changed, 17 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/84/268684/1

diff --git a/modules/base/files/puppet/98-puppet-agent-disabled 
b/modules/base/files/puppet/98-puppet-agent-disabled
new file mode 100644
index 000..1b385b0
--- /dev/null
+++ b/modules/base/files/puppet/98-puppet-agent-disabled
@@ -0,0 +1,11 @@
+#!/bin/sh
+# Script displaying a message if Puppet agent is disabled.
+
+PATH=/bin:/usr/bin
+
+lockfile="/var/lib/puppet/state/agent_disabled.lock"
+
+if test -f $lockfile; then
+reason="$(jq -r '.disabled_message' $lockfile 2>/dev/null)"
+echo "Puppet disabled. $reason"
+fi
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index b4e0872..6fb5fe3 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -95,4 +95,10 @@
 priority => 97,
 source   => 'puppet:///modules/base/puppet/97-last-puppet-run',
 }
+
+motd::script { 'puppet-agent-disabled':
+ensure   => present,
+priority => 98,
+source   => 'puppet:///modules/base/puppet/98-puppet-agent-disabled',
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37039ddc47a265e4c314a2536a6c073691d0fa05
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Skip tests if varnishtest is not installed - change (operations...libvmod-header)

2016-02-04 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/268385

Change subject: Skip tests if varnishtest is not installed
..

Skip tests if varnishtest is not installed

varnishtest is provided by the 'varnish' package, and we do not want to
build-depend on it just to run VMOD tests. Do not run make check in
dh_auto_test if varnishtest is not found on the build host.

Additionally, specify 'export-dir' in gbp.conf.

Bug: T124281
Change-Id: I0946624bf5c916ac636f46a298be959a9eb579a9
---
M debian/gbp.conf
M debian/rules
2 files changed, 8 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-header 
refs/changes/85/268385/1

diff --git a/debian/gbp.conf b/debian/gbp.conf
index fe2e931..7e35015 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,4 @@
 [git-buildpackage]
 upstream-tree=4.1
 debian-branch=debian
+export-dir = ../build-area
diff --git a/debian/rules b/debian/rules
index 64ab0f6..66e87b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,12 @@
 #!/usr/bin/make -f
 
+# varnishtest is provided by the 'varnish' package, and we do not want to
+# build-depend on it just to run VMOD tests. Do not run make check in
+# dh_auto_test if varnishtest is not found on the build host.
+ifeq (, $(shell which varnishtest))
+   export DEB_BUILD_OPTIONS = nocheck
+endif
+
 %:
dh $@ --with autoreconf
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0946624bf5c916ac636f46a298be959a9eb579a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-header
Gerrit-Branch: debian
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] debian/rules: pass --no-start to varnish{log, ncsa} - change (operations...varnish4)

2016-02-05 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/268633

Change subject: debian/rules: pass --no-start to varnish{log,ncsa}
..

debian/rules: pass --no-start to varnish{log,ncsa}

Bug: T122880
Change-Id: I80aca6e525fa617f2ae2a35050b3db89d3ab8144
---
M debian/changelog
M debian/rules
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish4 
refs/changes/33/268633/1

diff --git a/debian/changelog b/debian/changelog
index 14bfb30..35e5900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,7 +24,7 @@
 - varnishncsa-udplog.patch
 - vcl_error-allow-keepalive.patch
 - filter-headers.patch
-  * debian/rules: do not start varnishd on pkg install by passing --no-start
+  * debian/rules: do not start services on pkg install by passing --no-start
 to dh_installinit
   * debian/varnish.postrm: postrm compatibility with /var/lib/varnish as a
 mountpoint
diff --git a/debian/rules b/debian/rules
index e4c8b7d..32d4ca6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,8 +79,8 @@
 # Override to add several init scripts
 override_dh_installinit:
dh_installinit -a --no-start
-   dh_installinit --name=varnishlog
-   dh_installinit --name=varnishncsa
+   dh_installinit --name=varnishlog --no-start
+   dh_installinit --name=varnishncsa --no-start
 
 override_dh_compress:
dh_compress -X/usr/share/doc/varnish-doc/html

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80aca6e525fa617f2ae2a35050b3db89d3ab8144
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish4
Gerrit-Branch: debian-wmf
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] debian/rules: pass --no-start to varnish{log, ncsa} - change (operations...varnish4)

2016-02-05 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: debian/rules: pass --no-start to varnish{log,ncsa}
..


debian/rules: pass --no-start to varnish{log,ncsa}

Bug: T122880
Change-Id: I80aca6e525fa617f2ae2a35050b3db89d3ab8144
---
M debian/changelog
M debian/rules
2 files changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index 14bfb30..35e5900 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,7 +24,7 @@
 - varnishncsa-udplog.patch
 - vcl_error-allow-keepalive.patch
 - filter-headers.patch
-  * debian/rules: do not start varnishd on pkg install by passing --no-start
+  * debian/rules: do not start services on pkg install by passing --no-start
 to dh_installinit
   * debian/varnish.postrm: postrm compatibility with /var/lib/varnish as a
 mountpoint
diff --git a/debian/rules b/debian/rules
index e4c8b7d..32d4ca6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,8 +79,8 @@
 # Override to add several init scripts
 override_dh_installinit:
dh_installinit -a --no-start
-   dh_installinit --name=varnishlog
-   dh_installinit --name=varnishncsa
+   dh_installinit --name=varnishlog --no-start
+   dh_installinit --name=varnishncsa --no-start
 
 override_dh_compress:
dh_compress -X/usr/share/doc/varnish-doc/html

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80aca6e525fa617f2ae2a35050b3db89d3ab8144
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish4
Gerrit-Branch: debian-wmf
Gerrit-Owner: Ema 
Gerrit-Reviewer: Ema 

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

[MediaWiki-commits] [Gerrit] Display a message in motd if puppet agent is disabled - change (operations/puppet)

2016-02-12 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Display a message in motd if puppet agent is disabled
..


Display a message in motd if puppet agent is disabled

Change-Id: I37039ddc47a265e4c314a2536a6c073691d0fa05
---
M modules/base/files/puppet/97-last-puppet-run
A modules/base/files/puppet/puppet-enabled
M modules/base/manifests/puppet.pp
3 files changed, 37 insertions(+), 3 deletions(-)

Approvals:
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Ema: Verified; Looks good to me, approved
  Giuseppe Lavagetto: Looks good to me, but someone else must approve



diff --git a/modules/base/files/puppet/97-last-puppet-run 
b/modules/base/files/puppet/97-last-puppet-run
index 6a931b5..9bb86a4 100755
--- a/modules/base/files/puppet/97-last-puppet-run
+++ b/modules/base/files/puppet/97-last-puppet-run
@@ -3,7 +3,7 @@
 
 set -e
 
-PATH=/bin:/usr/bin
+PATH=/bin:/usr/bin:/usr/local/bin
 LANG=C
 
 TSLASTPUPPETRUN=$(stat -c %Z /var/lib/puppet/state/classes.txt)
@@ -14,8 +14,10 @@
 
 echo -n "The last Puppet run was at $(date -d @$TSLASTPUPPETRUN) "
 
+DISABLEDMSG="$(puppet-enabled || true)"
+
 if [ $DELTAMIN -gt 60 ]; then
-   echo "${BOLD}($DELTAMIN minutes ago)${NORM}."
+   echo "${BOLD}($DELTAMIN minutes ago)${NORM}. $DISABLEDMSG"
 else
-   echo "($DELTAMIN minutes ago)."
+   echo "($DELTAMIN minutes ago). $DISABLEDMSG"
 fi
diff --git a/modules/base/files/puppet/puppet-enabled 
b/modules/base/files/puppet/puppet-enabled
new file mode 100644
index 000..774ca86
--- /dev/null
+++ b/modules/base/files/puppet/puppet-enabled
@@ -0,0 +1,16 @@
+#!/bin/sh
+# Script displaying a message if Puppet agent is disabled.
+
+set -eu
+
+PATH=/bin:/usr/bin
+
+lockfile="/var/lib/puppet/state/agent_disabled.lock"
+
+if test -f $lockfile; then
+reason="$(jq -r '.disabled_message' $lockfile 2>/dev/null)"
+echo "Puppet is disabled. $reason"
+exit 1
+fi
+
+exit 0
diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index b4e0872..0458c4e 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -90,6 +90,22 @@
 source => 'puppet:///modules/base/logrotate/puppet',
 }
 
+# Mode 0751 to make sure non-root users can access
+# /var/lib/puppet/state/agent_disabled.lock to check if puppet is enabled
+file { '/var/lib/puppet':
+ensure => directory,
+owner  => 'puppet',
+group  => 'puppet',
+mode   => '0751',
+}
+
+file { '/usr/local/bin/puppet-enabled':
+mode   => '0555',
+owner  => 'root',
+group  => 'root',
+source => 'puppet:///modules/base/puppet/puppet-enabled',
+}
+
 motd::script { 'last-puppet-run':
 ensure   => present,
 priority => 97,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I37039ddc47a265e4c314a2536a6c073691d0fa05
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Fix multiple definition of /var/lib/puppet - change (operations/puppet)

2016-02-12 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/270263

Change subject: Fix multiple definition of /var/lib/puppet
..

Fix multiple definition of /var/lib/puppet

We introduced a definition of File[/var/lib/puppet] in
https://gerrit.wikimedia.org/r/#/c/268684/.

However, File[/var/lib/puppet] was already defined in puppetmaster::ssl.

This patch introduces a new class called base::puppet::common which is
then included by base::puppet as well as puppetmaster::ssl to fix the
issue.

Change-Id: Ia6f17457bccf33bb7b155c619bfc08f990899f71
---
M modules/base/manifests/puppet.pp
M modules/puppetmaster/manifests/ssl.pp
2 files changed, 14 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/270263/1

diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index 0458c4e..cf0b4b9 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -90,14 +90,7 @@
 source => 'puppet:///modules/base/logrotate/puppet',
 }
 
-# Mode 0751 to make sure non-root users can access
-# /var/lib/puppet/state/agent_disabled.lock to check if puppet is enabled
-file { '/var/lib/puppet':
-ensure => directory,
-owner  => 'puppet',
-group  => 'puppet',
-mode   => '0751',
-}
+include base::puppet::common
 
 file { '/usr/local/bin/puppet-enabled':
 mode   => '0555',
@@ -112,3 +105,14 @@
 source   => 'puppet:///modules/base/puppet/97-last-puppet-run',
 }
 }
+
+class base::puppet::common {
+# Mode 0751 to make sure non-root users can access
+# /var/lib/puppet/state/agent_disabled.lock to check if puppet is enabled
+file { '/var/lib/puppet':
+ensure => directory,
+owner  => 'puppet',
+group  => 'puppet',
+mode   => '0751',
+}
+}
diff --git a/modules/puppetmaster/manifests/ssl.pp 
b/modules/puppetmaster/manifests/ssl.pp
index ea9086f..de2ee88 100644
--- a/modules/puppetmaster/manifests/ssl.pp
+++ b/modules/puppetmaster/manifests/ssl.pp
@@ -14,6 +14,8 @@
 $before = undef
 }
 
+include base::puppet::common
+
 # Move the puppetmaster's SSL files to a separate directory from the client
 file {
 [ '/var/lib/puppet/server',
@@ -25,7 +27,6 @@
 mode=> '0771',
 before  => $before;
 [
-'/var/lib/puppet',
 "${ssldir}/ca",
 "${ssldir}/certificate_requests",
 "${ssldir}/certs",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia6f17457bccf33bb7b155c619bfc08f990899f71
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Fix multiple definition of /var/lib/puppet - change (operations/puppet)

2016-02-12 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Fix multiple definition of /var/lib/puppet
..


Fix multiple definition of /var/lib/puppet

We introduced a definition of File[/var/lib/puppet] in
https://gerrit.wikimedia.org/r/#/c/268684/.

However, File[/var/lib/puppet] was already defined in puppetmaster::ssl.

This patch introduces a new class called base::puppet::common which is
then included by base::puppet as well as puppetmaster::ssl to fix the
issue.

Change-Id: Ia6f17457bccf33bb7b155c619bfc08f990899f71
---
M modules/base/manifests/puppet.pp
A modules/base/manifests/puppet/common.pp
M modules/puppetmaster/manifests/ssl.pp
3 files changed, 13 insertions(+), 9 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  ArielGlenn: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/base/manifests/puppet.pp b/modules/base/manifests/puppet.pp
index 0458c4e..3639da5 100644
--- a/modules/base/manifests/puppet.pp
+++ b/modules/base/manifests/puppet.pp
@@ -90,14 +90,7 @@
 source => 'puppet:///modules/base/logrotate/puppet',
 }
 
-# Mode 0751 to make sure non-root users can access
-# /var/lib/puppet/state/agent_disabled.lock to check if puppet is enabled
-file { '/var/lib/puppet':
-ensure => directory,
-owner  => 'puppet',
-group  => 'puppet',
-mode   => '0751',
-}
+include ::base::puppet::common
 
 file { '/usr/local/bin/puppet-enabled':
 mode   => '0555',
diff --git a/modules/base/manifests/puppet/common.pp 
b/modules/base/manifests/puppet/common.pp
new file mode 100644
index 000..c8ea912
--- /dev/null
+++ b/modules/base/manifests/puppet/common.pp
@@ -0,0 +1,10 @@
+class base::puppet::common {
+# Mode 0751 to make sure non-root users can access
+# /var/lib/puppet/state/agent_disabled.lock to check if puppet is enabled
+file { '/var/lib/puppet':
+ensure => directory,
+owner  => 'puppet',
+group  => 'puppet',
+mode   => '0751',
+}
+}
diff --git a/modules/puppetmaster/manifests/ssl.pp 
b/modules/puppetmaster/manifests/ssl.pp
index ea9086f..a8bfff0 100644
--- a/modules/puppetmaster/manifests/ssl.pp
+++ b/modules/puppetmaster/manifests/ssl.pp
@@ -14,6 +14,8 @@
 $before = undef
 }
 
+include ::base::puppet::common
+
 # Move the puppetmaster's SSL files to a separate directory from the client
 file {
 [ '/var/lib/puppet/server',
@@ -25,7 +27,6 @@
 mode=> '0771',
 before  => $before;
 [
-'/var/lib/puppet',
 "${ssldir}/ca",
 "${ssldir}/certificate_requests",
 "${ssldir}/certs",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6f17457bccf33bb7b155c619bfc08f990899f71
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Port Varnish systemd unit file to Varnish 4 - change (operations/puppet)

2016-02-10 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/269664

Change subject: Port Varnish systemd unit file to Varnish 4
..

Port Varnish systemd unit file to Varnish 4

- Use thread_pool_min, thread_pool_max and thread_pool_timeout instead
  of -w INT,INT,INT
- Rename shm_reclen into vsl_reclen. Although shm_reclen is still
  accepted, varnishd(1) suggests to use vsl_reclen instead
- Drop -p user=varnish, Varnish 4 runs as user varnish by default
- Drop -p shm_workspace, it is gone without much explanation

Bug: T122880
Change-Id: I6dd3a0da9e2645a3dfc58da5599e24c921a88e80
---
M modules/varnish/templates/initscripts/varnish.systemd.erb
1 file changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/269664/1

diff --git a/modules/varnish/templates/initscripts/varnish.systemd.erb 
b/modules/varnish/templates/initscripts/varnish.systemd.erb
index 7fb8692..6d3f020 100644
--- a/modules/varnish/templates/initscripts/varnish.systemd.erb
+++ b/modules/varnish/templates/initscripts/varnish.systemd.erb
@@ -16,12 +16,20 @@
 -a <%= @ports.map { |p| ":"+p }.join(",") -%> \
 -T 127.0.0.1:<%= @admin_port -%> \
 -f /etc/varnish/wikimedia_<%= @vcl -%>.vcl \
+<% if @varnish_version4 -%>
+-p thread_pool_min=250 -p thread_pool_max=<%= @processorcount.to_i * 250 -%> 
-p thread_pool_timeout=120 \
+-p vsl_reclen=2048 \
+<% else -%>
 -w 250,<%= @processorcount.to_i * 250 -%>,120 \
+-p shm_reclen=2048 \
+-p user=varnish \
+-p shm_workspace=16384 \
+<% end -%>
 -S /etc/varnish/secret \
 <%= @storage -%> \
--p user=varnish -p thread_pool_add_delay=1 -p thread_pool_stack=131072 \
+-p thread_pool_add_delay=1 -p thread_pool_stack=131072 \
 -p listen_depth=4096 -p session_max=20 -p vcc_err_unref=off \
--p nuke_limit=300 -p shm_workspace=16384 -p shm_reclen=2048 \
+-p nuke_limit=300 \
 -p http_req_size=24576 \
 <%= @runtime_params -%> \
 <%= @extraopts -%> \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6dd3a0da9e2645a3dfc58da5599e24c921a88e80
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Install man page: vmod_vslp - change (operations...libvmod-vslp)

2016-02-05 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/268651

Change subject: Install man page: vmod_vslp
..

Install man page: vmod_vslp

Bug: T124281
Change-Id: I8cbe8e8a7e179ab2bd8cd4a0ee2ac02067876112
---
A debian/libvmod-vslp.manpages
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-vslp 
refs/changes/51/268651/1

diff --git a/debian/libvmod-vslp.manpages b/debian/libvmod-vslp.manpages
new file mode 100644
index 000..ed55fd1
--- /dev/null
+++ b/debian/libvmod-vslp.manpages
@@ -0,0 +1 @@
+vmod_vslp.3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8cbe8e8a7e179ab2bd8cd4a0ee2ac02067876112
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-vslp
Gerrit-Branch: debian-wmf
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Install man page: vmod_vslp - change (operations...libvmod-vslp)

2016-02-05 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Install man page: vmod_vslp
..


Install man page: vmod_vslp

Bug: T124281
Change-Id: I8cbe8e8a7e179ab2bd8cd4a0ee2ac02067876112
---
A debian/libvmod-vslp.manpages
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/debian/libvmod-vslp.manpages b/debian/libvmod-vslp.manpages
new file mode 100644
index 000..ed55fd1
--- /dev/null
+++ b/debian/libvmod-vslp.manpages
@@ -0,0 +1 @@
+vmod_vslp.3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8cbe8e8a7e179ab2bd8cd4a0ee2ac02067876112
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-vslp
Gerrit-Branch: debian-wmf
Gerrit-Owner: Ema 
Gerrit-Reviewer: Ema 

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

[MediaWiki-commits] [Gerrit] Skip tests if varnishtest is not installed - change (operations...libvmod-header)

2016-02-04 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Skip tests if varnishtest is not installed
..


Skip tests if varnishtest is not installed

varnishtest is provided by the 'varnish' package, and we do not want to
build-depend on it just to run VMOD tests. Do not run make check in
dh_auto_test if varnishtest is not found on the build host.

Additionally, specify 'export-dir' in gbp.conf.

Bug: T124281
Change-Id: I0946624bf5c916ac636f46a298be959a9eb579a9
---
M debian/gbp.conf
M debian/rules
2 files changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/debian/gbp.conf b/debian/gbp.conf
index fe2e931..7e35015 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,3 +1,4 @@
 [git-buildpackage]
 upstream-tree=4.1
 debian-branch=debian
+export-dir = ../build-area
diff --git a/debian/rules b/debian/rules
index 64ab0f6..66e87b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,12 @@
 #!/usr/bin/make -f
 
+# varnishtest is provided by the 'varnish' package, and we do not want to
+# build-depend on it just to run VMOD tests. Do not run make check in
+# dh_auto_test if varnishtest is not found on the build host.
+ifeq (, $(shell which varnishtest))
+   export DEB_BUILD_OPTIONS = nocheck
+endif
+
 %:
dh $@ --with autoreconf
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0946624bf5c916ac636f46a298be959a9eb579a9
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-header
Gerrit-Branch: debian
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 

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

[MediaWiki-commits] [Gerrit] Install man page: vmod-tbf - change (operations...libvmod-tbf)

2016-02-05 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Install man page: vmod-tbf
..


Install man page: vmod-tbf

Bug: T124281
Change-Id: Ib28e9237032a21e7527807e243cc36e615460e8b
---
A debian/libvmod-tbf.manpages
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/debian/libvmod-tbf.manpages b/debian/libvmod-tbf.manpages
new file mode 100644
index 000..abb1c6e
--- /dev/null
+++ b/debian/libvmod-tbf.manpages
@@ -0,0 +1 @@
+src/vmod-tbf.3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib28e9237032a21e7527807e243cc36e615460e8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-tbf
Gerrit-Branch: debian
Gerrit-Owner: Ema 
Gerrit-Reviewer: Ema 

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

[MediaWiki-commits] [Gerrit] Install man page: vmod-tbf - change (operations...libvmod-tbf)

2016-02-05 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/268640

Change subject: Install man page: vmod-tbf
..

Install man page: vmod-tbf

Bug: T124281
Change-Id: Ib28e9237032a21e7527807e243cc36e615460e8b
---
A debian/libvmod-tbf.manpages
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-tbf 
refs/changes/40/268640/1

diff --git a/debian/libvmod-tbf.manpages b/debian/libvmod-tbf.manpages
new file mode 100644
index 000..abb1c6e
--- /dev/null
+++ b/debian/libvmod-tbf.manpages
@@ -0,0 +1 @@
+src/vmod-tbf.3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib28e9237032a21e7527807e243cc36e615460e8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-tbf
Gerrit-Branch: debian
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Install man page: vmod_header - change (operations...libvmod-header)

2016-02-05 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/268675

Change subject: Install man page: vmod_header
..

Install man page: vmod_header

Bug: T124281
Change-Id: I0f5b1ec58e5c1555be61f0db38b629a7a72557fd
---
A debian/libvmod-header.manpages
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-header 
refs/changes/75/268675/1

diff --git a/debian/libvmod-header.manpages b/debian/libvmod-header.manpages
new file mode 100644
index 000..dc51c5b
--- /dev/null
+++ b/debian/libvmod-header.manpages
@@ -0,0 +1 @@
+vmod_header.3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f5b1ec58e5c1555be61f0db38b629a7a72557fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-header
Gerrit-Branch: debian
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Install man page: vmod_header - change (operations...libvmod-header)

2016-02-05 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Install man page: vmod_header
..


Install man page: vmod_header

Bug: T124281
Change-Id: I0f5b1ec58e5c1555be61f0db38b629a7a72557fd
---
A debian/libvmod-header.manpages
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/debian/libvmod-header.manpages b/debian/libvmod-header.manpages
new file mode 100644
index 000..dc51c5b
--- /dev/null
+++ b/debian/libvmod-header.manpages
@@ -0,0 +1 @@
+vmod_header.3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f5b1ec58e5c1555be61f0db38b629a7a72557fd
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-header
Gerrit-Branch: debian
Gerrit-Owner: Ema 
Gerrit-Reviewer: Ema 

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

[MediaWiki-commits] [Gerrit] esams: add text nodes to mobile cluster - change (operations/puppet)

2016-01-26 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: esams: add text nodes to mobile cluster
..


esams: add text nodes to mobile cluster

This patchset adds all text nodes in esams to the mobile cluster for
varnish-fe and nginx.

Bug: T109286
Change-Id: Ie5467c6810205050d415477a29d7f90722ea5dab
---
M conftool-data/nodes/esams.yaml
1 file changed, 16 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  BBlack: Looks good to me, but someone else must approve



diff --git a/conftool-data/nodes/esams.yaml b/conftool-data/nodes/esams.yaml
index e0151e4..16e8400 100644
--- a/conftool-data/nodes/esams.yaml
+++ b/conftool-data/nodes/esams.yaml
@@ -3,6 +3,22 @@
   cp3016.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp3017.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp3018.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp3003.esams.wmnet: [varnish-fe, nginx]
+  cp3004.esams.wmnet: [varnish-fe, nginx]
+  cp3005.esams.wmnet: [varnish-fe, nginx]
+  cp3006.esams.wmnet: [varnish-fe, nginx]
+  cp3007.esams.wmnet: [varnish-fe, nginx]
+  cp3008.esams.wmnet: [varnish-fe, nginx]
+  cp3009.esams.wmnet: [varnish-fe, nginx]
+  cp3010.esams.wmnet: [varnish-fe, nginx]
+#  cp3011.esams.wmnet: [varnish-fe, nginx] #disabled, see T92306
+  cp3012.esams.wmnet: [varnish-fe, nginx]
+  cp3013.esams.wmnet: [varnish-fe, nginx]
+  cp3014.esams.wmnet: [varnish-fe, nginx]
+  cp3030.esams.wmnet: [varnish-fe, nginx]
+  cp3031.esams.wmnet: [varnish-fe, nginx]
+  cp3040.esams.wmnet: [varnish-fe, nginx]
+  cp3041.esams.wmnet: [varnish-fe, nginx]
 cache_text:
   cp3003.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp3004.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5467c6810205050d415477a29d7f90722ea5dab
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Build-depend on pkg-config to please autoreconf - change (operations...libvmod-netmapper)

2016-02-03 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/268089

Change subject: Build-depend on pkg-config to please autoreconf
..

Build-depend on pkg-config to please autoreconf

Bug: T124281
Change-Id: I205880d939c1ec9422b1db45b020a69b12bce5c6
---
M debian/control
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/89/268089/1

diff --git a/debian/control b/debian/control
index c8677de..db575e9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Brandon Black 
 Uploaders: Emanuele Rocca 
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, 
libvarnishapi-dev (>= 4.1.1), libjansson-dev, liburcu-dev
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, 
libvarnishapi-dev (>= 4.1.1), libjansson-dev, liburcu-dev, pkg-config
 Standards-Version: 3.9.6
 Homepage: 
https://git.wikimedia.org/summary/operations/software/varnish/libvmod-netmapper
 #Vcs-Git: 
https://gerrit.wikimedia.org/r/operations/software/varnish/libvmod-netmapper

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I205880d939c1ec9422b1db45b020a69b12bce5c6
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: debian
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Build-depend on pkg-config to please autoreconf - change (operations...libvmod-netmapper)

2016-02-03 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Build-depend on pkg-config to please autoreconf
..


Build-depend on pkg-config to please autoreconf

Bug: T124281
Change-Id: I205880d939c1ec9422b1db45b020a69b12bce5c6
---
M debian/control
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/debian/control b/debian/control
index c8677de..db575e9 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Brandon Black 
 Uploaders: Emanuele Rocca 
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, 
libvarnishapi-dev (>= 4.1.1), libjansson-dev, liburcu-dev
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, 
libvarnishapi-dev (>= 4.1.1), libjansson-dev, liburcu-dev, pkg-config
 Standards-Version: 3.9.6
 Homepage: 
https://git.wikimedia.org/summary/operations/software/varnish/libvmod-netmapper
 #Vcs-Git: 
https://gerrit.wikimedia.org/r/operations/software/varnish/libvmod-netmapper

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I205880d939c1ec9422b1db45b020a69b12bce5c6
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: debian
Gerrit-Owner: Ema 
Gerrit-Reviewer: Ema 

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

[MediaWiki-commits] [Gerrit] MobileApps: Change RESTBase URI - change (operations/puppet)

2016-02-03 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: MobileApps: Change RESTBase URI
..


MobileApps: Change RESTBase URI

The Mobile Content Service has changed the way they include the RESTBase
URI to a more flexible scheme that allows them to use both RESTBase's
internal URI, as well as the generic https://{domain}/api/rest_v1
external URI. This patch conforms to the new standard.

Note: to be deployed in conjunction with
I6d703b627fc22a0bfe7c27b32efa54ef0e10b5cf .

Change-Id: I4523d97598ef10d2075bd5ec9f60ba8bf5acfef4
Depends-On: I6d703b627fc22a0bfe7c27b32efa54ef0e10b5cf
Bug: T125252
---
M modules/mobileapps/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/modules/mobileapps/manifests/init.pp 
b/modules/mobileapps/manifests/init.pp
index 1bf95db..f651702 100644
--- a/modules/mobileapps/manifests/init.pp
+++ b/modules/mobileapps/manifests/init.pp
@@ -14,7 +14,7 @@
 #   The host/IP where to reach RESTBase
 #
 class mobileapps(
-$restbase_uri = 'http://restbase.svc.eqiad.wmnet:7231',
+$restbase_uri = 'http://restbase.svc.eqiad.wmnet:7231/%DOMAIN%/v1',
 ) {
 service::node { 'mobileapps':
 port=> ,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4523d97598ef10d2075bd5ec9f60ba8bf5acfef4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] New upstream version. Port to Varnish 4. - change (operations...libvmod-netmapper)

2016-02-02 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: New upstream version. Port to Varnish 4.
..


New upstream version. Port to Varnish 4.

Version 1.3 of libvmod-netmapper features some autotools-related changes
because of the way vmods are built in Varnish 4. It is now possible to
build vmods out-of-tree.

Further, architectural changes in Varnish 4 required minor modifcations
to the module itself.

Change-Id: I1a3facbd96b875c9f88e066092d59fc09bee2c37
---
M Makefile.am
M NEWS
M autogen.sh
M configure.ac
M src/Makefile.am
M src/vmod_netmapper.c
M src/vmod_netmapper.vcc
M src/vnm.c
8 files changed, 74 insertions(+), 50 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve



diff --git a/Makefile.am b/Makefile.am
index d7dcb2b..5b581e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,9 @@
 
 SUBDIRS = src
 
+DISTCHECK_CONFIGURE_FLAGS = \
+   VMOD_DIR='$${libdir}/varnish/vmods'
+
 EXTRA_DIST = README.rst
 
 dist_man_MANS = vmod_netmapper.3
diff --git a/NEWS b/NEWS
index 2039f67..e64a29c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+1.3 - 2016-02-02
+   Use vrt_ctx pointers instead of a sess pointers in VMOD functions.
+   Use VSLb instead of WSP for logging.
+   Autotools-related changes because of the way vmods are built in Varnish 4.
+
 1.2 - 2013-09-12
Added vnm_validate cmdline tool.  Exit status indicates JSON parse-ability.
  Accepts IP addr as extra argument for manual results debugging.
diff --git a/autogen.sh b/autogen.sh
index 9a12ef5..08d225b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -35,8 +35,19 @@
esac
 fi
 
-set -ex
+# check for varnishapi.m4 in custom paths
+dataroot=$(pkg-config --variable=datarootdir varnishapi 2>/dev/null)
+if [ -z "$dataroot" ] ; then
+cat >&2 <<'EOF'
+Package varnishapi was not found in the pkg-config search path.
+Perhaps you should add the directory containing `varnishapi.pc'
+to the PKG_CONFIG_PATH environment variable
+EOF
+exit 1
+fi
 
+set -ex
+[ -d m4 ] || mkdir m4
 aclocal -I m4
 $LIBTOOLIZE --copy --force
 autoheader
diff --git a/configure.ac b/configure.ac
index aa0a8fd..c763247 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
 AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (c) 2013 Brandon Black ])
-AC_INIT([libvmod-netmapper],[1.2],[bbl...@wikimedia.org],[libvmod-netmapper],[https://git.wikimedia.org/summary/operations%2Fsoftware%2Fvarnish%2Flibvmod-netmapper])
+AC_COPYRIGHT([Copyright (c) 2013-2016 Brandon Black ])
+AC_INIT([libvmod-netmapper],[1.3],[bbl...@wikimedia.org],[libvmod-netmapper],[https://git.wikimedia.org/summary/operations%2Fsoftware%2Fvarnish%2Flibvmod-netmapper])
 AC_CONFIG_MACRO_DIR([m4])
+m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4]))
 AC_CONFIG_AUX_DIR([acaux])
 AC_CONFIG_SRCDIR(src/vmod_netmapper.vcc)
 AM_CONFIG_HEADER(config.h)
@@ -41,36 +42,35 @@
 # Check for python
 AC_CHECK_PROGS(PYTHON, [python3 python3.1 python3.2 python2.7 python2.6 
python2.5 python2 python], [AC_MSG_ERROR([Python is needed to build this vmod, 
please install python.])])
 
-# Varnish source tree
-AC_ARG_VAR([VARNISHSRC], [path to Varnish source tree (mandatory)])
-if test "x$VARNISHSRC" = x; then
-   AC_MSG_ERROR([No Varnish source tree specified])
-fi
-VARNISHSRC=`cd $VARNISHSRC && pwd`
-AC_CHECK_FILE([$VARNISHSRC/include/varnishapi.h],
-   [],
-   [AC_MSG_FAILURE(["$VARNISHSRC" is not a Varnish source directory])]
-)
+PKG_CHECK_MODULES([libvarnishapi], [varnishapi])
+PKG_CHECK_VAR([LIBVARNISHAPI_PREFIX], [varnishapi], [prefix])
+PKG_CHECK_VAR([LIBVARNISHAPI_DATAROOTDIR], [varnishapi], [datarootdir])
+PKG_CHECK_VAR([LIBVARNISHAPI_BINDIR], [varnishapi], [bindir])
+PKG_CHECK_VAR([LIBVARNISHAPI_SBINDIR], [varnishapi], [sbindir])
+AC_SUBST([LIBVARNISHAPI_DATAROOTDIR])
 
-# varnishd and varnishtest locations (default from source tree)
+# Varnish include files tree
+VARNISH_VMOD_INCLUDES
+VARNISH_VMOD_DIR
+VARNISH_VMODTOOL
+# AC_PREFIX_DEFAULT acts too early in the configure run,
+# so we can't use it
+ac_default_prefix=$LIBVARNISHAPI_PREFIX
 
-AC_ARG_VAR([VARNISHD], [path to varnishd binary (default: used built copy in 
VARNISHSRC)])
-if test "x$VARNISHD" = x; then
-VARNISHD="$VARNISHSRC/bin/varnishd/varnishd"
-fi
-AC_CHECK_FILE([$VARNISHD],
-   [],
-[AC_MSG_FAILURE([varnishd binary "$VARNISHD" does not exist])]
-)
+AC_PATH_PROG([VARNISHTEST], [varnishtest], [],
+[$LIBVARNISHAPI_BINDIR:$LIBVARNISHAPI_SBINDIR:$PATH])
+AC_PATH_PROG([VARNISHD], [varnishd], [],
+[$LIBVARNISHAPI_SBINDIR:$LIBVARNISHAPI_BINDIR:$PATH])
 
-AC_ARG_VAR([VARNISHTEST], [path to varnishtest binary (default: used built 
copy in VARNISHSRC)])
-if test "x$VARNISHTEST" = x; then
-VARNISHTEST="$VARNISHSRC/bin/varnishtest/varnishtest"
-fi
-AC_CHECK_FILE([$VARNISHTEST],
-   [],
-

[MediaWiki-commits] [Gerrit] New upstream version. Port to Varnish 4. - change (operations...libvmod-netmapper)

2016-02-02 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/267885

Change subject: New upstream version. Port to Varnish 4.
..

New upstream version. Port to Varnish 4.

Version 1.3 of libvmod-netmapper features some autotools-related changes
because of the way vmods are built in Varnish 4. It is now possible to
build vmods out-of-tree.

Further, architectural changes in Varnish 4 required minor modifcations
to the module itself.

Change-Id: I1a3facbd96b875c9f88e066092d59fc09bee2c37
---
M Makefile.am
M NEWS
M autogen.sh
M configure.ac
M src/Makefile.am
M src/vmod_netmapper.c
M src/vmod_netmapper.vcc
M src/vnm.c
8 files changed, 74 insertions(+), 50 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/85/267885/1

diff --git a/Makefile.am b/Makefile.am
index d7dcb2b..5b581e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,9 @@
 
 SUBDIRS = src
 
+DISTCHECK_CONFIGURE_FLAGS = \
+   VMOD_DIR='$${libdir}/varnish/vmods'
+
 EXTRA_DIST = README.rst
 
 dist_man_MANS = vmod_netmapper.3
diff --git a/NEWS b/NEWS
index 2039f67..e64a29c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+1.3 - 2016-02-02
+   Use vrt_ctx pointers instead of a sess pointers in VMOD functions.
+   Use VSLb instead of WSP for logging.
+   Autotools-related changes because of the way vmods are built in Varnish 4.
+
 1.2 - 2013-09-12
Added vnm_validate cmdline tool.  Exit status indicates JSON parse-ability.
  Accepts IP addr as extra argument for manual results debugging.
diff --git a/autogen.sh b/autogen.sh
index 9a12ef5..08d225b 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -35,8 +35,19 @@
esac
 fi
 
-set -ex
+# check for varnishapi.m4 in custom paths
+dataroot=$(pkg-config --variable=datarootdir varnishapi 2>/dev/null)
+if [ -z "$dataroot" ] ; then
+cat >&2 <<'EOF'
+Package varnishapi was not found in the pkg-config search path.
+Perhaps you should add the directory containing `varnishapi.pc'
+to the PKG_CONFIG_PATH environment variable
+EOF
+exit 1
+fi
 
+set -ex
+[ -d m4 ] || mkdir m4
 aclocal -I m4
 $LIBTOOLIZE --copy --force
 autoheader
diff --git a/configure.ac b/configure.ac
index aa0a8fd..c763247 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,8 @@
 AC_PREREQ(2.59)
-AC_COPYRIGHT([Copyright (c) 2013 Brandon Black ])
-AC_INIT([libvmod-netmapper],[1.2],[bbl...@wikimedia.org],[libvmod-netmapper],[https://git.wikimedia.org/summary/operations%2Fsoftware%2Fvarnish%2Flibvmod-netmapper])
+AC_COPYRIGHT([Copyright (c) 2013-2016 Brandon Black ])
+AC_INIT([libvmod-netmapper],[1.3],[bbl...@wikimedia.org],[libvmod-netmapper],[https://git.wikimedia.org/summary/operations%2Fsoftware%2Fvarnish%2Flibvmod-netmapper])
 AC_CONFIG_MACRO_DIR([m4])
+m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4]))
 AC_CONFIG_AUX_DIR([acaux])
 AC_CONFIG_SRCDIR(src/vmod_netmapper.vcc)
 AM_CONFIG_HEADER(config.h)
@@ -41,36 +42,35 @@
 # Check for python
 AC_CHECK_PROGS(PYTHON, [python3 python3.1 python3.2 python2.7 python2.6 
python2.5 python2 python], [AC_MSG_ERROR([Python is needed to build this vmod, 
please install python.])])
 
-# Varnish source tree
-AC_ARG_VAR([VARNISHSRC], [path to Varnish source tree (mandatory)])
-if test "x$VARNISHSRC" = x; then
-   AC_MSG_ERROR([No Varnish source tree specified])
-fi
-VARNISHSRC=`cd $VARNISHSRC && pwd`
-AC_CHECK_FILE([$VARNISHSRC/include/varnishapi.h],
-   [],
-   [AC_MSG_FAILURE(["$VARNISHSRC" is not a Varnish source directory])]
-)
+PKG_CHECK_MODULES([libvarnishapi], [varnishapi])
+PKG_CHECK_VAR([LIBVARNISHAPI_PREFIX], [varnishapi], [prefix])
+PKG_CHECK_VAR([LIBVARNISHAPI_DATAROOTDIR], [varnishapi], [datarootdir])
+PKG_CHECK_VAR([LIBVARNISHAPI_BINDIR], [varnishapi], [bindir])
+PKG_CHECK_VAR([LIBVARNISHAPI_SBINDIR], [varnishapi], [sbindir])
+AC_SUBST([LIBVARNISHAPI_DATAROOTDIR])
 
-# varnishd and varnishtest locations (default from source tree)
+# Varnish include files tree
+VARNISH_VMOD_INCLUDES
+VARNISH_VMOD_DIR
+VARNISH_VMODTOOL
+# AC_PREFIX_DEFAULT acts too early in the configure run,
+# so we can't use it
+ac_default_prefix=$LIBVARNISHAPI_PREFIX
 
-AC_ARG_VAR([VARNISHD], [path to varnishd binary (default: used built copy in 
VARNISHSRC)])
-if test "x$VARNISHD" = x; then
-VARNISHD="$VARNISHSRC/bin/varnishd/varnishd"
-fi
-AC_CHECK_FILE([$VARNISHD],
-   [],
-[AC_MSG_FAILURE([varnishd binary "$VARNISHD" does not exist])]
-)
+AC_PATH_PROG([VARNISHTEST], [varnishtest], [],
+[$LIBVARNISHAPI_BINDIR:$LIBVARNISHAPI_SBINDIR:$PATH])
+AC_PATH_PROG([VARNISHD], [varnishd], [],
+[$LIBVARNISHAPI_SBINDIR:$LIBVARNISHAPI_BINDIR:$PATH])
 
-AC_ARG_VAR([VARNISHTEST], [path to varnishtest binary (default: used built 
copy in VARNISHSRC)])
-if test "x$VARNISHTEST" = x; then
-VARNISHTEST="$VARNISHSRC/bin/varnishtest/varnishtest"
-fi
-AC_CHECK_FILE([$VARNISHTEST],
-

[MediaWiki-commits] [Gerrit] Packaging changes for Varnish 4 - change (operations...libvmod-netmapper)

2016-02-02 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/267887

Change subject: Packaging changes for Varnish 4
..

Packaging changes for Varnish 4

- Build-depend on libvarnishapi-dev instead of varnish itself. Starting
  with varnish4, vmods can be built out-of-tree
- Do not fetch varnish source code (override_dh_auto_configure)
- Depend on varnish 4.1.1

Change-Id: If95f87d98a28e0b73bf8ad8ca7592888dc0d8ad2
---
M debian/changelog
M debian/control
M debian/rules
3 files changed, 15 insertions(+), 13 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/87/267887/1

diff --git a/debian/changelog b/debian/changelog
index 2413103..1ddc93a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libvmod-netmapper (1.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Build-depend on libvarnishapi-dev instead of varnish itself. Starting with
+varnish4, vmods can be built out-of-tree
+  * Do not fetch varnish source code (override_dh_auto_configure)
+  * Depend on varnish 4.1.1
+  * Add myself to Uploaders
+
+ -- Emanuele Rocca   Tue, 02 Feb 2016 11:12:40 +0100
+
 libvmod-netmapper (1.2-1) unstable; urgency=low
 
   * Bump upstream
diff --git a/debian/control b/debian/control
index e9d160b..c8677de 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@
 Section: web
 Priority: extra
 Maintainer: Brandon Black 
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, varnish (>= 3), 
libjansson-dev, liburcu-dev
-Standards-Version: 3.9.3
+Uploaders: Emanuele Rocca 
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, 
libvarnishapi-dev (>= 4.1.1), libjansson-dev, liburcu-dev
+Standards-Version: 3.9.6
 Homepage: 
https://git.wikimedia.org/summary/operations/software/varnish/libvmod-netmapper
 #Vcs-Git: 
https://gerrit.wikimedia.org/r/operations/software/varnish/libvmod-netmapper
 #Vcs-Browser: 
https://git.wikimedia.org/summary/operations/software/varnish/libvmod-netmapper
@@ -11,7 +12,7 @@
 Package: libvmod-netmapper
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, varnish (>= 3)
+Depends: varnish (>= 4.1.1), ${shlibs:Depends}, ${misc:Depends}
 Description: Varnish VMOD for mapping IP networks to strings
  Loads a JSON database mapping networks to strings, matches IP addresses
against this database.
diff --git a/debian/rules b/debian/rules
index 32fef7f..bb5897f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,15 +15,5 @@
 %:
dh $@  --with autoreconf
 
-# vmods require a varnish source tree (matching the binary version we're 
using!)
-#  in order to compile, so we fetch one just before ./configure.  This is a bit
-#  hacky, but seems to work ok so far.
-
-override_dh_auto_configure:
-   apt-get source varnish=`dpkg-query -W varnish | cut -f2`
-   dh_auto_configure -- VARNISHSRC=./varnish-3* 
VARNISHD=/usr/sbin/varnishd VARNISHTEST=/usr/bin/varnishtest
-
 override_dh_strip:
dh_strip --dbg-package=libvmod-netmapper-dbg
-
-.PHONY: override_dh_auto_configure override_dh_strip

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If95f87d98a28e0b73bf8ad8ca7592888dc0d8ad2
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: master
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Add bash_profile and vimrc for ema - change (operations/puppet)

2016-02-02 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/267850

Change subject: Add bash_profile and vimrc for ema
..

Add bash_profile and vimrc for ema

Change-Id: I00483db87cb07893473d1f4df52cd59cd998e702
---
A modules/admin/files/home/ema/.bash_profile
A modules/admin/files/home/ema/.vimrc
2 files changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/50/267850/1

diff --git a/modules/admin/files/home/ema/.bash_profile 
b/modules/admin/files/home/ema/.bash_profile
new file mode 100644
index 000..437b3a8
--- /dev/null
+++ b/modules/admin/files/home/ema/.bash_profile
@@ -0,0 +1,5 @@
+hostname="$(hostname --fqdn)"
+export 
PS1="\[\033]0;\u@${hostname}:\w\007\]${debian_chroot:+($debian_chroot)}\t 
\u@$hostname:\w\n\$ "
+
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
diff --git a/modules/admin/files/home/ema/.vimrc 
b/modules/admin/files/home/ema/.vimrc
new file mode 100644
index 000..57d66ec
--- /dev/null
+++ b/modules/admin/files/home/ema/.vimrc
@@ -0,0 +1,5 @@
+syntax on
+set background=dark
+set et
+set sw=4
+set ts=4

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I00483db87cb07893473d1f4df52cd59cd998e702
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Packaging changes for Varnish 4 - change (operations...libvmod-netmapper)

2016-02-02 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Packaging changes for Varnish 4
..


Packaging changes for Varnish 4

- Build-depend on libvarnishapi-dev instead of varnish itself.
  Starting
  with varnish4, vmods can be built out-of-tree
- Do not fetch varnish source code (override_dh_auto_configure)
- Depend on varnish 4.1.1

Bug: T124281
Change-Id: Id77db586fc60c0f2061f8d0e510ef85ee92349ee
---
M debian/changelog
M debian/control
M debian/rules
3 files changed, 16 insertions(+), 12 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve



diff --git a/debian/changelog b/debian/changelog
index 2413103..1ddc93a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libvmod-netmapper (1.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Build-depend on libvarnishapi-dev instead of varnish itself. Starting with
+varnish4, vmods can be built out-of-tree
+  * Do not fetch varnish source code (override_dh_auto_configure)
+  * Depend on varnish 4.1.1
+  * Add myself to Uploaders
+
+ -- Emanuele Rocca   Tue, 02 Feb 2016 11:12:40 +0100
+
 libvmod-netmapper (1.2-1) unstable; urgency=low
 
   * Bump upstream
diff --git a/debian/control b/debian/control
index e9d160b..c8677de 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@
 Section: web
 Priority: extra
 Maintainer: Brandon Black 
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, varnish (>= 3), 
libjansson-dev, liburcu-dev
-Standards-Version: 3.9.3
+Uploaders: Emanuele Rocca 
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, 
libvarnishapi-dev (>= 4.1.1), libjansson-dev, liburcu-dev
+Standards-Version: 3.9.6
 Homepage: 
https://git.wikimedia.org/summary/operations/software/varnish/libvmod-netmapper
 #Vcs-Git: 
https://gerrit.wikimedia.org/r/operations/software/varnish/libvmod-netmapper
 #Vcs-Browser: 
https://git.wikimedia.org/summary/operations/software/varnish/libvmod-netmapper
@@ -11,7 +12,7 @@
 Package: libvmod-netmapper
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, varnish (>= 3)
+Depends: varnish (>= 4.1.1), ${shlibs:Depends}, ${misc:Depends}
 Description: Varnish VMOD for mapping IP networks to strings
  Loads a JSON database mapping networks to strings, matches IP addresses
against this database.
diff --git a/debian/rules b/debian/rules
index 32fef7f..86ab84c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,15 +15,7 @@
 %:
dh $@  --with autoreconf
 
-# vmods require a varnish source tree (matching the binary version we're 
using!)
-#  in order to compile, so we fetch one just before ./configure.  This is a bit
-#  hacky, but seems to work ok so far.
-
-override_dh_auto_configure:
-   apt-get source varnish=`dpkg-query -W varnish | cut -f2`
-   dh_auto_configure -- VARNISHSRC=./varnish-3* 
VARNISHD=/usr/sbin/varnishd VARNISHTEST=/usr/bin/varnishtest
-
 override_dh_strip:
dh_strip --dbg-package=libvmod-netmapper-dbg
 
-.PHONY: override_dh_auto_configure override_dh_strip
+.PHONY: override_dh_strip

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id77db586fc60c0f2061f8d0e510ef85ee92349ee
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: debian
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 

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

[MediaWiki-commits] [Gerrit] Add bash_profile and vimrc for ema - change (operations/puppet)

2016-02-02 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Add bash_profile and vimrc for ema
..


Add bash_profile and vimrc for ema

Change-Id: I00483db87cb07893473d1f4df52cd59cd998e702
---
A modules/admin/files/home/ema/.bash_profile
A modules/admin/files/home/ema/.vimrc
2 files changed, 10 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Ema: Verified; Looks good to me, approved



diff --git a/modules/admin/files/home/ema/.bash_profile 
b/modules/admin/files/home/ema/.bash_profile
new file mode 100644
index 000..437b3a8
--- /dev/null
+++ b/modules/admin/files/home/ema/.bash_profile
@@ -0,0 +1,5 @@
+hostname="$(hostname --fqdn)"
+export 
PS1="\[\033]0;\u@${hostname}:\w\007\]${debian_chroot:+($debian_chroot)}\t 
\u@$hostname:\w\n\$ "
+
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
diff --git a/modules/admin/files/home/ema/.vimrc 
b/modules/admin/files/home/ema/.vimrc
new file mode 100644
index 000..57d66ec
--- /dev/null
+++ b/modules/admin/files/home/ema/.vimrc
@@ -0,0 +1,5 @@
+syntax on
+set background=dark
+set et
+set sw=4
+set ts=4

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I00483db87cb07893473d1f4df52cd59cd998e702
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Packaging changes for Varnish 4 - change (operations...libvmod-netmapper)

2016-02-02 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/267900

Change subject: Packaging changes for Varnish 4
..

Packaging changes for Varnish 4

- Build-depend on libvarnishapi-dev instead of varnish itself.
  Starting
  with varnish4, vmods can be built out-of-tree
- Do not fetch varnish source code (override_dh_auto_configure)
- Depend on varnish 4.1.1

Bug: T124281
Change-Id: Id77db586fc60c0f2061f8d0e510ef85ee92349ee
---
M debian/changelog
M debian/control
M debian/rules
3 files changed, 16 insertions(+), 12 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/00/267900/1

diff --git a/debian/changelog b/debian/changelog
index 2413103..1ddc93a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libvmod-netmapper (1.3-1) unstable; urgency=medium
+
+  * New upstream release
+  * Build-depend on libvarnishapi-dev instead of varnish itself. Starting with
+varnish4, vmods can be built out-of-tree
+  * Do not fetch varnish source code (override_dh_auto_configure)
+  * Depend on varnish 4.1.1
+  * Add myself to Uploaders
+
+ -- Emanuele Rocca   Tue, 02 Feb 2016 11:12:40 +0100
+
 libvmod-netmapper (1.2-1) unstable; urgency=low
 
   * Bump upstream
diff --git a/debian/control b/debian/control
index e9d160b..c8677de 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,9 @@
 Section: web
 Priority: extra
 Maintainer: Brandon Black 
-Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, varnish (>= 3), 
libjansson-dev, liburcu-dev
-Standards-Version: 3.9.3
+Uploaders: Emanuele Rocca 
+Build-Depends: debhelper (>= 9), autotools-dev, dh-autoreconf, 
libvarnishapi-dev (>= 4.1.1), libjansson-dev, liburcu-dev
+Standards-Version: 3.9.6
 Homepage: 
https://git.wikimedia.org/summary/operations/software/varnish/libvmod-netmapper
 #Vcs-Git: 
https://gerrit.wikimedia.org/r/operations/software/varnish/libvmod-netmapper
 #Vcs-Browser: 
https://git.wikimedia.org/summary/operations/software/varnish/libvmod-netmapper
@@ -11,7 +12,7 @@
 Package: libvmod-netmapper
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}, varnish (>= 3)
+Depends: varnish (>= 4.1.1), ${shlibs:Depends}, ${misc:Depends}
 Description: Varnish VMOD for mapping IP networks to strings
  Loads a JSON database mapping networks to strings, matches IP addresses
against this database.
diff --git a/debian/rules b/debian/rules
index 32fef7f..86ab84c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,15 +15,7 @@
 %:
dh $@  --with autoreconf
 
-# vmods require a varnish source tree (matching the binary version we're 
using!)
-#  in order to compile, so we fetch one just before ./configure.  This is a bit
-#  hacky, but seems to work ok so far.
-
-override_dh_auto_configure:
-   apt-get source varnish=`dpkg-query -W varnish | cut -f2`
-   dh_auto_configure -- VARNISHSRC=./varnish-3* 
VARNISHD=/usr/sbin/varnishd VARNISHTEST=/usr/bin/varnishtest
-
 override_dh_strip:
dh_strip --dbg-package=libvmod-netmapper-dbg
 
-.PHONY: override_dh_auto_configure override_dh_strip
+.PHONY: override_dh_strip

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id77db586fc60c0f2061f8d0e510ef85ee92349ee
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: debian
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into debian - change (operations...libvmod-netmapper)

2016-02-02 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/267899

Change subject: Merge branch 'master' into debian
..

Merge branch 'master' into debian

Change-Id: If7a645fe09ad263621668aa9c6b3b2e7f9a592da
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/varnish/libvmod-netmapper 
refs/changes/99/267899/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If7a645fe09ad263621668aa9c6b3b2e7f9a592da
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: debian
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Merge branch 'master' into debian - change (operations...libvmod-netmapper)

2016-02-02 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Merge branch 'master' into debian
..


Merge branch 'master' into debian

Change-Id: If7a645fe09ad263621668aa9c6b3b2e7f9a592da
---
0 files changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve




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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7a645fe09ad263621668aa9c6b3b2e7f9a592da
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/varnish/libvmod-netmapper
Gerrit-Branch: debian
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 

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

[MediaWiki-commits] [Gerrit] RESTBase: enable metrics batching - change (operations/puppet)

2016-02-03 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: RESTBase: enable metrics batching
..


RESTBase: enable metrics batching

RESTBase sends a lot of metrics to graphite. In order to minimise the
amount of requests done (each of which is rather small in payload),
batch consecutive events together.

Change-Id: I9fe06567cfbc2e5ac17de9c6e644a3fd8246d265
---
M modules/restbase/templates/config.labs.yaml.erb
M modules/restbase/templates/config.yaml.erb
2 files changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Ema: Verified; Looks good to me, approved
  GWicke: Looks good to me, but someone else must approve



diff --git a/modules/restbase/templates/config.labs.yaml.erb 
b/modules/restbase/templates/config.labs.yaml.erb
index 45730c6..3cae6a1 100644
--- a/modules/restbase/templates/config.labs.yaml.erb
+++ b/modules/restbase/templates/config.labs.yaml.erb
@@ -135,3 +135,4 @@
   type: statsd # default, but lets be explicit
   host: <%= @statsd_host %>
   port: <%= @statsd_port %>
+  batch: true
diff --git a/modules/restbase/templates/config.yaml.erb 
b/modules/restbase/templates/config.yaml.erb
index 87aad54..e7b8109 100644
--- a/modules/restbase/templates/config.yaml.erb
+++ b/modules/restbase/templates/config.yaml.erb
@@ -885,3 +885,4 @@
   type: statsd # default, but lets be explicit
   host: <%= @statsd_host %>
   port: <%= @statsd_port %>
+  batch: true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9fe06567cfbc2e5ac17de9c6e644a3fd8246d265
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: GWicke 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] New WMF version: 4.1.1-1wm2 - change (operations...varnish4)

2016-02-25 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: New WMF version: 4.1.1-1wm2
..


New WMF version: 4.1.1-1wm2

Add debian/patches/0005-vcc-real-plus-real.patch to allow arithmetic
operations on real values.

http://www.gossamer-threads.com/lists/varnish/dev/38798

Bug: T124279
Change-Id: I07ec6f949b07d7a9ea752108774ec43227e5bec6
---
M debian/changelog
A debian/patches/0005-vcc-real-plus-real.patch
M debian/patches/series
3 files changed, 29 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index 35e5900..c39a685 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+varnish (4.1.1-1wm2) jessie-wikimedia; urgency=medium
+
+  * Add debian/patches/0005-vcc-real-plus-real.patch to allow arithmetic
+operations on real values.
+
+ -- Emanuele Rocca   Mon, 22 Feb 2016 15:24:16 +0100
+
 varnish (4.1.1-1wm1) jessie-wikimedia; urgency=medium
 
   * Local package (WMF).
diff --git a/debian/patches/0005-vcc-real-plus-real.patch 
b/debian/patches/0005-vcc-real-plus-real.patch
new file mode 100644
index 000..4226f81
--- /dev/null
+++ b/debian/patches/0005-vcc-real-plus-real.patch
@@ -0,0 +1,21 @@
+diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
+index 5989f07..af3b3e7 100644
+--- a/lib/libvcc/vcc_expr.c
 b/lib/libvcc/vcc_expr.c
+@@ -942,6 +942,7 @@ vcc_expr_mul(struct vcc *tl, struct expr **e, enum 
var_type fmt)
+   case INT:   f2 = INT; break;
+   case DURATION:  f2 = REAL; break;
+   case BYTES: f2 = REAL; break;
++  case REAL:  f2 = REAL; break;
+   default:
+   if (tl->t->tok != '*' && tl->t->tok != '/')
+   return;
+@@ -1049,6 +1050,8 @@ vcc_expr_add(struct vcc *tl, struct expr **e, enum 
var_type fmt)
+   /* OK */
+   } else if ((*e)->fmt == INT && e2->fmt == INT) {
+   /* OK */
++  } else if ((*e)->fmt == REAL && e2->fmt == REAL) {
++  /* OK */
+   } else if ((*e)->fmt == DURATION && e2->fmt == DURATION) {
+   /* OK */
+   } else if (tk->tok == '+' &&
diff --git a/debian/patches/series b/debian/patches/series
index 58c34d7..597c0c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-varnishd-persistent-fallocate.patch
 0003-varnishd-nukelru.patch
 0004-varnishd-persistent-mmap-exit.patch
+0005-vcc-real-plus-real.patch

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07ec6f949b07d7a9ea752108774ec43227e5bec6
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish4
Gerrit-Branch: debian-wmf
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 

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

[MediaWiki-commits] [Gerrit] Simplify VCL errorpage - change (operations/puppet)

2016-02-29 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Simplify VCL errorpage
..


Simplify VCL errorpage

We are currently returning redundant information such as the server port
and IP which we can already figure out from server.hostname and
server.identity. Further, X-Client-IP is more reliable than client.ip,
and X-Forwarded-For is not particularly interesting.

Change-Id: I019cd51aa27a1a8eb5d79d6c1f29d727332723ce
---
M templates/varnish/errorpage.inc.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Krinkle: Looks good to me, but someone else must approve
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/templates/varnish/errorpage.inc.vcl.erb 
b/templates/varnish/errorpage.inc.vcl.erb
index 92264b6..6966315 100644
--- a/templates/varnish/errorpage.inc.vcl.erb
+++ b/templates/varnish/errorpage.inc.vcl.erb
@@ -26,8 +26,8 @@
 
 If you report this error to the Wikimedia System Administrators, please 
include the details below.
 
-Request from "} + client.ip + " via " + server.hostname + " " + 
server.identity + " ([" + server.ip + "]:" + server.port + "), Varnish XID " + 
req.xid + "" +
-regsub(req.http.X-Forwarded-For, ".+", "Forwarded for: \0") + 
regsub(obj.http.X-Cache, ".+", "Upstream caches: \0") +
+Request from "} + req.http.X-Client-IP + " via " + server.hostname + " " + 
server.identity + ", Varnish XID " + req.xid + "" +
+regsub(obj.http.X-Cache, ".+", "Upstream caches: \0") +
 "Error: " + obj.status + ", " + obj.response + " at " + now +
 {"
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I019cd51aa27a1a8eb5d79d6c1f29d727332723ce
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] admin: add nikerabbit to researchers - change (operations/puppet)

2016-02-26 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: admin: add nikerabbit to researchers
..


admin: add nikerabbit to researchers

User nikerabbit is an existing shell user who has access
to statistics servers. This additional group will let him
read a mysql config file including a password, so he can then
access the research database which has private data.

Currently, the whole purpose of the researchers group is to handle
that permission to get the database credentials because it
was done manually before.

Already has approval on ticket and does not involve sudo so it does not
have to be in the ops meeting.

Technically this is an access requests for database admins.

Bug:T127808
Change-Id: I774d8d1673ff0a969f59937d7b9c0101ec80f6a4
---
M modules/admin/data/data.yaml
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  Muehlenhoff: Looks good to me, but someone else must approve
  Dzahn: Looks good to me, but someone else must approve



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 9ec1fda..2481294 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -112,7 +112,8 @@
   mforns, jdlrobson, dr0ptp4kt, tgr, marktraceur, jhernandez, joal,
   daisy, tomasz, mholloway-shell, madhuvishy, ebernhardson, 
niedzielski,
   neilpquinn-wmf, tbayer, moushira, dbrant, maxsem, srijan, 
krenair,
-  jminor, asherman, etonkovidova, sbisson, addshore, matmarex, 
elukey]
+  jminor, asherman, etonkovidova, sbisson, addshore, matmarex, 
elukey,
+  nikerabbit]
   ldap-admins:
 gid: 715
 description: ldap admins

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I774d8d1673ff0a969f59937d7b9c0101ec80f6a4
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Nikerabbit 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] New WMF version: 4.1.1-1wm2 - change (operations...varnish4)

2016-02-22 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/272468

Change subject: New WMF version: 4.1.1-1wm2
..

New WMF version: 4.1.1-1wm2

Add debian/patches/0005-vcc-real-plus-real.patch to allow arithmetic
operations on real values.

http://www.gossamer-threads.com/lists/varnish/dev/38798

Bug: T124279
Change-Id: I07ec6f949b07d7a9ea752108774ec43227e5bec6
---
M debian/changelog
A debian/patches/0005-vcc-real-plus-real.patch
M debian/patches/series
3 files changed, 29 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/varnish4 
refs/changes/68/272468/1

diff --git a/debian/changelog b/debian/changelog
index 35e5900..c39a685 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+varnish (4.1.1-1wm2) jessie-wikimedia; urgency=medium
+
+  * Add debian/patches/0005-vcc-real-plus-real.patch to allow arithmetic
+operations on real values.
+
+ -- Emanuele Rocca   Mon, 22 Feb 2016 15:24:16 +0100
+
 varnish (4.1.1-1wm1) jessie-wikimedia; urgency=medium
 
   * Local package (WMF).
diff --git a/debian/patches/0005-vcc-real-plus-real.patch 
b/debian/patches/0005-vcc-real-plus-real.patch
new file mode 100644
index 000..4226f81
--- /dev/null
+++ b/debian/patches/0005-vcc-real-plus-real.patch
@@ -0,0 +1,21 @@
+diff --git a/lib/libvcc/vcc_expr.c b/lib/libvcc/vcc_expr.c
+index 5989f07..af3b3e7 100644
+--- a/lib/libvcc/vcc_expr.c
 b/lib/libvcc/vcc_expr.c
+@@ -942,6 +942,7 @@ vcc_expr_mul(struct vcc *tl, struct expr **e, enum 
var_type fmt)
+   case INT:   f2 = INT; break;
+   case DURATION:  f2 = REAL; break;
+   case BYTES: f2 = REAL; break;
++  case REAL:  f2 = REAL; break;
+   default:
+   if (tl->t->tok != '*' && tl->t->tok != '/')
+   return;
+@@ -1049,6 +1050,8 @@ vcc_expr_add(struct vcc *tl, struct expr **e, enum 
var_type fmt)
+   /* OK */
+   } else if ((*e)->fmt == INT && e2->fmt == INT) {
+   /* OK */
++  } else if ((*e)->fmt == REAL && e2->fmt == REAL) {
++  /* OK */
+   } else if ((*e)->fmt == DURATION && e2->fmt == DURATION) {
+   /* OK */
+   } else if (tk->tok == '+' &&
diff --git a/debian/patches/series b/debian/patches/series
index 58c34d7..597c0c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-varnishd-persistent-fallocate.patch
 0003-varnishd-nukelru.patch
 0004-varnishd-persistent-mmap-exit.patch
+0005-vcc-real-plus-real.patch

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07ec6f949b07d7a9ea752108774ec43227e5bec6
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/varnish4
Gerrit-Branch: debian-wmf
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Reduce vcl_error redundancy - change (operations/puppet)

2016-02-22 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Reduce vcl_error redundancy
..


Reduce vcl_error redundancy

Currently all cluster-specific vlc_error definitions call 'return
(deliver)' once they're done with sub errorpage. Further, the
cluster-independent version of vcl_error short-circuits on backend
generated 400s and 413s to immediately deliver the page.

Here we try to simplify the logic a bit by essentially including the
400/413 check in sub errorpage and always calling deliver at the end of
errorpage itself. This way we can remove all the redundant
'return(deliver)' from cluster-specific versions of vcl_error.

Change-Id: Ib93e1444d19ceac6279bc4c8b2343a94e20ee341
---
M modules/varnish/templates/vcl/wikimedia.vcl.erb
M templates/varnish/errorpage.inc.vcl.erb
M templates/varnish/maps-backend.inc.vcl.erb
M templates/varnish/maps-frontend.inc.vcl.erb
M templates/varnish/misc-backend.inc.vcl.erb
M templates/varnish/misc-frontend.inc.vcl.erb
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
M templates/varnish/upload-backend.inc.vcl.erb
M templates/varnish/upload-frontend.inc.vcl.erb
10 files changed, 2 insertions(+), 14 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/varnish/templates/vcl/wikimedia.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia.vcl.erb
index 62e4e51..bb2b909 100644
--- a/modules/varnish/templates/vcl/wikimedia.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia.vcl.erb
@@ -608,10 +608,6 @@
call https_error_redirect;
 <% end -%>
 
-   if (obj.status == 400 || obj.status == 413) {
-   return(deliver);
-   }
-
 <% if scope.function_hiera(["cluster"]) != "cache_parsoid" -%>
 <% if @vcl_config.fetch("layer", "") == "frontend" -%>
// retry 503 once in frontend instances, to paper over transient issues
diff --git a/templates/varnish/errorpage.inc.vcl.erb 
b/templates/varnish/errorpage.inc.vcl.erb
index b1e1c90..27bc4ea 100644
--- a/templates/varnish/errorpage.inc.vcl.erb
+++ b/templates/varnish/errorpage.inc.vcl.erb
@@ -1,8 +1,8 @@
 sub errorpage {
-   if (obj.status >= 400) {
+   if (obj.status > 400 && obj.status != 413) {
call synth_errorpage;
-   return (deliver);
}
+   return (deliver);
 }
 
 sub synth_errorpage {
diff --git a/templates/varnish/maps-backend.inc.vcl.erb 
b/templates/varnish/maps-backend.inc.vcl.erb
index 49c8995..efa318d 100644
--- a/templates/varnish/maps-backend.inc.vcl.erb
+++ b/templates/varnish/maps-backend.inc.vcl.erb
@@ -9,5 +9,4 @@
 
 sub vcl_error {
call errorpage;
-   return (deliver);
 }
diff --git a/templates/varnish/maps-frontend.inc.vcl.erb 
b/templates/varnish/maps-frontend.inc.vcl.erb
index 89c4b80..f25699a 100644
--- a/templates/varnish/maps-frontend.inc.vcl.erb
+++ b/templates/varnish/maps-frontend.inc.vcl.erb
@@ -18,5 +18,4 @@
 
 sub vcl_error {
call errorpage;
-   return (deliver);
 }
diff --git a/templates/varnish/misc-backend.inc.vcl.erb 
b/templates/varnish/misc-backend.inc.vcl.erb
index d9b7087..00649db 100644
--- a/templates/varnish/misc-backend.inc.vcl.erb
+++ b/templates/varnish/misc-backend.inc.vcl.erb
@@ -75,7 +75,6 @@
 
 sub vcl_error {
 call errorpage;
-return (deliver);
 }
 
 sub vcl_fetch {
diff --git a/templates/varnish/misc-frontend.inc.vcl.erb 
b/templates/varnish/misc-frontend.inc.vcl.erb
index 673a9bc..14cbd7c 100644
--- a/templates/varnish/misc-frontend.inc.vcl.erb
+++ b/templates/varnish/misc-frontend.inc.vcl.erb
@@ -42,7 +42,6 @@
 }
 
 call errorpage;
-return (deliver);
 }
 
 sub vcl_fetch {
diff --git a/templates/varnish/text-backend.inc.vcl.erb 
b/templates/varnish/text-backend.inc.vcl.erb
index 11539aa..42b651a 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -121,5 +121,4 @@
 
 sub vcl_error {
call errorpage;
-   return (deliver);
 }
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 697a455..1fc6452 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -274,7 +274,6 @@
}
 
call errorpage;
-   return (deliver);
 }
 
 sub vcl_deliver {
diff --git a/templates/varnish/upload-backend.inc.vcl.erb 
b/templates/varnish/upload-backend.inc.vcl.erb
index 97827fb..2a64fe7 100644
--- a/templates/varnish/upload-backend.inc.vcl.erb
+++ b/templates/varnish/upload-backend.inc.vcl.erb
@@ -85,7 +85,6 @@
 
 sub vcl_error {
call errorpage;
-   return (deliver);
 }
 
 sub vcl_deliver {
diff --git a/templates/varnish/upload-frontend.inc.vcl.erb 
b/templates/varnish/upload-frontend.inc.vcl.erb
index e6bb484..83aedeb 100644
---

[MediaWiki-commits] [Gerrit] Maps VCL forward-port to Varnish 4 - change (operations/puppet)

2016-02-26 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/273490

Change subject: Maps VCL forward-port to Varnish 4
..

Maps VCL forward-port to Varnish 4

This patch uses a boolean hiera attribute, varnish_version4, to
distinguish between Varnish 3 and Varnish 4 VCL syntax.

With these changes applied, Varnish 4 starts properly on machines
deployed with role cache::maps.

The included test cases pass with Varnish 4.

Bug: T124279
Change-Id: I622f58e32878b6fa7a8578aae3e62bd448e4baac
---
M modules/role/manifests/cache/maps.pp
M modules/varnish/manifests/common/vcl.pp
M modules/varnish/manifests/instance.pp
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
M templates/varnish/analytics.inc.vcl.erb
M templates/varnish/errorpage.inc.vcl.erb
M templates/varnish/maps-backend.inc.vcl.erb
M templates/varnish/maps-frontend.inc.vcl.erb
M templates/varnish/misc-backend.inc.vcl.erb
M templates/varnish/misc-common.inc.vcl.erb
M templates/varnish/misc-frontend.inc.vcl.erb
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-common.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
M templates/varnish/upload-backend.inc.vcl.erb
M templates/varnish/upload-frontend.inc.vcl.erb
18 files changed, 401 insertions(+), 64 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/273490/1

diff --git a/modules/role/manifests/cache/maps.pp 
b/modules/role/manifests/cache/maps.pp
index 84bbdad..fec0f65 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -20,6 +20,13 @@
 
 include role::cache::ssl::unified
 
+if hiera('varnish_version4', false) {
+$maps_director_type = 'vslp'
+}
+else {
+$maps_director_type = 'chash'
+}
+
 $varnish_be_directors = {
 'one' => {
 'backend'   => {
@@ -34,7 +41,7 @@
 'two' => {
 'backend' => {
 'dynamic'  => 'yes',
-'type' => 'chash',
+'type' => $maps_director_type,
 'backends' => $cluster_nodes['eqiad'],
 },
 'backend_random' => {
@@ -129,7 +136,7 @@
 directors  => {
 'backend'=> {
 'dynamic'  => 'yes',
-'type' => 'chash',
+'type' => $maps_director_type,
 'backends' => $site_cluster_nodes,
 },
 'backend_random' => {
diff --git a/modules/varnish/manifests/common/vcl.pp 
b/modules/varnish/manifests/common/vcl.pp
index cff2aff..737002d 100644
--- a/modules/varnish/manifests/common/vcl.pp
+++ b/modules/varnish/manifests/common/vcl.pp
@@ -1,6 +1,8 @@
 class varnish::common::vcl {
 require varnish::common
 
+$varnish_version4 = hiera('varnish_version4', false)
+
 file { '/etc/varnish/geoip.inc.vcl':
 owner   => 'root',
 group   => 'root',
@@ -29,4 +31,9 @@
 mode   => '0555',
 source => 'puppet:///modules/varnish/varnish-test-geoip',
 }
+
+file { '/usr/share/varnish/tests/':
+source  => 'puppet:///modules/varnish/tests',
+recurse => true,
+}
 }
diff --git a/modules/varnish/manifests/instance.pp 
b/modules/varnish/manifests/instance.pp
index 6fba0d5..809015e 100644
--- a/modules/varnish/manifests/instance.pp
+++ b/modules/varnish/manifests/instance.pp
@@ -1,3 +1,16 @@
+define varnish::wikimedia_vcl($varnish_testing, $template_path) {
+if $varnish_testing  {
+$varnish_include_path = '/usr/share/varnish/tests/'
+}
+
+file { $title:
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => template($template_path),
+}
+}
+
 define varnish::instance(
 $vcl_config,
 $backend_options,
@@ -24,6 +37,56 @@
 else {
 $instancesuffix = "-${name}"
 $extraopts = "-n ${name}"
+}
+
+# $varnish_version4 is used to distinguish between v4 and v3 versions of
+# VCL code, as well as to pass the right parameters to varnishd. See
+# varnish.systemd.erb
+$varnish_version4 = hiera('varnish_version4', false)
+
+if $varnish_version4 {
+# 
https://www.varnish-cache.org/docs/4.0/whats-new/upgrading.html#req-request-is-now-req-method
+$req_method = 'req.method'
+
+$bereq_method = 'bereq.method'
+
+# http://www.gossamer-threads.com/lists/varnish/misc/32514
+$bereq_retries = 'bereq.retries'
+
+# Use the following X_Y variables anywhere the upgrade from v3 to v4
+# requires replacing the string X with Y.
+
+# 
https://www.varnish-cache.org/docs/4.0/whats-new/upgrading.html#req-not-available-in-vcl-backend-response
+$bereq_req = 'bereq'
+
+#

[MediaWiki-commits] [Gerrit] Simplify VCL errorpage - change (operations/puppet)

2016-02-26 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/273480

Change subject: Simplify VCL errorpage
..

Simplify VCL errorpage

We are currently returning redundant information such as the server port
and IP which we can already figure out from server.hostname and
server.identity. Further, X-Client-IP is more reliable than client.ip,
and X-Forwarded-For is not particularly interesting.

Change-Id: I019cd51aa27a1a8eb5d79d6c1f29d727332723ce
---
M templates/varnish/errorpage.inc.vcl.erb
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/80/273480/1

diff --git a/templates/varnish/errorpage.inc.vcl.erb 
b/templates/varnish/errorpage.inc.vcl.erb
index 92264b6..6966315 100644
--- a/templates/varnish/errorpage.inc.vcl.erb
+++ b/templates/varnish/errorpage.inc.vcl.erb
@@ -26,8 +26,8 @@
 
 If you report this error to the Wikimedia System Administrators, please 
include the details below.
 
-Request from "} + client.ip + " via " + server.hostname + " " + 
server.identity + " ([" + server.ip + "]:" + server.port + "), Varnish XID " + 
req.xid + "" +
-regsub(req.http.X-Forwarded-For, ".+", "Forwarded for: \0") + 
regsub(obj.http.X-Cache, ".+", "Upstream caches: \0") +
+Request from "} + req.http.X-Client-IP + " via " + server.hostname + " " + 
server.identity + ", Varnish XID " + req.xid + "" +
+regsub(obj.http.X-Cache, ".+", "Upstream caches: \0") +
 "Error: " + obj.status + ", " + obj.response + " at " + now +
 {"
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I019cd51aa27a1a8eb5d79d6c1f29d727332723ce
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] cache_text: add mobile IPs to loopback - change (operations/puppet)

2016-01-19 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: cache_text: add mobile IPs to loopback
..


cache_text: add mobile IPs to loopback

Note: this doesn't do anything in functional terms - it merely
prepares for the next steps...

Bug: T109286
Change-Id: Ic196573770d5686508b415d8d476e33a2c473043
---
M modules/role/manifests/cache/text.pp
1 file changed, 4 insertions(+), 1 deletion(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/cache/text.pp 
b/modules/role/manifests/cache/text.pp
index 154f68d..06b161d 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -10,7 +10,10 @@
 include role::cache::2layer
 
 class { 'lvs::realserver':
-realserver_ips => $lvs::configuration::service_ips['text'][$::site],
+realserver_ips => merge(
+$lvs::configuration::service_ips['text'][$::site],
+$lvs::configuration::service_ips['mobile'][$::site]
+)
 }
 
 $cluster_nodes = hiera('cache::text::nodes')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic196573770d5686508b415d8d476e33a2c473043
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] codfw: add text nodes to mobile cluster - change (operations/puppet)

2016-01-22 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/265710

Change subject: codfw: add text nodes to mobile cluster
..

codfw: add text nodes to mobile cluster

This patchset adds all text nodes in codfw to the mobile cluster for
varnish-fe and nginx.

Bug: T109286
Change-Id: Iebaac1a039a0aa482d86e3ec7eb9ebbfb4583035
---
M conftool-data/nodes/codfw.yaml
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/265710/1

diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index 2c7673c..9f35798 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -208,6 +208,14 @@
   cp2009.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp2015.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp2021.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp2001.codfw.wmnet: [varnish-fe, nginx]
+  cp2004.codfw.wmnet: [varnish-fe, nginx]
+  cp2007.codfw.wmnet: [varnish-fe, nginx]
+  cp2010.codfw.wmnet: [varnish-fe, nginx]
+  cp2013.codfw.wmnet: [varnish-fe, nginx]
+  cp2016.codfw.wmnet: [varnish-fe, nginx]
+  cp2019.codfw.wmnet: [varnish-fe, nginx]
+  cp2023.codfw.wmnet: [varnish-fe, nginx]
 cache_upload:
   cp2002.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp2005.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iebaac1a039a0aa482d86e3ec7eb9ebbfb4583035
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] codfw: add text nodes to mobile cluster - change (operations/puppet)

2016-01-22 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: codfw: add text nodes to mobile cluster
..


codfw: add text nodes to mobile cluster

This patchset adds all text nodes in codfw to the mobile cluster for
varnish-fe and nginx.

Bug: T109286
Change-Id: Iebaac1a039a0aa482d86e3ec7eb9ebbfb4583035
---
M conftool-data/nodes/codfw.yaml
1 file changed, 8 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  BBlack: Looks good to me, but someone else must approve



diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index 2c7673c..9f35798 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -208,6 +208,14 @@
   cp2009.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp2015.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp2021.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp2001.codfw.wmnet: [varnish-fe, nginx]
+  cp2004.codfw.wmnet: [varnish-fe, nginx]
+  cp2007.codfw.wmnet: [varnish-fe, nginx]
+  cp2010.codfw.wmnet: [varnish-fe, nginx]
+  cp2013.codfw.wmnet: [varnish-fe, nginx]
+  cp2016.codfw.wmnet: [varnish-fe, nginx]
+  cp2019.codfw.wmnet: [varnish-fe, nginx]
+  cp2023.codfw.wmnet: [varnish-fe, nginx]
 cache_upload:
   cp2002.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp2005.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iebaac1a039a0aa482d86e3ec7eb9ebbfb4583035
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ulsfo: add text nodes to mobile cluster - change (operations/puppet)

2016-01-25 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: ulsfo: add text nodes to mobile cluster
..


ulsfo: add text nodes to mobile cluster

This patchset adds all text nodes in ulsfo to the mobile cluster for
varnish-fe and nginx.

Bug: T109286
Change-Id: I0f5ba5287902c73503fb2b41f4a2f07993fbe986
---
M conftool-data/nodes/ulsfo.yaml
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/conftool-data/nodes/ulsfo.yaml b/conftool-data/nodes/ulsfo.yaml
index 0ccdfd1..13407f8 100644
--- a/conftool-data/nodes/ulsfo.yaml
+++ b/conftool-data/nodes/ulsfo.yaml
@@ -3,6 +3,12 @@
   cp4012.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4019.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4020.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp4008.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4009.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4010.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4016.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4017.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4018.ulsfo.wmnet: [varnish-fe, nginx]
 cache_text:
   cp4008.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4009.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f5ba5287902c73503fb2b41f4a2f07993fbe986
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ulsfo: add text nodes to mobile cluster - change (operations/puppet)

2016-01-25 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/266230

Change subject: ulsfo: add text nodes to mobile cluster
..

ulsfo: add text nodes to mobile cluster

This patchset adds all text nodes in ulsfo to the mobile cluster for
varnish-fe and nginx.

Bug: T109286
Change-Id: I0f5ba5287902c73503fb2b41f4a2f07993fbe986
---
M conftool-data/nodes/ulsfo.yaml
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/266230/1

diff --git a/conftool-data/nodes/ulsfo.yaml b/conftool-data/nodes/ulsfo.yaml
index 0ccdfd1..13407f8 100644
--- a/conftool-data/nodes/ulsfo.yaml
+++ b/conftool-data/nodes/ulsfo.yaml
@@ -3,6 +3,12 @@
   cp4012.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4019.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4020.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp4008.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4009.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4010.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4016.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4017.ulsfo.wmnet: [varnish-fe, nginx]
+  cp4018.ulsfo.wmnet: [varnish-fe, nginx]
 cache_text:
   cp4008.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp4009.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f5ba5287902c73503fb2b41f4a2f07993fbe986
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] ulsfo: remove varnish-fe, nginx services from mobile cluster - change (operations/puppet)

2016-01-25 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/266253

Change subject: ulsfo: remove varnish-fe,nginx services from mobile cluster
..

ulsfo: remove varnish-fe,nginx services from mobile cluster

Bug: T109286
Change-Id: I102b216c4373ce79aacf173e47fc6740c0147975
---
M conftool-data/nodes/ulsfo.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/53/266253/1

diff --git a/conftool-data/nodes/ulsfo.yaml b/conftool-data/nodes/ulsfo.yaml
index 13407f8..ada72ca 100644
--- a/conftool-data/nodes/ulsfo.yaml
+++ b/conftool-data/nodes/ulsfo.yaml
@@ -1,8 +1,8 @@
 cache_mobile:
-  cp4011.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp4012.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp4019.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp4020.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp4011.ulsfo.wmnet: [varnish-be, varnish-be-rand]
+  cp4012.ulsfo.wmnet: [varnish-be, varnish-be-rand]
+  cp4019.ulsfo.wmnet: [varnish-be, varnish-be-rand]
+  cp4020.ulsfo.wmnet: [varnish-be, varnish-be-rand]
   cp4008.ulsfo.wmnet: [varnish-fe, nginx]
   cp4009.ulsfo.wmnet: [varnish-fe, nginx]
   cp4010.ulsfo.wmnet: [varnish-fe, nginx]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I102b216c4373ce79aacf173e47fc6740c0147975
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] ulsfo: remove varnish-fe, nginx services from mobile cluster - change (operations/puppet)

2016-01-25 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: ulsfo: remove varnish-fe,nginx services from mobile cluster
..


ulsfo: remove varnish-fe,nginx services from mobile cluster

Bug: T109286
Change-Id: I102b216c4373ce79aacf173e47fc6740c0147975
---
M conftool-data/nodes/ulsfo.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/conftool-data/nodes/ulsfo.yaml b/conftool-data/nodes/ulsfo.yaml
index 13407f8..ada72ca 100644
--- a/conftool-data/nodes/ulsfo.yaml
+++ b/conftool-data/nodes/ulsfo.yaml
@@ -1,8 +1,8 @@
 cache_mobile:
-  cp4011.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp4012.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp4019.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp4020.ulsfo.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp4011.ulsfo.wmnet: [varnish-be, varnish-be-rand]
+  cp4012.ulsfo.wmnet: [varnish-be, varnish-be-rand]
+  cp4019.ulsfo.wmnet: [varnish-be, varnish-be-rand]
+  cp4020.ulsfo.wmnet: [varnish-be, varnish-be-rand]
   cp4008.ulsfo.wmnet: [varnish-fe, nginx]
   cp4009.ulsfo.wmnet: [varnish-fe, nginx]
   cp4010.ulsfo.wmnet: [varnish-fe, nginx]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I102b216c4373ce79aacf173e47fc6740c0147975
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] text VCL: delay mobile hostname rewrites - change (operations/puppet)

2016-01-20 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: text VCL: delay mobile hostname rewrites
..


text VCL: delay mobile hostname rewrites

cache_text only (cache_mobile unaffected):
This puts off rewriteing the hostname from mobile->desktop until
we're actually sending a backend request to the applayer from a
tier-one backend varnish.  Previously it was rewritten on
reception at the frontends.  By doing this we avoid the vcl_hash
hack on X-Subdomain and have the cache entries actually
differentiating on the real hostname, which is simpler and saner,
and makes banning of mobile content easier.

Bug: T124166
Change-Id: I6ff7008c88351fcad9d2188764a3202ab2cd80f6
---
M templates/varnish/text-backend.inc.vcl.erb
M templates/varnish/text-common.inc.vcl.erb
M templates/varnish/text-frontend.inc.vcl.erb
3 files changed, 33 insertions(+), 7 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/templates/varnish/text-backend.inc.vcl.erb 
b/templates/varnish/text-backend.inc.vcl.erb
index dfed302..5abc309 100644
--- a/templates/varnish/text-backend.inc.vcl.erb
+++ b/templates/varnish/text-backend.inc.vcl.erb
@@ -47,6 +47,26 @@
 }
 <% end -%>
 
+<% if @site_tier == "one" && scope.function_hiera(["cluster"]) == "cache_text" 
-%>
+sub mobile_hostname_1be_mangle {
+   if (req.http.X-Subdomain) {
+   // Rewrite m.mediawiki.org to mediawiki.org etc
+   if (req.http.host == "m.mediawiki.org") {
+   set bereq.http.host = "www.mediawiki.org";
+   } else if (req.http.host == "m.wikimediafoundation.org") {
+   set bereq.http.host = "wikimediafoundation.org";
+   } else if (req.http.host == "m.wikisource.org") {
+   set bereq.http.host = "wikisource.org";
+   } else if (req.http.host == "m.wikidata.org") {
+   set bereq.http.host = "www.wikidata.org";
+   } else {
+   // Replace .(m|zero)..org by 
..org
+   set bereq.http.host = regsub(req.http.host, 
"^([a-zA-Z0-9-]+)\.(m|zero)\.", "\1.");
+   }
+   }
+}
+<% end -%>
+
 sub vcl_pass {
 <% if @site_tier == "one" -%>
// BITS: legacy bits.wm.o domain support
@@ -54,6 +74,9 @@
call bitscompat_1be_mangle;
return (pass);
}
+<% end -%>
+<% if @site_tier == "one" && scope.function_hiera(["cluster"]) == "cache_text" 
-%>
+   call mobile_hostname_1be_mangle;
 <% end -%>
call restore_cookie;
 }
@@ -66,6 +89,9 @@
return (fetch);
}
 <% end -%>
+<% if @site_tier == "one" && scope.function_hiera(["cluster"]) == "cache_text" 
-%>
+   call mobile_hostname_1be_mangle;
+<% end -%>
call restore_cookie;
 }
 
diff --git a/templates/varnish/text-common.inc.vcl.erb 
b/templates/varnish/text-common.inc.vcl.erb
index b62db40..24c9582 100644
--- a/templates/varnish/text-common.inc.vcl.erb
+++ b/templates/varnish/text-common.inc.vcl.erb
@@ -59,13 +59,6 @@
 sub vcl_hash {
// The cookies below represent mobile preferences that can be set for 
anonymous users.
if (req.http.X-Subdomain) {
-<% if scope.function_hiera(["cluster"]) == "cache_text" -%>
-   // this splits the cache between mobile and desktop variants in 
general
-   // the text-cluster conditional is temporary, to avoid 
effectively wiping the primary cache
-   // on the legacy mobile cluster on deploy
-   hash_data("Mobile-Subdomain");
-<% end -%>
-
// Split the cache for the images-disabled variant of the 
mobile site.
if (req.http.X-Orig-Cookie ~ "(^|;\s*)disableImages=1" || 
req.http.Cookie ~ "(^|;\s*)disableImages=1") {
hash_data("disableImages=1");
diff --git a/templates/varnish/text-frontend.inc.vcl.erb 
b/templates/varnish/text-frontend.inc.vcl.erb
index 78e8604..05b614c 100644
--- a/templates/varnish/text-frontend.inc.vcl.erb
+++ b/templates/varnish/text-frontend.inc.vcl.erb
@@ -183,6 +183,12 @@
call tag_carrier;
}
 
+<% if scope.function_hiera(["cluster"]) == "cache_mobile" -%>
+   // in the text cluster this is now done on tier-one
+   // bereq to the applayer only, but it's preserved for
+   // the mobile cluster here so that we don't
+   // effectively invalidate the whole mobile cache on
+   // cache_mobile machines in the process...
// Rewrite m.mediawiki.org to mediawiki.org etc
if (req.http.host == "m.mediawiki.org") {
set req.http.host = "www.mediawiki.org";
@@ -196,6 +202,7 @@

[MediaWiki-commits] [Gerrit] Limit GCLog file size - change (operations...kafka)

2016-01-25 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/266203

Change subject: Limit GCLog file size
..

Limit GCLog file size

We need to limit the file size of /var/log/kafka/kafkaServer-gc.log
to avoid running out of disk space.

Change-Id: I2b554072649d59dcb5d07761560cb6f4d18a6875
---
M templates/kafka.default.erb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/kafka 
refs/changes/03/266203/1

diff --git a/templates/kafka.default.erb b/templates/kafka.default.erb
index 7fedb5b..f6745c3 100644
--- a/templates/kafka.default.erb
+++ b/templates/kafka.default.erb
@@ -56,4 +56,4 @@
 #KAFKA_HEAP_OPTS="-Xmx1G -Xms1G"
 <% end -%>
 #KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:${KAFKA_CONFIG}/log4j.properties"
-#KAFKA_OPTS=""
+KAFKA_OPTS="-XX:GCLogFileSize=50M"

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b554072649d59dcb5d07761560cb6f4d18a6875
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/kafka
Gerrit-Branch: master
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Limit GCLog file size - change (operations...kafka)

2016-01-25 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Limit GCLog file size
..


Limit GCLog file size

We need to limit the file size of /var/log/kafka/kafkaServer-gc.log
to avoid running out of disk space.

Change-Id: I2b554072649d59dcb5d07761560cb6f4d18a6875
---
M templates/kafka.default.erb
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/templates/kafka.default.erb b/templates/kafka.default.erb
index 7fedb5b..88057b1 100644
--- a/templates/kafka.default.erb
+++ b/templates/kafka.default.erb
@@ -56,4 +56,4 @@
 #KAFKA_HEAP_OPTS="-Xmx1G -Xms1G"
 <% end -%>
 #KAFKA_LOG4J_OPTS="-Dlog4j.configuration=file:${KAFKA_CONFIG}/log4j.properties"
-#KAFKA_OPTS=""
+KAFKA_OPTS="-XX:GCLogFileSize=50M -XX:+UseGCLogFileRotation 
-XX:NumberOfGCLogFiles=5"

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2b554072649d59dcb5d07761560cb6f4d18a6875
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet/kafka
Gerrit-Branch: master
Gerrit-Owner: Ema 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Update kafka submodule - change (operations/puppet)

2016-01-25 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/266209

Change subject: Update kafka submodule
..

Update kafka submodule

See https://gerrit.wikimedia.org/r/#/c/266203/

Change-Id: Ia82e04c6fe7682a4fb9dd7d6034afcc50344acbf
---
M modules/kafka
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/266209/1

diff --git a/modules/kafka b/modules/kafka
index 39e0e7f..fedf86d 16
--- a/modules/kafka
+++ b/modules/kafka
-Subproject commit 39e0e7f745e2ece7ebf996e885085110d36aff4b
+Subproject commit fedf86df295730b9dc681a016b2a6e7e549d60a0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia82e04c6fe7682a4fb9dd7d6034afcc50344acbf
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] Update kafka submodule - change (operations/puppet)

2016-01-25 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: Update kafka submodule
..


Update kafka submodule

See https://gerrit.wikimedia.org/r/#/c/266203/

Change-Id: Ia82e04c6fe7682a4fb9dd7d6034afcc50344acbf
---
M modules/kafka
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Elukey: Looks good to me, but someone else must approve
  Ema: Verified; Looks good to me, approved
  Giuseppe Lavagetto: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/modules/kafka b/modules/kafka
index 39e0e7f..fedf86d 16
--- a/modules/kafka
+++ b/modules/kafka
-Subproject commit 39e0e7f745e2ece7ebf996e885085110d36aff4b
+Subproject commit fedf86df295730b9dc681a016b2a6e7e549d60a0

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia82e04c6fe7682a4fb9dd7d6034afcc50344acbf
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] esams: remove varnish-fe, nginx services from mobile cluster - change (operations/puppet)

2016-01-26 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/266499

Change subject: esams: remove varnish-fe,nginx services from mobile cluster
..

esams: remove varnish-fe,nginx services from mobile cluster

Bug: T109286
Change-Id: I5f58fd5062544382dbf2b1b41b0ae0cd3426985c
---
M conftool-data/nodes/esams.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/266499/1

diff --git a/conftool-data/nodes/esams.yaml b/conftool-data/nodes/esams.yaml
index 16e8400..931597d6 100644
--- a/conftool-data/nodes/esams.yaml
+++ b/conftool-data/nodes/esams.yaml
@@ -1,8 +1,8 @@
 cache_mobile:
-  cp3015.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp3016.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp3017.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp3018.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp3015.esams.wmnet: [varnish-be, varnish-be-rand]
+  cp3016.esams.wmnet: [varnish-be, varnish-be-rand]
+  cp3017.esams.wmnet: [varnish-be, varnish-be-rand]
+  cp3018.esams.wmnet: [varnish-be, varnish-be-rand]
   cp3003.esams.wmnet: [varnish-fe, nginx]
   cp3004.esams.wmnet: [varnish-fe, nginx]
   cp3005.esams.wmnet: [varnish-fe, nginx]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f58fd5062544382dbf2b1b41b0ae0cd3426985c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] esams: remove varnish-fe, nginx services from mobile cluster - change (operations/puppet)

2016-01-26 Thread Ema (Code Review)

Ema has submitted this change and it was merged.

Change subject: esams: remove varnish-fe,nginx services from mobile cluster
..


esams: remove varnish-fe,nginx services from mobile cluster

Bug: T109286
Change-Id: I5f58fd5062544382dbf2b1b41b0ae0cd3426985c
---
M conftool-data/nodes/esams.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved
  BBlack: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/conftool-data/nodes/esams.yaml b/conftool-data/nodes/esams.yaml
index 16e8400..931597d6 100644
--- a/conftool-data/nodes/esams.yaml
+++ b/conftool-data/nodes/esams.yaml
@@ -1,8 +1,8 @@
 cache_mobile:
-  cp3015.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp3016.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp3017.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp3018.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp3015.esams.wmnet: [varnish-be, varnish-be-rand]
+  cp3016.esams.wmnet: [varnish-be, varnish-be-rand]
+  cp3017.esams.wmnet: [varnish-be, varnish-be-rand]
+  cp3018.esams.wmnet: [varnish-be, varnish-be-rand]
   cp3003.esams.wmnet: [varnish-fe, nginx]
   cp3004.esams.wmnet: [varnish-fe, nginx]
   cp3005.esams.wmnet: [varnish-fe, nginx]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5f58fd5062544382dbf2b1b41b0ae0cd3426985c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] eqiad: add text nodes to mobile cluster - change (operations/puppet)

2016-01-26 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/266503

Change subject: eqiad: add text nodes to mobile cluster
..

eqiad: add text nodes to mobile cluster

This patchset adds all text nodes in eqiad to the mobile cluster for
varnish-fe and nginx.

Bug: T109286
Change-Id: I26b4965eb6be62814528ea0c1fd4f8695f7aa83a
---
M conftool-data/nodes/eqiad.yaml
1 file changed, 8 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/266503/1

diff --git a/conftool-data/nodes/eqiad.yaml b/conftool-data/nodes/eqiad.yaml
index a231b88..494b602 100644
--- a/conftool-data/nodes/eqiad.yaml
+++ b/conftool-data/nodes/eqiad.yaml
@@ -236,6 +236,14 @@
   cp1047.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp1059.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp1060.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp1052.eqiad.wmnet: [varnish-fe, nginx]
+  cp1053.eqiad.wmnet: [varnish-fe, nginx]
+  cp1054.eqiad.wmnet: [varnish-fe, nginx]
+  cp1055.eqiad.wmnet: [varnish-fe, nginx]
+  cp1065.eqiad.wmnet: [varnish-fe, nginx]
+  cp1066.eqiad.wmnet: [varnish-fe, nginx]
+  cp1067.eqiad.wmnet: [varnish-fe, nginx]
+  cp1068.eqiad.wmnet: [varnish-fe, nginx]
 cache_upload:
   cp1048.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp1049.eqiad.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I26b4965eb6be62814528ea0c1fd4f8695f7aa83a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] esams: add text nodes to mobile cluster - change (operations/puppet)

2016-01-26 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/266475

Change subject: esams: add text nodes to mobile cluster
..

esams: add text nodes to mobile cluster

This patchset adds all text nodes in esams to the mobile cluster for
varnish-fe and nginx.

Bug: T109286
Change-Id: Ie5467c6810205050d415477a29d7f90722ea5dab
---
M conftool-data/nodes/esams.yaml
1 file changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/266475/1

diff --git a/conftool-data/nodes/esams.yaml b/conftool-data/nodes/esams.yaml
index e0151e4..16e8400 100644
--- a/conftool-data/nodes/esams.yaml
+++ b/conftool-data/nodes/esams.yaml
@@ -3,6 +3,22 @@
   cp3016.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp3017.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp3018.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp3003.esams.wmnet: [varnish-fe, nginx]
+  cp3004.esams.wmnet: [varnish-fe, nginx]
+  cp3005.esams.wmnet: [varnish-fe, nginx]
+  cp3006.esams.wmnet: [varnish-fe, nginx]
+  cp3007.esams.wmnet: [varnish-fe, nginx]
+  cp3008.esams.wmnet: [varnish-fe, nginx]
+  cp3009.esams.wmnet: [varnish-fe, nginx]
+  cp3010.esams.wmnet: [varnish-fe, nginx]
+#  cp3011.esams.wmnet: [varnish-fe, nginx] #disabled, see T92306
+  cp3012.esams.wmnet: [varnish-fe, nginx]
+  cp3013.esams.wmnet: [varnish-fe, nginx]
+  cp3014.esams.wmnet: [varnish-fe, nginx]
+  cp3030.esams.wmnet: [varnish-fe, nginx]
+  cp3031.esams.wmnet: [varnish-fe, nginx]
+  cp3040.esams.wmnet: [varnish-fe, nginx]
+  cp3041.esams.wmnet: [varnish-fe, nginx]
 cache_text:
   cp3003.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp3004.esams.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5467c6810205050d415477a29d7f90722ea5dab
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

[MediaWiki-commits] [Gerrit] codfw: remove varnish-fe, nginx services from mobile cluster - change (operations/puppet)

2016-01-22 Thread Ema (Code Review)

Ema has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/265742

Change subject: codfw: remove varnish-fe,nginx services from mobile cluster
..

codfw: remove varnish-fe,nginx services from mobile cluster

Bug: T109286
Change-Id: I6aa95d9a201a7386809061bfa6e342da4c2ec4ac
---
M conftool-data/nodes/codfw.yaml
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/42/265742/1

diff --git a/conftool-data/nodes/codfw.yaml b/conftool-data/nodes/codfw.yaml
index 9f35798..cd265f8 100644
--- a/conftool-data/nodes/codfw.yaml
+++ b/conftool-data/nodes/codfw.yaml
@@ -204,10 +204,10 @@
   cp2019.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
   cp2023.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
 cache_mobile:
-  cp2003.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp2009.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp2015.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
-  cp2021.codfw.wmnet: [varnish-fe, varnish-be, varnish-be-rand, nginx]
+  cp2003.codfw.wmnet: [varnish-be, varnish-be-rand]
+  cp2009.codfw.wmnet: [varnish-be, varnish-be-rand]
+  cp2015.codfw.wmnet: [varnish-be, varnish-be-rand]
+  cp2021.codfw.wmnet: [varnish-be, varnish-be-rand]
   cp2001.codfw.wmnet: [varnish-fe, nginx]
   cp2004.codfw.wmnet: [varnish-fe, nginx]
   cp2007.codfw.wmnet: [varnish-fe, nginx]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6aa95d9a201a7386809061bfa6e342da4c2ec4ac
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema 

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

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1208 matches

Mail list logo