date:20180115

[MediaWiki-commits] [Gerrit] integration/config[master]: debian-glue: archive *.buildinfo

2018-01-15 Thread Hashar (Code Review)

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

Change subject: debian-glue: archive *.buildinfo
..

debian-glue: archive *.buildinfo

It has a few nice informations and apparently dpkg-buildpackage in sid
includes them in the .changes files.

References:
https://github.com/mika/jenkins-debian-glue/issues/165
https://github.com/mika/jenkins-debian-glue/commit/e6373df6db82389a1a5bfa4017caa9a3efb284d5

Change-Id: I1a33e7e475f497cb59b7d338fa228e810242aeaf
---
M jjb/operations-debs.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/99/404299/1

diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index daf68b8..1984581 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -185,7 +185,7 @@
   #- tap:
   #results: piuparts.tap
   - archive:
-  artifacts: 
'*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,debc.txt,lintian.txt,lintian.xml,piuparts.txt,piuparts.tap'
+  artifacts: 
'*.gz,*.bz2,*.xz,*.deb,*.dsc,*.buildinfo,*.changes,debc.txt,lintian.txt,lintian.xml,piuparts.txt,piuparts.tap'
 
 - job-template:
 !!merge : *job_template_debian_glue

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1a33e7e475f497cb59b7d338fa228e810242aeaf
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: apt: make apt::conf and apt::pin configs happen before remov...

2018-01-15 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404307 )

Change subject: apt: make apt::conf and apt::pin configs happen before removing 
apt.conf
..

apt: make apt::conf and apt::pin configs happen before removing apt.conf

Else, we might end up with a period where packages are installed with an
invalid configuration and can fail to install, or even be installed at
wrong versions.

Change-Id: I321f86d185e642e810e72d21cbcdc964162b6f6e
---
M modules/apt/manifests/init.pp
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index ed35d23..169c92f 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -56,6 +56,8 @@
 ensure => absent,
 notify => Exec['apt-get update'],
 }
+Apt::Conf <| |> -> File['/etc/apt/apt.conf']
+Apt::Pin <| |> -> File['/etc/apt/apt.conf']
 
 if $use_proxy {
 $http_proxy = "http://webproxy.${::site}.wmnet:8080;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I321f86d185e642e810e72d21cbcdc964162b6f6e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::base: run the apt configuration before anything else

2018-01-15 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404305 )

Change subject: profile::base: run the apt configuration before anything else
..

profile::base: run the apt configuration before anything else

To this end, introduce a stage => 'apt-config', that's supposed to
include only the apt class.

Change-Id: I21bf60687864e1a796c72fb293b99350bc09c64f
---
M manifests/realm.pp
M modules/profile/manifests/base.pp
2 files changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/manifests/realm.pp b/manifests/realm.pp
index 1652589..5c6425b 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -22,6 +22,11 @@
 $realm = hiera('realm', 'production')
 }
 
+stage { 'apt-config':
+before => Stage['main']
+}
+
+
 if $realm == 'labs' {
 # Pull the project name from the certname.
 # Labs certs are ...wmflabs
diff --git a/modules/profile/manifests/base.pp 
b/modules/profile/manifests/base.pp
index fbdaa84..51b4ff5 100644
--- a/modules/profile/manifests/base.pp
+++ b/modules/profile/manifests/base.pp
@@ -25,9 +25,12 @@
 $overlayfs = hiera('profile::base::overlayfs', false),
 ) {
 require ::profile::base::certificates
+
+# Apt configuration needs to happen before anything else happens.
 class { '::apt':
 use_proxy => $use_apt_proxy,
 purge_sources => $purge_apt_sources,
+stage => 'apt-config'
 }
 
 file { ['/usr/local/sbin', '/usr/local/share/bash']:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21bf60687864e1a796c72fb293b99350bc09c64f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageTemplates[master]: Fix use of "config_prefix" in extension.json

2018-01-15 Thread Umherirrender (Code Review)

Umherirrender has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404218 )

Change subject: Fix use of "config_prefix" in extension.json
..


Fix use of "config_prefix" in extension.json

Change-Id: I01fedbf010db4be0b856df97f25c3d92ebc96797
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extension.json b/extension.json
index 4e5b23c..76a3d5d 100644
--- a/extension.json
+++ b/extension.json
@@ -47,7 +47,7 @@
"ExtensionMessagesFiles": {
"PageTemplatesAdminAlias": 
"includes/specials/SpecialPageTemplatesAdmin.alias.php"
},
-   "config-prefix": "bsg",
+   "config_prefix": "bsg",
"config": {
"PageTemplatesExcludeNs": {
"value": [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I01fedbf010db4be0b856df97f25c3d92ebc96797
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePageTemplates
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: watch.js: Simplify by using .map()

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404235 )

Change subject: watch.js: Simplify by using .map()
..


watch.js: Simplify by using .map()

Change-Id: Idd0b4c67d05e0b300b347f2a3a6890c1f2ec88ad
---
M resources/src/mediawiki/page/watch.js
1 file changed, 2 insertions(+), 4 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/resources/src/mediawiki/page/watch.js 
b/resources/src/mediawiki/page/watch.js
index 5b55bb2..5b41876 100644
--- a/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@ -79,7 +79,7 @@
 * @return {string} The extracted action, defaults to 'view'
 */
function mwUriGetAction( url ) {
-   var action, actionPaths, key, i, m, parts;
+   var action, actionPaths, key, m, parts;
 
// TODO: Does MediaWiki give action path or query param
// precedence? If the former, move this to the bottom
@@ -92,9 +92,7 @@
for ( key in actionPaths ) {
if ( actionPaths.hasOwnProperty( key ) ) {
parts = actionPaths[ key ].split( '$1' );
-   for ( i = 0; i < parts.length; i++ ) {
-   parts[ i ] = mw.RegExp.escape( parts[ i 
] );
-   }
+   parts = parts.map( mw.RegExp.escape );
m = new RegExp( parts.join( '(.+)' ) ).exec( 
url );
if ( m && m[ 1 ] ) {
return key;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd0b4c67d05e0b300b347f2a3a6890c1f2ec88ad
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Bartosz Dziewoński 
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] integration/config[master]: Run qunit-selenium Jenkins job for ORES

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403688 )

Change subject: Run qunit-selenium Jenkins job for ORES
..


Run qunit-selenium Jenkins job for ORES

Only in experimental pipeline for now.

Bug: T184451
Change-Id: I0b5fc781dadbb33d61739e017a47045383151b7b
---
M zuul/layout.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Zfilipin: Looks good to me, approved
  jenkins-bot: Verified
  Awight: Looks good to me, but someone else must approve



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 005a664..1b9b1d5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -4132,6 +4132,8 @@
   - name: mwgate-npm
 postmerge:
   - mwext-phpunit-coverage-publish
+experimental:
+  - mediawiki-core-qunit-selenium-jessie
 
   - name: mediawiki/extensions/PageAssessments
 template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b5fc781dadbb33d61739e017a47045383151b7b
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Etonkovidova 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: allow override of fs-related node-exporter options

2018-01-15 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404324 )

Change subject: prometheus: allow override of fs-related node-exporter options
..

prometheus: allow override of fs-related node-exporter options

Bug: T184469
Change-Id: Ic756cb208a10982dba1197d80af1ed50554613bc
---
M modules/prometheus/manifests/node_exporter.pp
M modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
2 files changed, 3 insertions(+), 1 deletion(-)


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

diff --git a/modules/prometheus/manifests/node_exporter.pp 
b/modules/prometheus/manifests/node_exporter.pp
index 541e61f..adc9c75 100644
--- a/modules/prometheus/manifests/node_exporter.pp
+++ b/modules/prometheus/manifests/node_exporter.pp
@@ -25,6 +25,8 @@
 
 class prometheus::node_exporter (
 $ignored_devices  = "^(ram|loop|fd)d+\$",
+$ignored_fs_types  = "^(sys|proc|auto)fs$",
+$ignored_mount_points  = "^/(sys|proc|dev)($|/)",
 $collectors_extra = [],
 $web_listen_address = ':9100',
 ) {
diff --git 
a/modules/prometheus/templates/etc/default/prometheus-node-exporter.erb 
b/modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
index 5353a08..2358c1a 100644
--- a/modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
+++ b/modules/prometheus/templates/etc/default/prometheus-node-exporter.erb
@@ -1 +1 @@
-ARGS='-collector.diskstats.ignored-devices=<%= @ignored_devices %> 
-collector.textfile.directory=<%= @textfile_directory %> 
-collectors.enabled=<%= @collectors_enabled %> -web.listen-address=<%= 
@web_listen_address %>'
+ARGS='-collector.diskstats.ignored-devices=<%= @ignored_devices %> 
-collector.filesystem.ignored-fs-types <%= @ignored_fs_types %> 
-collector.filesystem.ignored-mount-points <%= @ignored_mount_points %> 
-collector.textfile.directory=<%= @textfile_directory %> 
-collectors.enabled=<%= @collectors_enabled %> -web.listen-address=<%= 
@web_listen_address %>'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic756cb208a10982dba1197d80af1ed50554613bc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: debian-glue: archive *.buildinfo

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404299 )

Change subject: debian-glue: archive *.buildinfo
..


debian-glue: archive *.buildinfo

It has a few nice informations and apparently dpkg-buildpackage in sid
includes them in the .changes files.

References:
https://github.com/mika/jenkins-debian-glue/issues/165
https://github.com/mika/jenkins-debian-glue/commit/e6373df6db82389a1a5bfa4017caa9a3efb284d5

Change-Id: I1a33e7e475f497cb59b7d338fa228e810242aeaf
---
M jjb/operations-debs.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/jjb/operations-debs.yaml b/jjb/operations-debs.yaml
index daf68b8..1984581 100644
--- a/jjb/operations-debs.yaml
+++ b/jjb/operations-debs.yaml
@@ -185,7 +185,7 @@
   #- tap:
   #results: piuparts.tap
   - archive:
-  artifacts: 
'*.gz,*.bz2,*.xz,*.deb,*.dsc,*.changes,debc.txt,lintian.txt,lintian.xml,piuparts.txt,piuparts.tap'
+  artifacts: 
'*.gz,*.bz2,*.xz,*.deb,*.dsc,*.buildinfo,*.changes,debc.txt,lintian.txt,lintian.xml,piuparts.txt,piuparts.tap'
 
 - job-template:
 !!merge : *job_template_debian_glue

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a33e7e475f497cb59b7d338fa228e810242aeaf
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] eventlogging[master]: [WIP] Move EventCapsule into codebase

2018-01-15 Thread Mforns (Code Review)

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

Change subject: [WIP] Move EventCapsule into codebase
..

[WIP] Move EventCapsule into codebase

Bug: T179836
Change-Id: I8a932e7f5fa7a511778112e3d9fc1fd75b027811
---
A config/implicit_schemas/EventCapsule/1
M eventlogging/schema.py
2 files changed, 73 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/eventlogging 
refs/changes/03/404303/1

diff --git a/config/implicit_schemas/EventCapsule/1 
b/config/implicit_schemas/EventCapsule/1
new file mode 100644
index 000..e39e2c0
--- /dev/null
+++ b/config/implicit_schemas/EventCapsule/1
@@ -0,0 +1,48 @@
+description: A wrapper around event objects that encodes generic metadata
+properties:
+  event:
+type: object
+description: The encapsulated event object
+required: true
+  wiki:
+type: string
+description: "$wgDBName (for example: 'enwiki')"
+required: true
+  webHost:
+type: string
+description: "Request host. 'window.location.hostname' on client-side 
events; $_SERVER['HTTP_HOST'] on server."
+  schema:
+type: string
+description: Title of event schema
+required: true
+  revision:
+type: integer
+description: Revision ID of event schema
+required: true
+  topic:
+type: string
+description: The queue topic name this event belongs in
+  recvFrom:
+type: string
+description: Hostname of server emitting the log line
+required: true
+  timestamp:
+type: number
+description: 'UTC unix epoch timestamp of event. Optional. Should be the 
same as dt.  Exists for backwards compatibility.  See: 
https://phabricator.wikimedia.org/T179625)'
+  dt:
+type: string
+description: 'UTC ISO-8601 timestamp of event'
+format: 'date-time'
+  seqId:
+type: integer
+description: Udp2log sequence ID
+  uuid:
+type: string
+description: Unique event identifier
+format: 'uuid5-hex'
+required: true
+  userAgent:
+type: any
+description: 'User Agent from HTTP request. Either a parsed object, parsed 
JSON string, or original User-Agent string.'
+required: false
+additionalProperties: false
diff --git a/eventlogging/schema.py b/eventlogging/schema.py
index 06716a0..bd43a2c 100644
--- a/eventlogging/schema.py
+++ b/eventlogging/schema.py
@@ -64,7 +64,20 @@
 SCHEMA_URI_FORMAT = '%s/%s'
 
 # SCID of the metadata object which wraps each capsule-style event.
-CAPSULE_SCID = ('EventCapsule', 17418976)
+# Since January 2018 this is hardcoded as an implicit schema as opposed
+# to be stored in https://meta.wikimedia.org/wiki/Schema:EventCapsule.
+# See: https://phabricator.wikimedia.org/T179836
+CAPSULE_SCID = ('EventCapsule', 1)
+
+# Directory where EventLogging implicit schemas are stored.
+# Implicit schemas are hardcoded into EventLogging's codebase,
+# because they are highly coupled with how the codebase works,
+# and it doesn't make sense to have them in meta.wikimedia.org.
+# See: https://phabricator.wikimedia.org/T179836
+IMPLICIT_SCHEMAS_PATH = os.path.join(
+os.path.dirname(__file__),
+'../config/implicit_schemas'
+)
 
 # TODO: Make new meta style EventError on meta.
 ERROR_SCID = ('EventError', 14035058)
@@ -85,6 +98,7 @@
 """
 schema_cache.clear()
 schema_validator_cache.clear()
+load_implicit_schemas()
 if schemas_path:
 load_local_schemas(schemas_path=schemas_path)
 
@@ -240,6 +254,16 @@
 return schema
 
 
+def load_implicit_schemas():
+"""Load implicit schemas (like EventCapsule)."""
+capsule_uri = 'file://' + os.path.join(
+IMPLICIT_SCHEMAS_PATH,
+schema_uri_from_scid(CAPSULE_SCID)
+)
+capsule_schema = url_get_schema(capsule_uri)
+cache_schema(CAPSULE_SCID, capsule_schema)
+
+
 def load_local_schemas(schemas_path):
 """
 Walks schemas_path looking for files that mach

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a932e7f5fa7a511778112e3d9fc1fd75b027811
Gerrit-PatchSet: 1
Gerrit-Project: eventlogging
Gerrit-Branch: master
Gerrit-Owner: Mforns 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::base: configure apt before installing any package

2018-01-15 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404304 )

Change subject: profile::base: configure apt before installing any package
..

profile::base: configure apt before installing any package

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/04/404304/1

diff --git a/modules/profile/manifests/base.pp 
b/modules/profile/manifests/base.pp
index fbdaa84..66c8123 100644
--- a/modules/profile/manifests/base.pp
+++ b/modules/profile/manifests/base.pp
@@ -29,6 +29,8 @@
 use_proxy => $use_apt_proxy,
 purge_sources => $purge_apt_sources,
 }
+# Class apt must be applied before any package is added.
+Class['apt'] -> Package <| |>
 
 file { ['/usr/local/sbin', '/usr/local/share/bash']:
 ensure => directory,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia05fac12eac6b5e25ff8f90dc15d1a345cccfced
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: grafana: Hieraize parameters

2018-01-15 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404309 )

Change subject: grafana: Hieraize parameters
..

grafana: Hieraize parameters

Allow the parameters in the profile::grafana class to be looked up using
explicit hiera calls

Bug: T170150
Change-Id: Ic9180f45ec19e81ab1236208a47b7622458fdea0
---
M modules/profile/manifests/grafana.pp
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/404309/1

diff --git a/modules/profile/manifests/grafana.pp 
b/modules/profile/manifests/grafana.pp
index b1e480e..0de22da 100644
--- a/modules/profile/manifests/grafana.pp
+++ b/modules/profile/manifests/grafana.pp
@@ -3,12 +3,12 @@
 # Grafana is a dashboarding webapp for Graphite.
 #
 class profile::grafana (
-$readonly_domain,
-$admin_domain,
-$secret_key,
-$admin_password,
-$ldap_editor_description,
-$ldap_editor_groups,
+$readonly_domain=hiera('profile::grafana::readonly_domain'),
+$admin_domain=hiera('profile::grafana::admin_domain'),
+$secret_key=hiera('profile::grafana::secret_key'),
+$admin_password=hiera('profile::grafana::admin_password'),
+
$ldap_editor_description=hiera('profile::grafana::ldap_editor_description'),
+$ldap_editor_groups=hiera('profile::grafana::ldap_edit_groups'),
 ) {
 include ::apache::mod::authnz_ldap
 include ::apache::mod::headers

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic9180f45ec19e81ab1236208a47b7622458fdea0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Move role::grafana::base to profile::grafana

2018-01-15 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404308 )

Change subject: Move role::grafana::base to profile::grafana
..

Move role::grafana::base to profile::grafana

Continue the migration to profiles for grafana. While production is
partially migrated already it uses a counter pattern. We also have
non-hierized distintions between labs/production. Start by moving the
base role to a profile

Bug: T170150
Change-Id: I68df3eadc4b95848e52356ef4ad7a49735e40e07
---
R modules/profile/manifests/grafana.pp
M modules/profile/manifests/grafana/production.pp
M modules/role/manifests/grafana/labs.pp
3 files changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/404308/1

diff --git a/modules/role/manifests/grafana/base.pp 
b/modules/profile/manifests/grafana.pp
similarity index 97%
rename from modules/role/manifests/grafana/base.pp
rename to modules/profile/manifests/grafana.pp
index 4606a5e..b1e480e 100644
--- a/modules/role/manifests/grafana/base.pp
+++ b/modules/profile/manifests/grafana.pp
@@ -1,9 +1,8 @@
-# == Class: role::grafana::base
+# == Class: profile::grafana
 #
 # Grafana is a dashboarding webapp for Graphite.
-# This is a base role that should not be applied by itself
 #
-class role::grafana::base(
+class profile::grafana (
 $readonly_domain,
 $admin_domain,
 $secret_key,
diff --git a/modules/profile/manifests/grafana/production.pp 
b/modules/profile/manifests/grafana/production.pp
index 1386ed8..b3cc1ce 100644
--- a/modules/profile/manifests/grafana/production.pp
+++ b/modules/profile/manifests/grafana/production.pp
@@ -6,7 +6,7 @@
 class profile::grafana::production {
 include ::passwords::grafana::production
 
-class { '::role::grafana::base':
+class { '::profile::grafana':
 readonly_domain => 'grafana.wikimedia.org',
 admin_domain=> 'grafana-admin.wikimedia.org',
 secret_key  => $passwords::grafana::production::secret_key,
diff --git a/modules/role/manifests/grafana/labs.pp 
b/modules/role/manifests/grafana/labs.pp
index 03484e8..0545eff 100644
--- a/modules/role/manifests/grafana/labs.pp
+++ b/modules/role/manifests/grafana/labs.pp
@@ -6,7 +6,7 @@
 class role::grafana::labs {
 include ::passwords::grafana::labs
 
-class { '::role::grafana::base':
+class { '::profile::grafana':
 readonly_domain => 'grafana-labs.wikimedia.org',
 admin_domain=> 'grafana-labs-admin.wikimedia.org',
 secret_key  => $passwords::grafana::labs::secret_key,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68df3eadc4b95848e52356ef4ad7a49735e40e07
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] mediawiki...ApprovedRevs[master]: Error when displaying a blank page

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404167 )

Change subject: Error when displaying a blank page
..


Error when displaying a blank page

When the content is set to blank for unapproved revisions, an error
was displayed instead since MediaWiki 1.31-alpha.

Bug: T184877
Change-Id: Idb16ca46f3a1ee7dd32c3925d9a985d0ba8193a3
---
M ApprovedRevs.hooks.php
1 file changed, 12 insertions(+), 9 deletions(-)

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



diff --git a/ApprovedRevs.hooks.php b/ApprovedRevs.hooks.php
index 6d35378..d0f5c50 100644
--- a/ApprovedRevs.hooks.php
+++ b/ApprovedRevs.hooks.php
@@ -203,7 +203,14 @@
return true;
}
 
-   public static function showBlankIfUnapproved( &$article, &$content ) {
+   /**
+* Hook: ArticleAfterFetchContentObject
+*
+* @param Article $article
+* @param Content $content
+* @return true
+*/
+   public static function showBlankIfUnapproved( &$article, Content 
&$content ) {
global $egApprovedRevsBlankIfUnapproved;
if ( ! $egApprovedRevsBlankIfUnapproved ) {
return true;
@@ -236,13 +243,9 @@
ApprovedRevs::addCSS();
 
// Set the content to blank.
-   // There's possibly a bug in MW 1.28, where the second argument
-   // (called from the hook 'ArticleAfterFetchContentObject') is
-   // sometimes (or always?) a string, instead of a Content object.
-   // We'll just get around it here with a check. (In theory, 
$content
-   // could also be null, so this check is a good idea anyway.)
-   if ( is_object( $content ) ) {
-   $content->mText = '';
+   if( $content instanceof TextContent ) {
+   $contentClass = get_class( $content );
+   $content = new $contentClass( '' );
} else {
$content = '';
}
@@ -950,4 +953,4 @@
$qp['SpecialApprovedRevsPage'] = 'ApprovedRevs';
return true;
}
-}
\ No newline at end of file
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb16ca46f3a1ee7dd32c3925d9a985d0ba8193a3
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/ApprovedRevs
Gerrit-Branch: master
Gerrit-Owner: Seb35 
Gerrit-Reviewer: Seb35 
Gerrit-Reviewer: Yaron Koren 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Add $statuses parameter to ResultsBuilder::getResults

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403966 )

Change subject: Add $statuses parameter to ResultsBuilder::getResults
..


Add $statuses parameter to ResultsBuilder::getResults

This parameter filters the check results represented in the final result
to only those listed in the $statuses. CheckingResultsBuilder implements
this filtering, and CachingResultsBuilder caches only those results
where the $statuses are exactly those three statuses which are also
displayed in the gadget.

For this commit, CheckConstraints passes the list of all statuses to
ResultsBuilder::getResults(). The next commit will add a dedicated API
parameter instead which CheckConstraints just passes through.

Bug: T183927
Change-Id: I3ff5f8d6b0a16a4aa2417b0f1e03b8634376a6dd
---
M src/Api/CachingResultsBuilder.php
M src/Api/CheckConstraints.php
M src/Api/CheckingResultsBuilder.php
M src/Api/ResultsBuilder.php
M tests/phpunit/Api/CachingResultsBuilderTest.php
M tests/phpunit/Api/CheckingResultsBuilderTest.php
6 files changed, 292 insertions(+), 38 deletions(-)

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



diff --git a/src/Api/CachingResultsBuilder.php 
b/src/Api/CachingResultsBuilder.php
index 00b788a..fc98fc6 100644
--- a/src/Api/CachingResultsBuilder.php
+++ b/src/Api/CachingResultsBuilder.php
@@ -11,6 +11,7 @@
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Cache\CachingMetadata;
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Cache\DependencyMetadata;
 use WikibaseQuality\ConstraintReport\ConstraintCheck\Cache\Metadata;
+use WikibaseQuality\ConstraintReport\ConstraintCheck\Result\CheckResult;
 
 /**
  * A wrapper around another ResultsBuilder that caches results in a 
ResultsCache.
@@ -76,6 +77,15 @@
private $microtime = 'microtime';
 
/**
+* TODO: In PHP 5.6, make this a public class constant instead,
+* and also use it in CheckConstraints::getAllowedParams()
+* and in some of the tests.
+*
+* @var string[]
+*/
+   private $cachedStatuses;
+
+   /**
 * @param ResultsBuilder $resultsBuilder The ResultsBuilder that cache 
misses are delegated to.
 * @param ResultsCache $cache The cache where results can be stored.
 * @param WikiPageEntityMetaDataAccessor 
$wikiPageEntityMetaDataAccessor Used to get the latest revision ID.
@@ -101,22 +111,30 @@
$this->ttlInSeconds = $ttlInSeconds;
$this->possiblyStaleConstraintTypes = 
$possiblyStaleConstraintTypes;
$this->dataFactory = $dataFactory;
+
+   $this->cachedStatuses = [
+   CheckResult::STATUS_VIOLATION,
+   CheckResult::STATUS_WARNING,
+   CheckResult::STATUS_BAD_PARAMETERS,
+   ];
}
 
/**
 * @param EntityId[] $entityIds
 * @param string[] $claimIds
 * @param string[]|null $constraintIds
+* @param string[] $statuses
 * @return CachedCheckConstraintsResponse
 */
public function getResults(
array $entityIds,
array $claimIds,
-   array $constraintIds = null
+   array $constraintIds = null,
+   array $statuses
) {
$results = [];
$metadatas = [];
-   if ( $this->canUseStoredResults( $entityIds, $claimIds, 
$constraintIds ) ) {
+   if ( $this->canUseStoredResults( $entityIds, $claimIds, 
$constraintIds, $statuses ) ) {
$storedEntityIds = [];
foreach ( $entityIds as $entityId ) {
$storedResults = $this->getStoredResults( 
$entityId );
@@ -136,7 +154,7 @@

'wikibase.quality.constraints.cache.entity.miss',
count( $entityIds )
);
-   $response = $this->getAndStoreResults( $entityIds, 
$claimIds, $constraintIds );
+   $response = $this->getAndStoreResults( $entityIds, 
$claimIds, $constraintIds, $statuses );
$results += $response->getArray();
$metadatas[] = $response->getMetadata();
}
@@ -147,37 +165,58 @@
}
 
/**
-* We can only use cached constraint results if full constraint check 
results were requested:
+* We can only use cached constraint results
+* if exactly the problematic results of a full constraint check were 
requested:
 * constraint checks for the full entity (not just individual 
statements),
-* and without restricting the set of constraints to check.
+* without restricting the set of constraints to check,
+* and with exactly the 'violation', 'warning' and

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Use the $context object passed to the ArticleFromTitle hook ...

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404271 )

Change subject: Use the $context object passed to the ArticleFromTitle hook 
handler to avoid fatals
..


Use the $context object passed to the ArticleFromTitle hook handler to avoid 
fatals

Follow-up to I3501ebb7a562b87c12f3ad5c4a87883ed6c04701

Change-Id: I59d7676a7cb03518c79db26dafdc2e19e8f9facb
---
M UserProfile/UserProfileHooks.php
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/UserProfile/UserProfileHooks.php b/UserProfile/UserProfileHooks.php
index 173983b..1dc6f26 100644
--- a/UserProfile/UserProfileHooks.php
+++ b/UserProfile/UserProfileHooks.php
@@ -43,10 +43,9 @@
 * @param WikiPage|Article &$article
 * @return bool
 */
-   public static function onArticleFromTitle( &$title, &$article ) {
+   public static function onArticleFromTitle( &$title, &$article, $context 
) {
global $wgHooks, $wgUserPageChoice;
 
-   $context = $article->getContext();
$out = $context->getOutput();
$request = $context->getRequest();
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I59d7676a7cb03518c79db26dafdc2e19e8f9facb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SocialProfile
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix 
Gerrit-Reviewer: Lewis Cawte 
Gerrit-Reviewer: SamanthaNguyen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: add #wikimedia-ve to wikibugs

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403766 )

Change subject: add #wikimedia-ve to wikibugs
..


add #wikimedia-ve to wikibugs


Bug: T160973
Change-Id: I35941c6864de94379e61daab9b840cb290b5001c
---
M channels.yaml
1 file changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/channels.yaml b/channels.yaml
index 4e70bd1..8d42947 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -145,6 +145,9 @@
 - MediaWiki-extensions-Graph-VE
 - Editing-team
 
+"#wikimedia-ve":
+- Wikimedia-Venezuela
+
 "#wikimedia-editing":
 - Contributors-Team
 - Blocked-on-Editing

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I35941c6864de94379e61daab9b840cb290b5001c
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: Zppix 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] analytics/wikistats2[master]: Add documentation links to each metric

2018-01-15 Thread Fdans (Code Review)

Fdans has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/402466 )

Change subject: Add documentation links to each metric
..


Add documentation links to each metric

As part of this, a new landing page has been created at
https://meta.wikimedia.org/wiki/Research:Wikistats_metrics and sub-pages
that define each metric were linked from each metric configuration.
These pages should be improved going forward, but this change fixes the
more immediate problem that right now metrics don't link anywhere.

Bug: T183188
Change-Id: Ib580427b341b104b2f47289b41a19b2dd3593fa6
---
M src/components/detail/GraphPanel.vue
M src/config/metrics/content.js
M src/config/metrics/contributing.js
M src/config/metrics/metricSchema.js
M src/config/metrics/reading.js
5 files changed, 30 insertions(+), 17 deletions(-)

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



diff --git a/src/components/detail/GraphPanel.vue 
b/src/components/detail/GraphPanel.vue
index 520077e..375276b 100644
--- a/src/components/detail/GraphPanel.vue
+++ b/src/components/detail/GraphPanel.vue
@@ -3,7 +3,8 @@
 
 
 
-
+
 {{graphModel.config.fullName || 'No data yet... '}}
 
 {{granularity}}
@@ -51,7 +52,12 @@
 
 {{changeOverRange}}% over this time range.
 
-{{graphModel.config.description}}. More info about this 
metric.
+{{graphModel.config.description}}.
+
+More info about this metric.
+
+
 
 
 
diff --git a/src/config/metrics/content.js b/src/config/metrics/content.js
index b4ec096..1631cef 100644
--- a/src/config/metrics/content.js
+++ b/src/config/metrics/content.js
@@ -1,8 +1,9 @@
 module.exports = {
 'absolute-bytes': {
 fullName: 'Absolute bytes diff',
-description: 'Absolute sum of all diff bytes in a project',
-question: 'How many bytes have been changed?',
+description: 'The sum of the absolute differences in bytes made by 
each edit (or revision), including edits on redirects. In other words, counting 
negative differences as positive',
+question: 'What are the total number of bytes added and removed?',
+infoUrl: 
'https://meta.wikimedia.org/wiki/Research:Wikistats_metrics/Bytes#Absolute_Bytes_Difference',
 defaults: {
 unique: {
 project: ['all-projects'],
@@ -41,8 +42,9 @@
 },
 'edited-pages': {
 fullName: 'Edited pages',
-description: 'Number of pages edited',
+description: 'The number of pages edited, excluding redirect pages',
 question: 'How many pages are edited?',
+infoUrl: 
'https://meta.wikimedia.org/wiki/Research:Wikistats_metrics/Edited_pages',
 defaults: {
 unique: {
 project: ['all-projects'],
@@ -90,8 +92,9 @@
 },
 'net-bytes': {
 fullName: 'Net bytes difference',
-description: 'Net difference between current byte size of a project 
and last period\'s',
-question: 'How did the size in bytes change since last period?',
+description: 'The sum of the differences in bytes made by each edit 
(or revision), including edits on redirects',
+question: 'How did the overall size in bytes change since last 
period?',
+infoUrl: 
'https://meta.wikimedia.org/wiki/Research:Wikistats_metrics/Bytes#Net_Bytes_Difference',
 defaults: {
 unique: {
 project: ['all-projects'],
diff --git a/src/config/metrics/contributing.js 
b/src/config/metrics/contributing.js
index 7308dea..290d339 100644
--- a/src/config/metrics/contributing.js
+++ b/src/config/metrics/contributing.js
@@ -2,8 +2,9 @@
 'editors': {
 disabled: true,
 fullName: 'Editors',
-description: 'Number of editors at a time period.',
+description: 'The count of editors with one or more edits, including 
on redirect pages',
 question: 'How many editors are there?',
+infoUrl: 
'https://meta.wikimedia.org/wiki/Research:Wikistats_metrics/Editors',
 defaults: {
 unique: {
 project: ['all-projects'],
@@ -51,8 +52,9 @@
 },
 'edits': {
 fullName: 'Edits',
-description: 'Number of wiki edits in a time period',
+description: 'The count of edits (or revisions), including edits on 
redirects',
 question: 'How many edits have been made?',
+infoUrl: 
'https://meta.wikimedia.org/wiki/Research:Wikistats_metrics/Edits',
 defaults: {
 unique: {
 project: ['all-projects'],
@@ -91,8 +93,9 @@
 'new-pages': {
 disabled: true,
 fullName: 'New pages',
-

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Move db2050 socket away from /tmp

2018-01-15 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Move db2050 socket away from /tmp
..

mariadb: Move db2050 socket away from /tmp

Bug: T148507
Change-Id: I688daf2e327ca54393c88038340da02c6b6f9237
---
M hieradata/hosts/db2050.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


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

diff --git a/hieradata/hosts/db2050.yaml b/hieradata/hosts/db2050.yaml
index 42ef9b8..654805a 100644
--- a/hieradata/hosts/db2050.yaml
+++ b/hieradata/hosts/db2050.yaml
@@ -1,2 +1 @@
 mariadb::shard: 's3'
-mariadb::socket: '/tmp/mysql.sock'

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1089 and db1067

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404306 )

Change subject: db-eqiad.php: Depool db1089 and db1067
..


db-eqiad.php: Depool db1089 and db1067

Fixing data drifts

Bug: T162807
Change-Id: Ieb9a1581b10d1fbbebafab45ea5d0720e2e73243
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index ce25a7a..63932c3 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -104,13 +104,13 @@
 'sectionLoads' => [
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
-   'db1067' => 0,   # D1 2.8TB 160GB, old master
+   # 'db1067' => 0,   # D1 2.8TB 160GB, old master # T162807
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
'db1073' => 50,  # B3 2.8TB 160GB, api
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
-   'db1089' => 500, # C3 3.6TB 512GB
+   # 'db1089' => 500, # C3 3.6TB 512GB # T162807
'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieb9a1581b10d1fbbebafab45ea5d0720e2e73243
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs/private[master]: Deprecate passwords::grafana::labs

2018-01-15 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404311 )

Change subject: Deprecate passwords::grafana::labs
..

Deprecate passwords::grafana::labs

Bug: T170150
Change-Id: Iad7cdef38f62da19b59eb7570c9f7bc1bc7d8fca
---
A hieradata/role/common/labs/monitoring.yaml
M modules/passwords/manifests/init.pp
2 files changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/11/404311/1

diff --git a/hieradata/role/common/labs/monitoring.yaml 
b/hieradata/role/common/labs/monitoring.yaml
new file mode 100644
index 000..eef1fde
--- /dev/null
+++ b/hieradata/role/common/labs/monitoring.yaml
@@ -0,0 +1,2 @@
+profile::grafana::secret_key: ab
+profile::grafana::admin_password: b
diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 584dafa..2b4dbc8 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -408,6 +408,7 @@
 $admin_password = ''
 }
 
+# DEPRECATE
 class passwords::grafana::labs {
 $secret_key = 'ab'
 $admin_password = 'b'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad7cdef38f62da19b59eb7570c9f7bc1bc7d8fca
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Switchover s3 codfw master from db2018 to db2036

2018-01-15 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Switchover s3 codfw master from db2018 to db2036
..

mariadb: Switchover s3 codfw master from db2018 to db2036

Bug: T176243
Change-Id: Ie17808d10ea2d525cfa67c0aeabaca535e08bcb3
---
M wmf-config/db-codfw.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/10/404310/1

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 42e021e..26ac6ea 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -128,8 +128,8 @@
'db2091:3312' => 1, # A8 3.3TB 512GB # rc, log: s2 and s4
],
/* s3 */ 'DEFAULT' => [
-   'db2018'  => 0,   # B6 2.9TB  96GB, master
-   'db2036'  => 50,  # C6 2.9TB 160GB
+   'db2036'  => 0,   # C6 2.9TB 160GB, master
+   # 'db2018'  => 0,   # B6 2.9TB  96GB, old master
'db2043'  => 50,  # C6 2.9TB 160GB, dump (inactive), vslow
'db2050'  => 150, # C6 2.9TB 160GB
'db2057'  => 400, # D6 3.3TB 160GB

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie17808d10ea2d525cfa67c0aeabaca535e08bcb3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: WIP: grafana: Enable grafana's LDAP

2018-01-15 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404321 )

Change subject: WIP: grafana: Enable grafana's LDAP
..

WIP: grafana: Enable grafana's LDAP

Disable the proxy auth done by apache and enable grafana's builtin LDAP

This is still missing the ldap.toml config file

Bug: T170150
Change-Id: Ie0c92eabfa743be4dab09e603b5af272d9270ee0
---
M hieradata/role/common/webserver_misc_apps.yaml
1 file changed, 10 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/21/404321/1

diff --git a/hieradata/role/common/webserver_misc_apps.yaml 
b/hieradata/role/common/webserver_misc_apps.yaml
index 859e345..bd0c617 100644
--- a/hieradata/role/common/webserver_misc_apps.yaml
+++ b/hieradata/role/common/webserver_misc_apps.yaml
@@ -15,6 +15,16 @@
   - cn=nda,ou=groups,dc=wikimedia,dc=org
   - cn=wmf,ou=groups,dc=wikimedia,dc=org
   - cn=grafana-admin,ou=groups,dc=wikimedia,dc=org
+profile::grafana::config:
+  auth.proxy:
+enabled: false
+  auth.ldap:
+enabled: true
+allow_sign_up: true
+config_file: ADDME # TO BE ADDED
+  auth.anonymous:
+enabled: true
+org_name: Wikimedia
 # In private repo
 #profile::grafana::secret_key:
 #profile::grafana::admin_password:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0c92eabfa743be4dab09e603b5af272d9270ee0
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Run qunit-selenium job for Echo

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403646 )

Change subject: Run qunit-selenium job for Echo
..


Run qunit-selenium job for Echo

The job runs in test, gate-and-submit and gate-and-submit-swat pipelines. It is 
removed from experimental pipeline.

Bug: T171848
Change-Id: I143a91a3938db00e35866ab3446974a35af285d5
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 2 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1b9b1d5..3a4cbdf 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3363,10 +3363,9 @@
   - name: extension-gate
   - name: extension-unittests-generic
   - name: extension-qunit-generic
+  - name: mediawiki-core-qunit-selenium-jessie
   - name: mwext-ruby-jessie
   - name: mwgate-npm
-experimental:
-  - mediawiki-core-qunit-selenium-jessie
 
   - name: mediawiki/extensions/EditAccount
 template:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I143a91a3938db00e35866ab3446974a35af285d5
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Zfilipin 
Gerrit-Reviewer: Etonkovidova 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Move db2043 socket away from /tmp

2018-01-15 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Move db2043 socket away from /tmp
..

mariadb: Move db2043 socket away from /tmp

Bug: T148507
Change-Id: I7c8e1c7d9344f360ac89494cb2691f7c31e554ff
---
M hieradata/hosts/db2043.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/404301/1

diff --git a/hieradata/hosts/db2043.yaml b/hieradata/hosts/db2043.yaml
index 42ef9b8..654805a 100644
--- a/hieradata/hosts/db2043.yaml
+++ b/hieradata/hosts/db2043.yaml
@@ -1,2 +1 @@
 mariadb::shard: 's3'
-mariadb::socket: '/tmp/mysql.sock'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...CommonsMetadata[master]: Create tracking category for 3D uploads lacking {{3dpatent}}

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/397825 )

Change subject: Create tracking category for 3D uploads lacking {{3dpatent}}
..


Create tracking category for 3D uploads lacking {{3dpatent}}

Bug: T182684
Change-Id: I03dfa614f12a71b63c76fd22e41cb28bf9345250
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M src/DataCollector.php
M src/HookHandler.php
M tests/phpunit/DataCollectorTest.php
M tests/phpunit/HookHandlerTest.php
M tests/phpunit/ParserTestHelper.php
8 files changed, 85 insertions(+), 23 deletions(-)

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



diff --git a/extension.json b/extension.json
index 63e9062..51b6457 100644
--- a/extension.json
+++ b/extension.json
@@ -35,7 +35,8 @@
"commonsmetadata-trackingcategory-no-license",
"commonsmetadata-trackingcategory-no-description",
"commonsmetadata-trackingcategory-no-author",
-   "commonsmetadata-trackingcategory-no-source"
+   "commonsmetadata-trackingcategory-no-source",
+   "commonsmetadata-trackingcategory-no-patent"
],
"manifest_version": 1
 }
diff --git a/i18n/en.json b/i18n/en.json
index 8ab2650..04ce64f 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,5 +11,7 @@
"commonsmetadata-trackingcategory-no-author": "Files with no 
machine-readable author",
"commonsmetadata-trackingcategory-no-author-desc": "The file does not 
have a [{{MediaWiki:Commonsmetadata-doc-url}} machine-readable] information 
template, or its author field is not filled out.",
"commonsmetadata-trackingcategory-no-source": "Files with no 
machine-readable source",
-   "commonsmetadata-trackingcategory-no-source-desc": "The file does not 
have a [{{MediaWiki:Commonsmetadata-doc-url}} machine-readable] information 
template, or its source field is not filled out."
+   "commonsmetadata-trackingcategory-no-source-desc": "The file does not 
have a [{{MediaWiki:Commonsmetadata-doc-url}} machine-readable] information 
template, or its source field is not filled out.",
+   "commonsmetadata-trackingcategory-no-patent": "Files with no 
machine-readable patent",
+   "commonsmetadata-trackingcategory-no-patent-desc": "The file does not 
have a [{{MediaWiki:Commonsmetadata-doc-url}} machine-readable] patent 
template."
 }
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 3f62d3d..e91c64b 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -14,5 +14,7 @@
"commonsmetadata-trackingcategory-no-author": "Name of the tracking 
category for files with no machine-readable author",
"commonsmetadata-trackingcategory-no-author-desc": "Description of the 
inclusion criteria for the tracking category for files with no machine-readable 
license",
"commonsmetadata-trackingcategory-no-source": "Name of the tracking 
category for files with no machine-readable source",
-   "commonsmetadata-trackingcategory-no-source-desc": "Description of the 
the inclusion criteria for tracking category for files with no machine-readable 
license"
+   "commonsmetadata-trackingcategory-no-source-desc": "Description of the 
the inclusion criteria for tracking category for files with no machine-readable 
license",
+   "commonsmetadata-trackingcategory-no-patent": "Name of the tracking 
category for files with no machine-readable patent",
+   "commonsmetadata-trackingcategory-no-patent-desc": "Description of the 
the inclusion criteria for tracking category for files with no machine-readable 
patent"
 }
diff --git a/src/DataCollector.php b/src/DataCollector.php
index bfa5ad0..fbe0ffb 100644
--- a/src/DataCollector.php
+++ b/src/DataCollector.php
@@ -7,6 +7,7 @@
 use File;
 use LocalFile;
 use ForeignAPIFile;
+use ParserOutput;
 use WikiFilePage;
 use Wikimedia\ScopedCallback;
 
@@ -108,14 +109,18 @@
/**
 * Checks for the presence of metadata needed for attributing the file 
(author, source, license)
 * and returns a list of keys corresponding to problems.
-* @param string $descriptionText HTML code of the file description
+* @param ParserOutput $parserOutput
+* @param File $file
 * @return array one or more of the following keys:
 *  - no-license - failed to detect a license
 *  - no-description - failed to detect any image description
 *  - no-author - failed to detect author name or a custom attribution 
text
 *  - no-source - failed to detect the source of the image or a custom 
attribution text
 */
-   public function verifyAttributionMetadata( $descriptionText ) {
+   public function verifyAttributionMetadata( ParserOutput $parserOutput, 
File $file ) {
+   // HTML code of the file description
+   $descriptionText = $parserOutput->getText();
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove role::grafana::labs

2018-01-15 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404314 )

Change subject: Remove role::grafana::labs
..

Remove role::grafana::labs

Migrate to using the profile and specifying the correct hiera data,
removing the role in the process

Bug: T170150
Change-Id: I0df497afe3ff3fb25e705c91a77432ac43623a27
---
M hieradata/role/common/labs/monitoring.yaml
D modules/role/manifests/grafana/labs.pp
M modules/role/manifests/labs/monitoring.pp
3 files changed, 13 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/404314/1

diff --git a/hieradata/role/common/labs/monitoring.yaml 
b/hieradata/role/common/labs/monitoring.yaml
index b3e0545..0635f86 100644
--- a/hieradata/role/common/labs/monitoring.yaml
+++ b/hieradata/role/common/labs/monitoring.yaml
@@ -5,3 +5,15 @@
   - esams.wmnet
   - ulsfo.wmnet
   - eqsin.wmnet
+profile::grafana::readonly_domain: grafana-labs.wikimedia.org
+profile::grafana::admin_domain: grafana-labs-admin.wikimedia.org
+profile::grafana::ldap_editor_description: LDAP Users (Wikitech)
+profile::grafana::ldap_editor:
+  - cn=ops,ou=groups,dc=wikimedia,dc=org
+  - cn=nda,ou=groups,dc=wikimedia,dc=org
+  - cn=wmf,ou=groups,dc=wikimedia,dc=org
+  - cn=grafana-admin,ou=groups,dc=wikimedia,dc=org
+  - cn=project-bastion,ou=groups,dc=wikimedia,dc=org'
+# In private repo
+#profile::grafana::secret_key:
+#profile::grafana::admin_password:
diff --git a/modules/role/manifests/grafana/labs.pp 
b/modules/role/manifests/grafana/labs.pp
deleted file mode 100644
index 0545eff..000
--- a/modules/role/manifests/grafana/labs.pp
+++ /dev/null
@@ -1,24 +0,0 @@
-# == Class: role::grafana::labs
-#
-# Grafana is a dashboarding webapp for Graphite.
-# It powers .
-#
-class role::grafana::labs {
-include ::passwords::grafana::labs
-
-class { '::profile::grafana':
-readonly_domain => 'grafana-labs.wikimedia.org',
-admin_domain=> 'grafana-labs-admin.wikimedia.org',
-secret_key  => $passwords::grafana::labs::secret_key,
-admin_password  => $passwords::grafana::labs::admin_password,
-ldap_editor_description => 'LDAP Users (Wikitech)',
-ldap_editor_groups  => [
-'cn=ops,ou=groups,dc=wikimedia,dc=org',
-'cn=nda,ou=groups,dc=wikimedia,dc=org',
-'cn=wmf,ou=groups,dc=wikimedia,dc=org',
-'cn=grafana-admin,ou=groups,dc=wikimedia,dc=org',
-'cn=project-bastion,ou=groups,dc=wikimedia,dc=org'
-]
-}
-
-}
diff --git a/modules/role/manifests/labs/monitoring.pp 
b/modules/role/manifests/labs/monitoring.pp
index 30ef498..00e1344 100644
--- a/modules/role/manifests/labs/monitoring.pp
+++ b/modules/role/manifests/labs/monitoring.pp
@@ -2,7 +2,7 @@
 system::role { 'labs::monitoring': }
 include ::role::labs::graphite
 include ::role::labs::prometheus
-include ::role::grafana::labs
+include ::profile::grafana
 include standard
 include ::base::firewall
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0df497afe3ff3fb25e705c91a77432ac43623a27
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] analytics...source[master]: Add core class and job to import EL hive tables to Druid

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/386882 )

Change subject: Add core class and job to import EL hive tables to Druid
..


Add core class and job to import EL hive tables to Druid

Created resources directory to store master-ingestion-spec

Bug: T166414
Change-Id: I30c374c3dcba44bbd0608e72ae0162bcc442cd0f
---
M pom.xml
M refinery-core/pom.xml
A refinery-core/src/main/resources/ingestion_spec_template.json
A 
refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/DataFrameToDruid.scala
A 
refinery-core/src/test/scala/org/wikimedia/analytics/refinery/core/TestDataFrameToDruid.scala
M refinery-job/pom.xml
A 
refinery-job/src/main/scala/org/wikimedia/analytics/refinery/job/EventLoggingToDruid.scala
A 
refinery-job/src/test/scala/org/wikimedia/analytics/refinery/job/TestEventLoggingToDruid.scala
8 files changed, 1,083 insertions(+), 14 deletions(-)

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



diff --git a/pom.xml b/pom.xml
index dcaa0fd..68ce8da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,7 +190,21 @@
 test
   
 
-  
+
+
+
+
+org.xerial.snappy
+snappy-java
+1.1.2.5
+test
+
+
+
 com.github.nscala-time
 nscala-time_2.10
 2.0.0
diff --git a/refinery-core/pom.xml b/refinery-core/pom.xml
index 8ace48a..5e6d6f7 100644
--- a/refinery-core/pom.xml
+++ b/refinery-core/pom.xml
@@ -76,6 +76,13 @@
 
 
 
+org.scalamock
+scalamock-scalatest-support_2.10
+3.2.2
+test
+
+
+
 org.scalatest
 scalatest_2.10
 test
@@ -119,7 +126,32 @@
 1.4.7
 
 
+
+org.apache.hadoop
+hadoop-common
+provided
+
+
+
+javax.servlet
+*
+
+
+
 
+
+com.holdenkarau
+spark-testing-base_2.10
+1.6.0_0.4.7
+test
+
+
+
+
+org.apache.httpcomponents
+httpclient
+4.5.3
+
 
 
 
diff --git a/refinery-core/src/main/resources/ingestion_spec_template.json 
b/refinery-core/src/main/resources/ingestion_spec_template.json
new file mode 100644
index 000..f814559
--- /dev/null
+++ b/refinery-core/src/main/resources/ingestion_spec_template.json
@@ -0,0 +1,50 @@
+{
+"type" : "index_hadoop",
+"spec" : {
+"ioConfig" : {
+"type" : "hadoop",
+"inputSpec" : {
+"type" : "static",
+"paths" : "{{INPUT_PATH}}"
+}
+},
+"dataSchema" : {
+"dataSource" : "{{DATA_SOURCE}}",
+"granularitySpec" : {
+"type" : "uniform",
+"segmentGranularity" : "{{SEGMENT_GRANULARITY}}",
+"queryGranularity" : "{{QUERY_GRANULARITY}}",
+"intervals" : {{INTERVALS_ARRAY}}
+},
+"parser" : {
+"type" : "string",
+"parseSpec" : {
+"format" : "json",
+"dimensionsSpec" : {
+"dimensions" : {{DIMENSIONS}}
+},
+"timestampSpec" : {
+"format" : "{{TIMESTAMP_FORMAT}}",
+"column" : "{{TIMESTAMP_COLUMN}}"
+}
+}
+},
+"metricsSpec" : {{METRICS}}
+},
+"tuningConfig" : {
+"type" : "hadoop",
+"overwriteFiles": true,
+"ignoreInvalidRows" : false,
+"partitionsSpec" : {
+"type" : "hashed",
+"numShards" : {{NUM_SHARDS}}
+},
+"jobProperties" : {
+"mapreduce.reduce.memory.mb" : "{{REDUCE_MEMORY}}",
+"mapreduce.output.fileoutputformat.compress":
+"org.apache.hadoop.io.compress.GzipCodec",
+"mapreduce.job.queuename": "{{HADOOP_QUEUE}}"
+}
+}
+}
+}
diff --git 
a/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/DataFrameToDruid.scala
 
b/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/DataFrameToDruid.scala
new file mode 100644
index 000..09339cc
--- /dev/null
+++ 
b/refinery-core/src/main/scala/org/wikimedia/analytics/refinery/core/DataFrameToDruid.scala
@@ -0,0 +1,354 @@
+package org.wikimedia.analytics.refinery.core
+
+import java.io.InputStream
+
+import org.apache.commons.io.IOUtils
+import org.apache.hadoop.fs.FileSystem
+import org.apache.hadoop.fs.Path
+import org.apache.http.client.HttpClient
+import org.apache.http.client.methods.HttpGet

[MediaWiki-commits] [Gerrit] integration/commit-message-validator[master]: Add a shebang line to new hooks

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404259 )

Change subject: Add a shebang line to new hooks
..


Add a shebang line to new hooks

https://stackoverflow.com/questions/5697210/

Change-Id: If7f88966f1fd2894e4c641fd3fe360aa4c782577
---
M commit_message_validator/__init__.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/commit_message_validator/__init__.py 
b/commit_message_validator/__init__.py
index 242f7f2..c143f65 100644
--- a/commit_message_validator/__init__.py
+++ b/commit_message_validator/__init__.py
@@ -163,7 +163,7 @@
 return 0
 # Doesn't exist, we need to create a hook and make it +x
 with open(path, 'w') as f:
-f.write(cmd + '\n')
+f.write('#!/bin/sh\n' + cmd + '\n')
 subprocess.check_call(['chmod', '+x', path])
 return 0
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7f88966f1fd2894e4c641fd3fe360aa4c782577
Gerrit-PatchSet: 3
Gerrit-Project: integration/commit-message-validator
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: Dalba 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...prometheus-blazegraph-exporter[master]: Don't depend on blazegraph

2018-01-15 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404316 )

Change subject: Don't depend on blazegraph
..


Don't depend on blazegraph

Partially revert 5c3d9802f6, we'll ship an override in puppet instead

Bug: T184434
Change-Id: I89864487fca1aa87ec5428a7af0192843a17594a
---
M debian/changelog
M debian/service
2 files changed, 6 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved
  Gehel: Looks good to me, but someone else must approve



diff --git a/debian/changelog b/debian/changelog
index 20c2079..9738003 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+prometheus-blazegraph-exporter (0.4) jessie-wikimedia; urgency=medium
+
+  * Don't start after blazegraph
+
+ -- Filippo Giunchedi   Mon, 15 Jan 2018 17:25:45 +0100
+
 prometheus-blazegraph-exporter (0.3) jessie-wikimedia; urgency=medium
 
   * start after blazegraph
diff --git a/debian/service b/debian/service
index 7761739..764352f 100644
--- a/debian/service
+++ b/debian/service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Prometheus Blazegraph Exporter
-Requires=blazegraph.service
-After=blazegraph.service
 
 [Service]
 Restart=always

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I89864487fca1aa87ec5428a7af0192843a17594a
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/prometheus-blazegraph-exporter
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1089 and db1067"

2018-01-15 Thread Marostegui (Code Review)

Hello jenkins-bot, Jcrespo,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1089 and db1067"
..

Revert "db-eqiad.php: Depool db1089 and db1067"

This reverts commit 185ce935678b0655f07fd1876d270354f5996b8d.

Change-Id: Ic920e3f2ae8e9271c4988f870812c286fe91ced9
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/17/404317/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 63932c3..ce25a7a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -104,13 +104,13 @@
 'sectionLoads' => [
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
-   # 'db1067' => 0,   # D1 2.8TB 160GB, old master # T162807
+   'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
'db1073' => 50,  # B3 2.8TB 160GB, api
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
-   # 'db1089' => 500, # C3 3.6TB 512GB # T162807
+   'db1089' => 500, # C3 3.6TB 512GB
'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic920e3f2ae8e9271c4988f870812c286fe91ced9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: grafana: Allow to modify the config in hiera

2018-01-15 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404320 )

Change subject: grafana: Allow to modify the config in hiera
..

grafana: Allow to modify the config in hiera

Allow overriding the base configuration from hiera

Bug: T170150
Change-Id: Ieea0796420412e5e95e0b1ad96ee5115dbffc5f4
---
M modules/profile/manifests/grafana.pp
1 file changed, 76 insertions(+), 72 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/20/404320/1

diff --git a/modules/profile/manifests/grafana.pp 
b/modules/profile/manifests/grafana.pp
index 6374a00..cf7a462 100644
--- a/modules/profile/manifests/grafana.pp
+++ b/modules/profile/manifests/grafana.pp
@@ -9,6 +9,7 @@
 $admin_password=hiera('profile::grafana::admin_password'),
 
$ldap_editor_description=hiera('profile::grafana::ldap_editor_description'),
 $ldap_editor_groups=hiera('profile::grafana::ldap_edit_groups'),
+$config=hiera('profile::grafana::config', {}),
 ) {
 include ::apache::mod::authnz_ldap
 include ::apache::mod::headers
@@ -22,80 +23,83 @@
 
 include ::base::firewall
 
-class { '::grafana':
-config => {
-# Configuration settings for /etc/grafana/grafana.ini.
-# See .
+$base_config = {
+# Configuration settings for /etc/grafana/grafana.ini.
+# See .
 
-# Only listen on loopback, because we'll have a local Apache
-# instance acting as a reverse-proxy.
-'server' => {
-http_addr   => '127.0.0.1',
-domain  => $readonly_domain,
-protocol=> 'http',
-enable_gzip => true,
-},
-
-# Grafana needs a database to store users and dashboards.
-# sqlite3 is the default, and it's perfectly adequate.
-'database'   => {
-'type' => 'sqlite3',
-'path' => 'grafana.db',
-},
-
-'security'   => {
-secret_key   => $secret_key,
-admin_password   => $admin_password,
-disable_gravatar => true,
-},
-
-# Disabled auth.basic, because it conflicts with auth.proxy.
-# See 
-'auth.basic' => {
-enabled => false,
-},
-
-# Automatically create an account for users and authenticate
-# them based on the X-WEBAUTH-USER. We use mod_rewrite to
-# rewrite the REMOTE_USER env var set by mod_authnz_ldap into
-# X-WEBAUTH-USER.
-'auth.proxy' => {
-enabled  => true,
-header_name  => 'X-WEBAUTH-USER',
-auto_sign_up => true,
-},
-
-# Since we require users to be members of a trusted LDAP group
-# membership to log in to Grafana, we can assume all users are
-# trusted, and can assign to them the 'Editor' role (rather
-# than 'Viewer', the default).
-'users'  => {
-auto_assign_org_role => 'Editor',
-allow_org_create => false,
-allow_sign_up=> false,
-},
-
-# Because we enable `auth.proxy` (see above), if session data
-# is lost, Grafana will simply create a new session on the next
-# request, so it's OK for session storage to be volatile.
-'session'=> {
-provider  => 'memory',
-cookie_secure => true,
-},
-
-# We don't like it when software phones home.
-# Don't send anonymous usage stats to stats.grafana.org,
-# and don't check for updates automatically.
-'analytics'  => {
-reporting_enabled => false,
-check_for_updates => false,
-},
-
-# Also, don't allow publishing to raintank.io.
-'snapshots'  => {
-external_enabled => false,
-},
+# Only listen on loopback, because we'll have a local Apache
+# instance acting as a reverse-proxy.
+'server' => {
+http_addr   => '127.0.0.1',
+domain  => $readonly_domain,
+protocol=> 'http',
+enable_gzip => true,
 },
+
+# Grafana needs a database to store users and dashboards.
+# sqlite3 is the default, and it's perfectly adequate.
+'database'   => {
+'type' => 'sqlite3',
+'path' => 'grafana.db',
+},
+
+'security'   => {
+secret_key   => $secret_key,
+admin_password   =>

[MediaWiki-commits] [Gerrit] labs/private[master]: Deprecate passwords::grafana::labs

2018-01-15 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404311 )

Change subject: Deprecate passwords::grafana::labs
..


Deprecate passwords::grafana::labs

Bug: T170150
Change-Id: Iad7cdef38f62da19b59eb7570c9f7bc1bc7d8fca
---
A hieradata/role/common/labs/monitoring.yaml
M modules/passwords/manifests/init.pp
2 files changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/labs/monitoring.yaml 
b/hieradata/role/common/labs/monitoring.yaml
new file mode 100644
index 000..eef1fde
--- /dev/null
+++ b/hieradata/role/common/labs/monitoring.yaml
@@ -0,0 +1,2 @@
+profile::grafana::secret_key: ab
+profile::grafana::admin_password: b
diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 584dafa..2b4dbc8 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -408,6 +408,7 @@
 $admin_password = ''
 }
 
+# DEPRECATE
 class passwords::grafana::labs {
 $secret_key = 'ab'
 $admin_password = 'b'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad7cdef38f62da19b59eb7570c9f7bc1bc7d8fca
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Switchover s3 codfw master from db2018 to db2036

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404310 )

Change subject: mariadb: Switchover s3 codfw master from db2018 to db2036
..


mariadb: Switchover s3 codfw master from db2018 to db2036

Bug: T176243
Change-Id: Ie17808d10ea2d525cfa67c0aeabaca535e08bcb3
---
M wmf-config/db-codfw.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Marostegui: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 42e021e..26ac6ea 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -128,8 +128,8 @@
'db2091:3312' => 1, # A8 3.3TB 512GB # rc, log: s2 and s4
],
/* s3 */ 'DEFAULT' => [
-   'db2018'  => 0,   # B6 2.9TB  96GB, master
-   'db2036'  => 50,  # C6 2.9TB 160GB
+   'db2036'  => 0,   # C6 2.9TB 160GB, master
+   # 'db2018'  => 0,   # B6 2.9TB  96GB, old master
'db2043'  => 50,  # C6 2.9TB 160GB, dump (inactive), vslow
'db2050'  => 150, # C6 2.9TB 160GB
'db2057'  => 400, # D6 3.3TB 160GB

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie17808d10ea2d525cfa67c0aeabaca535e08bcb3
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] labs/private[master]: Deprecate passwords::grafana::production

2018-01-15 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404318 )

Change subject: Deprecate passwords::grafana::production
..

Deprecate passwords::grafana::production

Move the data into hiera. Also kill passwords::grafana that seems to be
unused for a long time now

Change-Id: I94f83359acef6e303721b337db99ee0124c608e9
---
A hieradata/role/common/webserver_misc_apps.yaml
M modules/passwords/manifests/init.pp
2 files changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/labs/private 
refs/changes/18/404318/1

diff --git a/hieradata/role/common/webserver_misc_apps.yaml 
b/hieradata/role/common/webserver_misc_apps.yaml
new file mode 100644
index 000..c373ead
--- /dev/null
+++ b/hieradata/role/common/webserver_misc_apps.yaml
@@ -0,0 +1,2 @@
+profile::grafana::secret_key: a
+profile::grafana::admin_password: 
diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 2b4dbc8..1b9e2ed 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -398,17 +398,13 @@
 $db_pass = 'dummy'
 }
 
-class passwords::grafana {
-$secret_key = 'a'
-$admin_password = ''
-}
-
+# DEPRECATED - 2017-01-15
 class passwords::grafana::production {
 $secret_key = 'a'
 $admin_password = ''
 }
 
-# DEPRECATE
+# DEPRECATED - 2017-01-15
 class passwords::grafana::labs {
 $secret_key = 'ab'
 $admin_password = 'b'

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I94f83359acef6e303721b337db99ee0124c608e9
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Simplify profile::grafana::production

2018-01-15 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404319 )

Change subject: Simplify profile::grafana::production
..

Simplify profile::grafana::production

Instead of declaring profile::grafana, require it and let hiera work.
Populate the corresponding hieradata under role::webserver_misc_apps
This leaves us with only some grafana::dashboard rules that need some
refactoring before the profile migration is fully done

Bug: T170150
Change-Id: Ie0092374f24f25a532b3443ed4c50fbf720f80a2
---
M hieradata/role/common/webserver_misc_apps.yaml
M modules/profile/manifests/grafana/production.pp
2 files changed, 13 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/19/404319/1

diff --git a/hieradata/role/common/webserver_misc_apps.yaml 
b/hieradata/role/common/webserver_misc_apps.yaml
index 7818b94..859e345 100644
--- a/hieradata/role/common/webserver_misc_apps.yaml
+++ b/hieradata/role/common/webserver_misc_apps.yaml
@@ -6,3 +6,15 @@
   - eventlogging_consumer_mysql_00
   - eventlogging_consumer_mysql_eventbus_00
   - eventlogging_consumer_files_00
+
+profile::grafana::readonly_domain: grafana.wikimedia.org
+profile::grafana::admin_domain: grafana-admin.wikimedia.org
+profile::grafana::ldap_editor_description: nda/ops/wmf/grafana-admin
+profile::grafana::ldap_edit_groups:
+  - cn=ops,ou=groups,dc=wikimedia,dc=org
+  - cn=nda,ou=groups,dc=wikimedia,dc=org
+  - cn=wmf,ou=groups,dc=wikimedia,dc=org
+  - cn=grafana-admin,ou=groups,dc=wikimedia,dc=org
+# In private repo
+#profile::grafana::secret_key:
+#profile::grafana::admin_password:
diff --git a/modules/profile/manifests/grafana/production.pp 
b/modules/profile/manifests/grafana/production.pp
index b3cc1ce..984d88a 100644
--- a/modules/profile/manifests/grafana/production.pp
+++ b/modules/profile/manifests/grafana/production.pp
@@ -4,21 +4,7 @@
 # It powers .
 #
 class profile::grafana::production {
-include ::passwords::grafana::production
-
-class { '::profile::grafana':
-readonly_domain => 'grafana.wikimedia.org',
-admin_domain=> 'grafana-admin.wikimedia.org',
-secret_key  => $passwords::grafana::production::secret_key,
-admin_password  => 
$passwords::grafana::production::admin_password,
-ldap_editor_description => 'nda/ops/wmf/grafana-admin',
-ldap_editor_groups  => [
-'cn=ops,ou=groups,dc=wikimedia,dc=org',
-'cn=nda,ou=groups,dc=wikimedia,dc=org',
-'cn=wmf,ou=groups,dc=wikimedia,dc=org',
-'cn=grafana-admin,ou=groups,dc=wikimedia,dc=org',
-]
-}
+require ::profile::grafana
 
 grafana::dashboard { 'varnish-http-errors':
 source => 'puppet:///modules/grafana/dashboards/varnish-http-errors',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0092374f24f25a532b3443ed4c50fbf720f80a2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] labs...wikibugs2[master]: Migration from #wiki-dev-africa to #wikimedia-dev-africa

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404289 )

Change subject: Migration from #wiki-dev-africa to #wikimedia-dev-africa
..


Migration from #wiki-dev-africa to #wikimedia-dev-africa

As per requested by community and internal discussions by the AWMD
core team, we are moving the AWMD channel from #wiki-dev-africa to
official IRC channel namespace (#wikimedia-*)

Bug: T184903
Change-Id: I715bad179235f833cb82797bcbdff5bb70fd759c
---
M channels.yaml
M gerrit-channels.yaml
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  D3r1ck01: Looks good to me, but someone else must approve
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/channels.yaml b/channels.yaml
index 4e70bd1..ae154b3 100644
--- a/channels.yaml
+++ b/channels.yaml
@@ -289,7 +289,7 @@
 "##goat":
 - Goatification
 
-"#wiki-dev-africa":
+"#wikimedia-dev-africa":
 - Africa-Wikimedia-Developers
 - MediaWiki-extensions-SendGrid
 
diff --git a/gerrit-channels.yaml b/gerrit-channels.yaml
index a71e239..a82e556 100644
--- a/gerrit-channels.yaml
+++ b/gerrit-channels.yaml
@@ -107,7 +107,7 @@
 mediawiki/extensions/UnusedRedirects:
 mediawiki/skins/DeepSea:
 mediawiki/skins/Refreshed:
-# Sent to #wiki-dev-africa as well
+# Sent to #wikimedia-dev-africa as well
 mediawiki/extensions/SendGrid:
 mediawiki/extensions/MassMessage:
 # Sent to #wikimedia-design as well
@@ -222,8 +222,8 @@
 mediawiki/services/restbase/deploy:
 mediawiki/services/service-runner:
 mediawiki/services/service-template-node:
-"#wiki-dev-africa":
-# Send notifications to #wiki-dev-africa
+"#wikimedia-dev-africa":
+# Send notifications to #wikimedia-dev-africa
 mediawiki/extensions/SendGrid:
 mediawiki/extensions/MassMessage:
 labs/tools/ZppixBot:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I715bad179235f833cb82797bcbdff5bb70fd759c
Gerrit-PatchSet: 1
Gerrit-Project: labs/tools/wikibugs2
Gerrit-Branch: master
Gerrit-Owner: D3r1ck01 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...ContentTranslation[wmf/1.31.0-wmf.16]: CX1: Fix translation view UI overlaps

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404070 )

Change subject: CX1: Fix translation view UI overlaps
..


CX1: Fix translation view UI overlaps

- Integrate infobar messages into main piece of content, matching the
width of header after Id77aa5be3e80.
- Fix inaccessible publish target namespace menu.

Bug: T184662
Bug: T184130
Change-Id: Ic391b24d880bbd314c8fd5dafb583ec98a25bbd2
(cherry picked from commit 4c082cc2819cc6fd1ca8e8654937508a12406e2d)
---
M modules/ui/legacy/styles/mw.cx.ui.Header.less
M modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less
M modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
M modules/ui/styles/mw.cx.ui.Infobar.less
M modules/widgets/common/ext.cx.common.less
5 files changed, 16 insertions(+), 6 deletions(-)

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



diff --git a/modules/ui/legacy/styles/mw.cx.ui.Header.less 
b/modules/ui/legacy/styles/mw.cx.ui.Header.less
index 3502669..d2ad30c 100644
--- a/modules/ui/legacy/styles/mw.cx.ui.Header.less
+++ b/modules/ui/legacy/styles/mw.cx.ui.Header.less
@@ -16,7 +16,7 @@
 }
 
 .cx-header:not( .cx-header--dashboard ) > .cx-header__main {
-   padding: 10px;
+   padding: @personal-header-padding;
 }
 
 .cx-header__trademark {
@@ -106,7 +106,7 @@
 
 .cx-header__main,
 .cx-header__trademark {
-   min-height: 2.5em;
+   min-height: @personal-header-height;
 }
 
 .cx-header__main:after {
@@ -136,6 +136,10 @@
@media only screen and ( max-width: ( @very-narrow - 1px ) ) {
padding: 10px 12px 0;
}
+}
+
+.cx-header-infobar {
+   .mw-ui-two-thirds;
 }
 
 .cx-header__bar-container {
@@ -197,6 +201,7 @@
left: 0;
 
width: 66.666%;
+   height: @header-bar-height-legacy;
padding: 0;
.box-shadow( 0 2px 2px 0 rgba( 0, 0, 0, 0.25 ) );
 
diff --git a/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less 
b/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less
index fa6ec82..0fcece6 100644
--- a/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less
+++ b/modules/ui/legacy/styles/mw.cx.ui.ToolsColumn.less
@@ -2,15 +2,15 @@
 
 .cx-column--tools {
.mw-ui-one-whole(@palm);
+   .stick-to-side;
 
background-color: @colorGray14;
min-height: 100vh;
-   position: relative;
-   top: -@header-bar-height-legacy;
+   top: @personal-header-height + 2 * @personal-header-padding;
border-left: 1px solid @colorGray12;
 
&.sticky {
-   .stick-to-side;
+   top: 0;
 
@media @palm {
.stick-to-bottom;
diff --git a/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less 
b/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
index 2c7b5e2..ea4d579 100644
--- a/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
+++ b/modules/ui/legacy/styles/mw.cx.ui.TranslationColumn.less
@@ -1,6 +1,10 @@
 @import '../../../widgets/common/ext.cx.common.less';
 @import '../../../widgets/common/ext.cx.highlight.less';
 
+.cx-column.cx-column--translation {
+   z-index: auto;
+}
+
 .cx-column--translation {
[contenteditable] {
outline: 0;
diff --git a/modules/ui/styles/mw.cx.ui.Infobar.less 
b/modules/ui/styles/mw.cx.ui.Infobar.less
index 516e57d..bba6d92 100644
--- a/modules/ui/styles/mw.cx.ui.Infobar.less
+++ b/modules/ui/styles/mw.cx.ui.Infobar.less
@@ -1,6 +1,5 @@
 @import '../../widgets/common/ext.cx.common.less';
 
 .cx-header-infobar {
-   .mw-ui-item;
.mw-ui-one-whole;
 }
diff --git a/modules/widgets/common/ext.cx.common.less 
b/modules/widgets/common/ext.cx.common.less
index b6b9bd3..884d81c 100644
--- a/modules/widgets/common/ext.cx.common.less
+++ b/modules/widgets/common/ext.cx.common.less
@@ -17,6 +17,8 @@
 @max-dashboard-width: 1500px;
 
 @header-bar-height-legacy: 40px;
+@personal-header-height: 2.5em;
+@personal-header-padding: 0.625em;
 
 .box-shadow-card() {
.box-shadow( 0 1px 1px rgba( 0, 0, 0, 0.15 ) );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic391b24d880bbd314c8fd5dafb583ec98a25bbd2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: wmf/1.31.0-wmf.16
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: Petar.petkovic 
Gerrit-Reviewer: Zfilipin 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: hieradata: enable remaining restbase1017 instances

2018-01-15 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404300 )

Change subject: hieradata: enable remaining restbase1017 instances
..

hieradata: enable remaining restbase1017 instances

It has been noted in the past that enabling all instances together causes 
issues because of
concurrent bootstraps. As an experiment I've masked cassandra-c already to test 
if starting out with
all instances masked and enabling one by one would work.

Bug: T184100
Change-Id: I17af71c72f05bb0492742b68db5ce2013f4e58d4
---
M hieradata/role/common/restbase/production_ng.yaml
1 file changed, 24 insertions(+), 24 deletions(-)


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

diff --git a/hieradata/role/common/restbase/production_ng.yaml 
b/hieradata/role/common/restbase/production_ng.yaml
index 170d601..4118263 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -371,30 +371,30 @@
   hints_directory: /srv/cassandra/instance-data/cassandra-a/hints
   saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-a/saved_caches
   jmx_exporter_enabled: true
-#b:
-#  listen_address: 10.64.32.131
-#  data_file_directories:
-#- /srv/sda4/cassandra-b/data
-#- /srv/sdb4/cassandra-b/data
-#- /srv/sdc4/cassandra-b/data
-#- /srv/sdd4/cassandra-b/data
-#  heapdump_directory: /srv/sdb4/cassandra-b
-#  commitlog_directory: /srv/cassandra/instance-data/cassandra-b/commitlog
-#  hints_directory: /srv/cassandra/instance-data/cassandra-b/hints
-#  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-b/saved_caches
-#  jmx_exporter_enabled: true
-#c:
-#  listen_address: 10.64.32.132
-#  data_file_directories:
-#- /srv/sda4/cassandra-c/data
-#- /srv/sdb4/cassandra-c/data
-#- /srv/sdc4/cassandra-c/data
-#- /srv/sdd4/cassandra-c/data
-#  heapdump_directory: /srv/sdc4/cassandra-c
-#  commitlog_directory: /srv/cassandra/instance-data/cassandra-c/commitlog
-#  hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
-#  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-c/saved_caches
-#  jmx_exporter_enabled: true
+b:
+  listen_address: 10.64.32.131
+  data_file_directories:
+- /srv/sda4/cassandra-b/data
+- /srv/sdb4/cassandra-b/data
+- /srv/sdc4/cassandra-b/data
+- /srv/sdd4/cassandra-b/data
+  heapdump_directory: /srv/sdb4/cassandra-b
+  commitlog_directory: /srv/cassandra/instance-data/cassandra-b/commitlog
+  hints_directory: /srv/cassandra/instance-data/cassandra-b/hints
+  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-b/saved_caches
+  jmx_exporter_enabled: true
+c:
+  listen_address: 10.64.32.132
+  data_file_directories:
+- /srv/sda4/cassandra-c/data
+- /srv/sdb4/cassandra-c/data
+- /srv/sdc4/cassandra-c/data
+- /srv/sdd4/cassandra-c/data
+  heapdump_directory: /srv/sdc4/cassandra-c
+  commitlog_directory: /srv/cassandra/instance-data/cassandra-c/commitlog
+  hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
+  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-c/saved_caches
+  jmx_exporter_enabled: true
   "restbase2001.codfw.wmnet":
 a:
   listen_address: 10.192.16.162

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17af71c72f05bb0492742b68db5ce2013f4e58d4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Move db2036 socket away from /tmp

2018-01-15 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404286 )

Change subject: mariadb: Move db2036 socket away from /tmp
..


mariadb: Move db2036 socket away from /tmp

Bug: T148507
Change-Id: I40af498ccfa9f8cdc087a2018292d5abef5db514
---
M hieradata/hosts/db2036.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/db2036.yaml b/hieradata/hosts/db2036.yaml
index 42ef9b8..654805a 100644
--- a/hieradata/hosts/db2036.yaml
+++ b/hieradata/hosts/db2036.yaml
@@ -1,2 +1 @@
 mariadb::shard: 's3'
-mariadb::socket: '/tmp/mysql.sock'

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: hieradata: enable remaining restbase1017 instances

2018-01-15 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404300 )

Change subject: hieradata: enable remaining restbase1017 instances
..


hieradata: enable remaining restbase1017 instances

It has been noted in the past that enabling all instances together causes 
issues because of
concurrent bootstraps. As an experiment I've masked cassandra-c already to test 
if starting out with
all instances masked and enabling one by one would work.

Bug: T184100
Change-Id: I17af71c72f05bb0492742b68db5ce2013f4e58d4
---
M hieradata/role/common/restbase/production_ng.yaml
1 file changed, 24 insertions(+), 24 deletions(-)

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



diff --git a/hieradata/role/common/restbase/production_ng.yaml 
b/hieradata/role/common/restbase/production_ng.yaml
index 170d601..4118263 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -371,30 +371,30 @@
   hints_directory: /srv/cassandra/instance-data/cassandra-a/hints
   saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-a/saved_caches
   jmx_exporter_enabled: true
-#b:
-#  listen_address: 10.64.32.131
-#  data_file_directories:
-#- /srv/sda4/cassandra-b/data
-#- /srv/sdb4/cassandra-b/data
-#- /srv/sdc4/cassandra-b/data
-#- /srv/sdd4/cassandra-b/data
-#  heapdump_directory: /srv/sdb4/cassandra-b
-#  commitlog_directory: /srv/cassandra/instance-data/cassandra-b/commitlog
-#  hints_directory: /srv/cassandra/instance-data/cassandra-b/hints
-#  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-b/saved_caches
-#  jmx_exporter_enabled: true
-#c:
-#  listen_address: 10.64.32.132
-#  data_file_directories:
-#- /srv/sda4/cassandra-c/data
-#- /srv/sdb4/cassandra-c/data
-#- /srv/sdc4/cassandra-c/data
-#- /srv/sdd4/cassandra-c/data
-#  heapdump_directory: /srv/sdc4/cassandra-c
-#  commitlog_directory: /srv/cassandra/instance-data/cassandra-c/commitlog
-#  hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
-#  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-c/saved_caches
-#  jmx_exporter_enabled: true
+b:
+  listen_address: 10.64.32.131
+  data_file_directories:
+- /srv/sda4/cassandra-b/data
+- /srv/sdb4/cassandra-b/data
+- /srv/sdc4/cassandra-b/data
+- /srv/sdd4/cassandra-b/data
+  heapdump_directory: /srv/sdb4/cassandra-b
+  commitlog_directory: /srv/cassandra/instance-data/cassandra-b/commitlog
+  hints_directory: /srv/cassandra/instance-data/cassandra-b/hints
+  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-b/saved_caches
+  jmx_exporter_enabled: true
+c:
+  listen_address: 10.64.32.132
+  data_file_directories:
+- /srv/sda4/cassandra-c/data
+- /srv/sdb4/cassandra-c/data
+- /srv/sdc4/cassandra-c/data
+- /srv/sdd4/cassandra-c/data
+  heapdump_directory: /srv/sdc4/cassandra-c
+  commitlog_directory: /srv/cassandra/instance-data/cassandra-c/commitlog
+  hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
+  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-c/saved_caches
+  jmx_exporter_enabled: true
   "restbase2001.codfw.wmnet":
 a:
   listen_address: 10.192.16.162

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17af71c72f05bb0492742b68db5ce2013f4e58d4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Eevans 
Gerrit-Reviewer: Filippo Giunchedi 
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] mediawiki...BlueSpiceNamespaceManager[master]: Fix use of "config_prefix" and set "requires" in extension.json

2018-01-15 Thread Umherirrender (Code Review)

Umherirrender has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404220 )

Change subject: Fix use of "config_prefix" and set "requires" in extension.json
..


Fix use of "config_prefix" and set "requires" in extension.json

"requires" sets the load order in the extension registry to have
BSCONFIGDIR defined when needed

Change-Id: Ib302787af9ea7f23897acae9c11558b59d878bcb
---
M extension.json
1 file changed, 6 insertions(+), 1 deletion(-)

Approvals:
  Umherirrender: Verified
  Robert Vogel: Looks good to me, approved



diff --git a/extension.json b/extension.json
index c399168..ce50fef 100644
--- a/extension.json
+++ b/extension.json
@@ -21,6 +21,11 @@
}
},
"callback": "NamespaceManager::onRegistration",
+   "requires": {
+   "extensions": {
+   "BlueSpiceFoundation": "*"
+}
+   },
"LogTypes": [
"bs-namespace-manager"
],
@@ -45,7 +50,7 @@
"ExtensionMessagesFiles": {
"NamespaceManagerAlias": 
"includes/specials/SpecialNamespaceManager.alias.php"
},
-   "config-prefix": "bsg",
+   "config_prefix": "bsg",
"config": {
"NamespaceManagerNsOffset": {
"value": 2999

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib302787af9ea7f23897acae9c11558b59d878bcb
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceNamespaceManager
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Ljonka 
Gerrit-Reviewer: Mglaser 
Gerrit-Reviewer: Pwirth 
Gerrit-Reviewer: Robert Vogel 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Switchover s3 codfw master from db2018 to db2036

2018-01-15 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Switchover s3 codfw master from db2018 to db2036
..

mariadb: Switchover s3 codfw master from db2018 to db2036

Bug: T176243
Change-Id: I18db346e356d813ba0527c2f02dc50a81ef214b9
---
M hieradata/hosts/db2018.yaml
M hieradata/hosts/db2036.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_codfw.yaml
4 files changed, 6 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/13/404313/1

diff --git a/hieradata/hosts/db2018.yaml b/hieradata/hosts/db2018.yaml
index 0ce1cd8..654805a 100644
--- a/hieradata/hosts/db2018.yaml
+++ b/hieradata/hosts/db2018.yaml
@@ -1,4 +1 @@
 mariadb::shard: 's3'
-mariadb::mysql_role: 'master'
-mariadb::binlog_format: 'STATEMENT'
-mariadb::socket: '/tmp/mysql.sock'
diff --git a/hieradata/hosts/db2036.yaml b/hieradata/hosts/db2036.yaml
index 654805a..e43da82 100644
--- a/hieradata/hosts/db2036.yaml
+++ b/hieradata/hosts/db2036.yaml
@@ -1 +1,3 @@
 mariadb::shard: 's3'
+mariadb::mysql_role: 'master'
+mariadb::binlog_format: 'STATEMENT'
diff --git a/manifests/site.pp b/manifests/site.pp
index 576a0ac..271887a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -335,11 +335,11 @@
 
 # s3 (default) core production dbs on codfw
 # codfw master
-node 'db2018.codfw.wmnet' {
+node 'db2036.codfw.wmnet' {
 role(mariadb::core)
 }
 
-node /^db20(36|43|50|57|74)\.codfw\.wmnet/ {
+node /^db20(18|43|50|57|74)\.codfw\.wmnet/ {
 role(mariadb::core)
 }
 
diff --git a/modules/role/files/prometheus/mysql-core_codfw.yaml 
b/modules/role/files/prometheus/mysql-core_codfw.yaml
index 0bd0098..2004664 100644
--- a/modules/role/files/prometheus/mysql-core_codfw.yaml
+++ b/modules/role/files/prometheus/mysql-core_codfw.yaml
@@ -41,7 +41,7 @@
 shard: s3
 role: slave
   targets:
-  - db2036:9104
+  - db2018:9104
   - db2043:9104
   - db2050:9104
   - db2057:9104
@@ -50,7 +50,7 @@
 shard: s3
 role: master
   targets:
-  - db2018:9104
+  - db2036:9104
 
 - labels:
 shard: s4

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Switchover s3 codfw master from db2018 to db2036

2018-01-15 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404313 )

Change subject: mariadb: Switchover s3 codfw master from db2018 to db2036
..


mariadb: Switchover s3 codfw master from db2018 to db2036

Bug: T176243
Change-Id: I18db346e356d813ba0527c2f02dc50a81ef214b9
---
M hieradata/hosts/db2018.yaml
M hieradata/hosts/db2036.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_codfw.yaml
4 files changed, 6 insertions(+), 7 deletions(-)

Approvals:
  Marostegui: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/hieradata/hosts/db2018.yaml b/hieradata/hosts/db2018.yaml
index 0ce1cd8..654805a 100644
--- a/hieradata/hosts/db2018.yaml
+++ b/hieradata/hosts/db2018.yaml
@@ -1,4 +1 @@
 mariadb::shard: 's3'
-mariadb::mysql_role: 'master'
-mariadb::binlog_format: 'STATEMENT'
-mariadb::socket: '/tmp/mysql.sock'
diff --git a/hieradata/hosts/db2036.yaml b/hieradata/hosts/db2036.yaml
index 654805a..e43da82 100644
--- a/hieradata/hosts/db2036.yaml
+++ b/hieradata/hosts/db2036.yaml
@@ -1 +1,3 @@
 mariadb::shard: 's3'
+mariadb::mysql_role: 'master'
+mariadb::binlog_format: 'STATEMENT'
diff --git a/manifests/site.pp b/manifests/site.pp
index 576a0ac..271887a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -335,11 +335,11 @@
 
 # s3 (default) core production dbs on codfw
 # codfw master
-node 'db2018.codfw.wmnet' {
+node 'db2036.codfw.wmnet' {
 role(mariadb::core)
 }
 
-node /^db20(36|43|50|57|74)\.codfw\.wmnet/ {
+node /^db20(18|43|50|57|74)\.codfw\.wmnet/ {
 role(mariadb::core)
 }
 
diff --git a/modules/role/files/prometheus/mysql-core_codfw.yaml 
b/modules/role/files/prometheus/mysql-core_codfw.yaml
index 0bd0098..2004664 100644
--- a/modules/role/files/prometheus/mysql-core_codfw.yaml
+++ b/modules/role/files/prometheus/mysql-core_codfw.yaml
@@ -41,7 +41,7 @@
 shard: s3
 role: slave
   targets:
-  - db2036:9104
+  - db2018:9104
   - db2043:9104
   - db2050:9104
   - db2057:9104
@@ -50,7 +50,7 @@
 shard: s3
 role: master
   targets:
-  - db2018:9104
+  - db2036:9104
 
 - labels:
 shard: s4

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18db346e356d813ba0527c2f02dc50a81ef214b9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Add status parameter to CheckConstraints

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403967 )

Change subject: Add status parameter to CheckConstraints
..


Add status parameter to CheckConstraints

This new parameter of the wbcheckconstraints API corresponds to the
$statuses parameter of ResultsBuilder and filters the returned check
results. For now, the default value is '*' (all statuses) to preserve
compatibility, but we plan to change it to just the three statuses for
which results are also cached in the future.

Bug: T183927
Change-Id: I69885a05734956722f939e8a71d1490afc8182ab
---
M i18n/en.json
M i18n/qqq.json
M src/Api/CheckConstraints.php
M src/ConstraintCheck/Result/CheckResult.php
M tests/phpunit/Api/CheckConstraintsTest.php
5 files changed, 83 insertions(+), 17 deletions(-)

Approvals:
  Lucas Werkmeister (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/i18n/en.json b/i18n/en.json
index 2271b21..7bb971a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -54,6 +54,15 @@
"apihelp-wbcheckconstraints-param-id": "ID list of the entities to get 
the data from. Separate values with '|' or alternative.",
"apihelp-wbcheckconstraints-param-claimid": "GUID list identifying a 
claim to check a constraint report.  Separate values with '|'.",
"apihelp-wbcheckconstraints-param-constraintid": "Optional filter to 
return only the constraints that have the specified constraint ID.",
+   "apihelp-wbcheckconstraints-param-status": "Optional filter to return 
only check results with the selected statuses.\n\nNote that only results for 
the 'violation', 'warning' and 'bad-parameters' statuses are cached, so any 
request that is not limited to only those statuses (or a subset of them) does 
not benefit from caching.",
+   "apihelp-wbcheckconstraints-paramvalue-status-compliance": "The 
statement satisfies the constraint.",
+   "apihelp-wbcheckconstraints-paramvalue-status-violation": "The 
statement violates the constraint.",
+   "apihelp-wbcheckconstraints-paramvalue-status-exception": "The subject 
entity of the statement is a known exception to the constraint.",
+   "apihelp-wbcheckconstraints-paramvalue-status-todo": "The constraint is 
not implemented.",
+   "apihelp-wbcheckconstraints-paramvalue-status-bad-parameters": "The 
constraint parameters are broken.",
+   "apihelp-wbcheckconstraints-paramvalue-status-deprecated": "The 
constraint has not been checked because the statement is deprecated.",
+   "apihelp-wbcheckconstraints-paramvalue-status-warning": "The statement 
violates the constraint, but the constraint is not mandatory.",
+   "apihelp-wbcheckconstraints-paramvalue-status-not-in-scope": "The 
constraint is not checked on this kind of snak (main snak, qualifier or 
reference), so the constraint check is skipped.",
"apihelp-wbcheckconstraintparameters-summary": "Checks the constraint 
parameters of constraint statements.",
"apihelp-wbcheckconstraintparameters-extended-description": "Either or 
both of the property and constraintid parameters may be 
specified; all constraints selected by either parameter will be checked.",
"apihelp-wbcheckconstraintparameters-param-propertyid": "List of 
property IDs to check. All constraint statements of these properties will be 
checked.\n\nIf this parameter is specified, it must be nonempty.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 00a7406..fa6b9f2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -56,6 +56,15 @@
"apihelp-wbcheckconstraints-param-id": 
"{{doc-apihelp-param|wbcheckconstraints|id}}",
"apihelp-wbcheckconstraints-param-claimid": 
"{{doc-apihelp-param|wbcheckconstraints|claimid}}",
"apihelp-wbcheckconstraints-param-constraintid": "Sorry, the below 
documentation appears to be outdated, since no such patterns exist in the 
original text under 
translation:\n\n\n{{doc-apihelp-param|wbcheckconstraints|constraintid}}",
+   "apihelp-wbcheckconstraints-param-status": 
"{{doc-apihelp-param|wbcheckconstraints|status}}",
+   "apihelp-wbcheckconstraints-paramvalue-status-compliance": 
"{{doc-apihelp-paramvalue|wbcheckconstraints|status|compliance}}",
+   "apihelp-wbcheckconstraints-paramvalue-status-violation": 
"{{doc-apihelp-paramvalue|wbcheckconstraints|status|violation}}",
+   "apihelp-wbcheckconstraints-paramvalue-status-exception": 
"{{doc-apihelp-paramvalue|wbcheckconstraints|status|exception}}",
+   "apihelp-wbcheckconstraints-paramvalue-status-todo": 
"{{doc-apihelp-paramvalue|wbcheckconstraints|status|todo}}",
+   "apihelp-wbcheckconstraints-paramvalue-status-bad-parameters": 
"{{doc-apihelp-paramvalue|wbcheckconstraints|status|bad-parameters}}",
+   "apihelp-wbcheckconstraints-paramvalue-status-deprecated": 
"{{doc-apihelp-paramvalue|wbcheckconstraints|status|deprecated}}",
+

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Add status parameter to gadget’s API requests

2018-01-15 Thread Lucas Werkmeister (WMDE) (Code Review)

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404322 )

Change subject: Add status parameter to gadget’s API requests
..

Add status parameter to gadget’s API requests

Only with this parameter does the gadget benefit from server-side
caching, otherwise it requests lots of results which we don’t cache and
which therefore require a full constraint check.

(Note: for the check of an individual statement, we don’t cache results
either, but specifying the status at least reduces the response size.)

Bug: T183927
Change-Id: I7457566fdf4181719473dfc84e3ff872b49b3d4b
---
M modules/gadget.js
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
 refs/changes/22/404322/1

diff --git a/modules/gadget.js b/modules/gadget.js
index b368d6e..da4d542 100644
--- a/modules/gadget.js
+++ b/modules/gadget.js
@@ -1,7 +1,8 @@
 ( function( mw, wb, $, OO ) {
'use strict';
 
-   var entityId;
+   var entityId,
+   cachedStatuses = 'violation|warning|bad-parameters';
 
function buildPopup( $content, $container, icon, iconTitleMessageKey, 
flags /* = '' */ ) {
var widget = new OO.ui.PopupButtonWidget( {
@@ -311,7 +312,8 @@
format: 'json',
formatversion: 2,
uselang: lang,
-   id: entityId
+   id: entityId,
+   status: cachedStatuses
} ).then( function( data ) {
$( '.wikibase-statementgroupview 
.wikibase-statementview' )
.each( function () { addReportsToStatement( 
data.wbcheckconstraints[ entityId ], $( this ) ); } );
@@ -337,7 +339,8 @@
format: 'json',
formatversion: 2,
uselang: lang,
-   claimid: statementId
+   claimid: statementId,
+   status: cachedStatuses
} ).then( function( data ) {
var statementClass = 'wikibase-statement-' + 
statementId.replace( /\$/, '\\$$' );
$( '.wikibase-statementgroupview 
.wikibase-statementview.' + statementClass )

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7457566fdf4181719473dfc84e3ff872b49b3d4b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...MediaWikiFarm[master]: Stop MediaWikiTestCase defition appearing for IDEs

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399635 )

Change subject: Stop MediaWikiTestCase defition appearing for IDEs
..


Stop MediaWikiTestCase defition appearing for IDEs

This has been annoying me for a while now.
As I have core and all extensions checked out, my IDE
detects this defition of MediaWikiTestCase as the first,
and as a result all of my typhinting for the actual class
is off.

This patch uses a class alias instead of defining a class and
wraps that in a call_user_func to hide it from IDEs

Change-Id: Iadb86b051da707fa6d6ecee8b7ffe38bd87fff63
---
M tests/phpunit/MediaWikiFarmTestCase.php
1 file changed, 8 insertions(+), 4 deletions(-)

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



diff --git a/tests/phpunit/MediaWikiFarmTestCase.php 
b/tests/phpunit/MediaWikiFarmTestCase.php
index b73f675..2bfef64 100644
--- a/tests/phpunit/MediaWikiFarmTestCase.php
+++ b/tests/phpunit/MediaWikiFarmTestCase.php
@@ -23,9 +23,11 @@
/**
 * Placeholder for MediaWikiTestCase when standalone PHPUnit is 
executed.
 *
-* @package MediaWiki\Tests
+* Use a class alias instead of creating a new 
MediaWikiTestCase.
+* Wrap the alias in a call_user_func call to avoid making IDEs 
think this is the main
+* MediaWikiTestCase definition.
 */
-   class MediaWikiTestCase extends PHPUnit\Framework\TestCase {}
+   call_user_func( 'class_alias', 'PHPUnit\Framework\TestCase', 
'MediaWikiTestCase' );
}
 
# PHPUnit < 6.0
@@ -34,9 +36,11 @@
/**
 * Placeholder for MediaWikiTestCase when standalone PHPUnit is 
executed.
 *
-* @package MediaWiki\Tests
+* Use a class alias instead of creating a new 
MediaWikiTestCase.
+* Wrap the alias in a call_user_func call to avoid making IDEs 
think this is the main
+* MediaWikiTestCase definition.
 */
-   class MediaWikiTestCase extends PHPUnit_Framework_TestCase {} 
// @codingStandardsIgnoreLine Generic.Classes.DuplicateClassName.Found
+   call_user_func( 'class_alias', 'PHPUnit_Framework_TestCase', 
'MediaWikiTestCase' );
}
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iadb86b051da707fa6d6ecee8b7ffe38bd87fff63
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MediaWikiFarm
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Seb35 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: mediawiki.util.test: Set wgFragmentMode before testing getUrl

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404073 )

Change subject: mediawiki.util.test: Set wgFragmentMode before testing getUrl
..


mediawiki.util.test: Set wgFragmentMode before testing getUrl

The result of mw.util.getUrl() depends on wgFragmentMode.
This change sets wgFragmentMode before testing mw.util.getUrl() and
tests the modes 'legacy' and 'html5'.

This change fixes failures on Special:JavaScriptTest when
  $wgFragmentMode = [ 'html5' ];
is set in LocalSettings.php.

Change-Id: Ifc65faacfcddb7d1bb4b298a0940c8f0208a23d7
---
M tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
1 file changed, 10 insertions(+), 0 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js 
b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
index ef894a9..b8464e9 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
@@ -248,14 +248,24 @@
href = util.getUrl( '#Fragment', { action: 'edit' } );
assert.equal( href, '/w/index.php?action=edit#Fragment', 'empty 
title with query string and fragment' );
 
+   mw.config.set( 'wgFragmentMode', [ 'legacy' ] );
href = util.getUrl( 'Foo:Sandbox \xC4#Fragment \xC4', { action: 
'edit' } );
assert.equal( href, 
'/w/index.php?title=Foo:Sandbox_%C3%84=edit#Fragment_.C3.84', 'title 
with query string, fragment, and special characters' );
+
+   mw.config.set( 'wgFragmentMode', [ 'html5' ] );
+   href = util.getUrl( 'Foo:Sandbox \xC4#Fragment \xC4', { action: 
'edit' } );
+   assert.equal( href, 
'/w/index.php?title=Foo:Sandbox_%C3%84=edit#Fragment_Ä', 'title with 
query string, fragment, and special characters' );
 
href = util.getUrl( 'Foo:%23#Fragment', { action: 'edit' } );
assert.equal( href, 
'/w/index.php?title=Foo:%2523=edit#Fragment', 'title containing %23 (#), 
fragment, and a query string' );
 
+   mw.config.set( 'wgFragmentMode', [ 'legacy' ] );
href = util.getUrl( '#+&=:;@$-_.!*/[]<>\'§', { action: 'edit' } 
);
assert.equal( href, 
'/w/index.php?action=edit#.2B.26.3D:.3B.40.24-_..21.2A.2F.5B.5D.3C.3E.27.C2.A7',
 'fragment with various characters' );
+
+   mw.config.set( 'wgFragmentMode', [ 'html5' ] );
+   href = util.getUrl( '#+&=:;@$-_.!*/[]<>\'§', { action: 'edit' } 
);
+   assert.equal( href, 
'/w/index.php?action=edit#+&=:;@$-_.!*/[]<>\'§', 'fragment with various 
characters' );
} );
 
QUnit.test( 'wikiScript', function ( assert ) {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc65faacfcddb7d1bb4b298a0940c8f0208a23d7
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Set as spares labsdb1001 and labsdb1003

2018-01-15 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Set as spares labsdb1001 and labsdb1003
..

mariadb: Set as spares labsdb1001 and labsdb1003

Also removing rests of old labsdb role.

Bug: T142807
Change-Id: I8195d0448c9fba17a6f8d954c01bd0eee98f465a
---
M manifests/site.pp
D modules/role/manifests/mariadb/labs_deprecated.pp
2 files changed, 5 insertions(+), 62 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index 271887a..6f9258b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1165,11 +1165,6 @@
 }
 
 ## labsdb dbs
-node /labsdb100[13]\.eqiad\.wmnet/ {
-# this role is depecated and its nodes scheduled for decom
-role(mariadb::labs_deprecated)
-}
-
 node /labsdb10(09|10|11)\.eqiad\.wmnet/ {
 role(labs::db::replica)
 }
@@ -1191,6 +1186,11 @@
 role(osm::master)
 }
 
+# old labsdbs, to be decommed. T142807
+node /labsdb100[13]\.eqiad\.wmnet/ {
+role(spare::system)
+}
+
 node /labstore100[12]\.eqiad\.wmnet/ {
 # soon to be recommissioned in T158196
 include ::standard
diff --git a/modules/role/manifests/mariadb/labs_deprecated.pp 
b/modules/role/manifests/mariadb/labs_deprecated.pp
deleted file mode 100644
index b943b21..000
--- a/modules/role/manifests/mariadb/labs_deprecated.pp
+++ /dev/null
@@ -1,57 +0,0 @@
-# MariaDB 10 labsdb multiple-shards slave.
-# This role is deprecated but still in use.
-# Use role::labs::db::replica instead
-class role::mariadb::labs_deprecated {
-
-system::role { 'mariadb::labs_deprecated':
-description => 'Labs DB Slave (deprecated role)',
-}
-
-include ::standard
-include ::profile::mariadb::monitor
-include passwords::misc::scripts
-include role::mariadb::ferm
-include ::profile::base::firewall
-include role::labs::db::common
-include role::labs::db::views
-include role::labs::db::check_private_data
-
-class { 'profile::mariadb::monitor::prometheus':
-mysql_group => 'labs',
-mysql_role  => 'slave',
-socket  => '/tmp/mysql.sock',
-}
-
-include mariadb::packages_wmf
-include mariadb::service
-
-class { 'mariadb::config':
-config  => 'role/mariadb/mysqld_config/labs.my.cnf.erb',
-datadir => '/srv/sqldata',
-tmpdir  => '/srv/tmp',
-}
-
-file { '/srv/innodb':
-ensure => directory,
-owner  => 'mysql',
-group  => 'mysql',
-mode   => '0755',
-}
-
-file { '/srv/tokudb':
-ensure => directory,
-owner  => 'mysql',
-group  => 'mysql',
-mode   => '0755',
-}
-
-# Required for TokuDB to start
-# See 
https://mariadb.com/kb/en/mariadb/enabling-tokudb/#check-for-transparent-hugepage-support-on-linux
-sysfs::parameters { 'disable-transparent-hugepages':
-values => {
-'kernel/mm/transparent_hugepage/enabled' => 'never',
-'kernel/mm/transparent_hugepage/defrag'  => 'never',
-}
-}
-}
-

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Move db2043 socket away from /tmp

2018-01-15 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404301 )

Change subject: mariadb: Move db2043 socket away from /tmp
..


mariadb: Move db2043 socket away from /tmp

Bug: T148507
Change-Id: I7c8e1c7d9344f360ac89494cb2691f7c31e554ff
---
M hieradata/hosts/db2043.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/db2043.yaml b/hieradata/hosts/db2043.yaml
index 42ef9b8..654805a 100644
--- a/hieradata/hosts/db2043.yaml
+++ b/hieradata/hosts/db2043.yaml
@@ -1,2 +1 @@
 mariadb::shard: 's3'
-mariadb::socket: '/tmp/mysql.sock'

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Move db2050 socket away from /tmp

2018-01-15 Thread Jcrespo (Code Review)

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404302 )

Change subject: mariadb: Move db2050 socket away from /tmp
..


mariadb: Move db2050 socket away from /tmp

Bug: T148507
Change-Id: I688daf2e327ca54393c88038340da02c6b6f9237
---
M hieradata/hosts/db2050.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/db2050.yaml b/hieradata/hosts/db2050.yaml
index 42ef9b8..654805a 100644
--- a/hieradata/hosts/db2050.yaml
+++ b/hieradata/hosts/db2050.yaml
@@ -1,2 +1 @@
 mariadb::shard: 's3'
-mariadb::socket: '/tmp/mysql.sock'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I688daf2e327ca54393c88038340da02c6b6f9237
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1089 and db1067

2018-01-15 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Depool db1089 and db1067
..

db-eqiad.php: Depool db1089 and db1067

Fixing data drifts

Bug: T162807
Change-Id: Ieb9a1581b10d1fbbebafab45ea5d0720e2e73243
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/06/404306/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index ce25a7a..63932c3 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -104,13 +104,13 @@
 'sectionLoads' => [
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
-   'db1067' => 0,   # D1 2.8TB 160GB, old master
+   # 'db1067' => 0,   # D1 2.8TB 160GB, old master # T162807
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
'db1073' => 50,  # B3 2.8TB 160GB, api
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
-   'db1089' => 500, # C3 3.6TB 512GB
+   # 'db1089' => 500, # C3 3.6TB 512GB # T162807
'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieb9a1581b10d1fbbebafab45ea5d0720e2e73243
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Disable EducationProgram on cs.wikipedia"

2018-01-15 Thread Aklapper (Code Review)

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

Change subject: Revert "Disable EducationProgram on cs.wikipedia"
..

Revert "Disable EducationProgram on cs.wikipedia"

https://gerrit.wikimedia.org/r/#/c/391163/

Bug: T180426
Change-Id: I67fecef534e040865f41819e04596b5677b687de
---
M wmf-config/InitialiseSettings.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/12/404312/1

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 06d52ed..3bc8c5b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8244,6 +8244,7 @@
'abusefilter-log-detail' => true,
'abusefilter-view-private' => true, // T174357
'abusefilter-log-private' => true, // T174357
+   'epcoordinator' => [ 'noratelimit' => true ], // T131684
],
'rollbacker' => [ 'rollback' => true, ], // T126931
'patroller' => [ // T126931
@@ -17352,6 +17353,7 @@
'default' => false,
'arwiki' => true, // T59729
'cawiki' => true, // T73381
+   'cswiki' => true, // T56223
'dewikiversity' => true,
'elwiki' => true, // T58771
'enwiki' => true,
@@ -17374,6 +17376,7 @@
 
 'wmgEducationProgramDYKCat' => [
'default' => 'MyCourses Did You Know',
+   'cswiki' => 'Moje kurzy - Víte že?', // T56223
'eswiki' => 'Mis cursos ¿sabías que?', // T56826
'fawiki' => 'نکته روز ویکی‌پدیا',
'lvwiki' => 'Mani kursi — Vai tu zināji?', // T89898

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I67fecef534e040865f41819e04596b5677b687de
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aklapper 

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

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add vcr cassettes for some classes in wikibase_tests.py

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404287 )

Change subject: Add vcr cassettes for some classes in wikibase_tests.py
..


Add vcr cassettes for some classes in wikibase_tests.py

Add vcr cassettes for some classses in wikibase_tests.py:
- TestRedirects
- TestLinks
- TestNamespaces

Bug: T184081
Change-Id: Ib0d52dc743adf6c7c0d7c683615f1c2b6127efd1
---
A tests/cassettes/wikidata.wikidata/TestNamespaces.test_empty_wikibase_page.yaml
A 
tests/cassettes/wikidata.wikidata/TestNamespaces.test_item_unknown_namespace.yaml
A 
tests/cassettes/wikidata.wikidata/TestNamespaces.test_wikibase_namespace_selection.yaml
A tests/cassettes/wikidata.wikidata/TestRedirects.test_normal_item.yaml
A tests/cassettes/wikidata.wikidata/TestRedirects.test_redirect_item.yaml
A tests/cassettes/wikipedia.af/TestLinks.test_iterlinks_filtering.yaml
M tests/wikibase_tests.py
7 files changed, 2,363 insertions(+), 0 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib0d52dc743adf6c7c0d7c683615f1c2b6127efd1
Gerrit-PatchSet: 8
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Rafidaslam 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Rafidaslam 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: wdqs: simplify logging of categories reload

2018-01-15 Thread Gehel (Code Review)

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

Change subject: wdqs: simplify logging of categories reload
..

wdqs: simplify logging of categories reload

The reload of categories was logged to multiple files, including one that
was timestamped. This generates unnecessary complexity.

My guess is that this multiple logging was done to also log manual reload
of categories, which was usefull during a testing phase where categories
were reloaded manually.

Change-Id: I58199e4c0d4397d2da8308187fb6b870fecf5f80
---
M modules/wdqs/files/cron/reloadCategories.sh
M modules/wdqs/manifests/gui.pp
2 files changed, 8 insertions(+), 17 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/15/404315/1

diff --git a/modules/wdqs/files/cron/reloadCategories.sh 
b/modules/wdqs/files/cron/reloadCategories.sh
index 2710a19..338fa33 100755
--- a/modules/wdqs/files/cron/reloadCategories.sh
+++ b/modules/wdqs/files/cron/reloadCategories.sh
@@ -7,9 +7,10 @@
 newNamespace="categories${today}"
 # Drop old dumps
 rm -f ${DATA_DIR}/*-categories.ttl.gz
-cd $DEPLOY_DIR
+cd ${DEPLOY_DIR}
 # Create new namespace
-bash createNamespace.sh $newNamespace || exit 1
+bash createNamespace.sh ${newNamespace} || exit 1
 # Load the data
-bash forAllCategoryWikis.sh loadCategoryDump.sh $newNamespace >> 
"${LOG_DIR}/${newNamespace}.log"
-replaceNamespace categories $newNamespace
+echo "loading categories in ${newNamespace}"
+bash forAllCategoryWikis.sh loadCategoryDump.sh $newNamespace
+replaceNamespace categories ${newNamespace}
diff --git a/modules/wdqs/manifests/gui.pp b/modules/wdqs/manifests/gui.pp
index d056705..7ff6dfa 100644
--- a/modules/wdqs/manifests/gui.pp
+++ b/modules/wdqs/manifests/gui.pp
@@ -83,7 +83,7 @@
 mode   => '0755',
 }
 
-$cron_log = "${log_dir}/reloadCategories.log"
+$reload_categories_log = "${log_dir}/reloadCategories.log"
 # the reload-categories cron needs to reload nginx once the categories are 
up to date
 sudo::user { "${username}-reload-nginx":
   ensure => present,
@@ -96,7 +96,7 @@
 # do not want them to be too far from one another.
 cron { 'reload-categories':
 ensure  => present,
-command => "/usr/local/bin/reloadCategories.sh >> ${cron_log}",
+command => "/usr/local/bin/reloadCategories.sh >> 
${reload_categories_log}",
 user=> $username,
 weekday => 1,
 minute  => fqdn_rand(60),
@@ -114,7 +114,7 @@
 
 logrotate::rule { 'wdqs-reload-categories':
 ensure   => present,
-file_glob=> $cron_log,
+file_glob=> $reload_categories_log,
 frequency=> 'monthly',
 missing_ok   => true,
 not_if_empty => true,
@@ -134,14 +134,4 @@
 su   => "${username} wikidev",
 }
 
-# Remove categories*.log files after 30 days.
-logrotate::rule { 'wdqs-categories-logs':
-ensure   => present,
-file_glob=> "${log_dir}/categories*.log",
-missing_ok   => true,
-not_if_empty => true,
-rotate   => 0,
-max_age  => 30,
-su   => "${username} wikidev",
-}
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations...prometheus-blazegraph-exporter[master]: Don't depend on blazegraph

2018-01-15 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404316 )

Change subject: Don't depend on blazegraph
..

Don't depend on blazegraph

Partially revert 5c3d9802f6, we'll ship an override in puppet instead

Bug: T184434
Change-Id: I89864487fca1aa87ec5428a7af0192843a17594a
---
M debian/changelog
M debian/service
2 files changed, 6 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/debs/prometheus-blazegraph-exporter 
refs/changes/16/404316/1

diff --git a/debian/changelog b/debian/changelog
index 20c2079..9738003 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+prometheus-blazegraph-exporter (0.4) jessie-wikimedia; urgency=medium
+
+  * Don't start after blazegraph
+
+ -- Filippo Giunchedi   Mon, 15 Jan 2018 17:25:45 +0100
+
 prometheus-blazegraph-exporter (0.3) jessie-wikimedia; urgency=medium
 
   * start after blazegraph
diff --git a/debian/service b/debian/service
index 7761739..764352f 100644
--- a/debian/service
+++ b/debian/service
@@ -1,7 +1,5 @@
 [Unit]
 Description=Prometheus Blazegraph Exporter
-Requires=blazegraph.service
-After=blazegraph.service
 
 [Service]
 Restart=always

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I89864487fca1aa87ec5428a7af0192843a17594a
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/prometheus-blazegraph-exporter
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Clarify `required` true handling with `indicator: 'required'`

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404144 )

Change subject: Clarify `required` true handling with `indicator: 'required'`
..


Clarify `required` true handling with `indicator: 'required'`

Also change demo to use a different indicator.

Bug: T184811
Change-Id: I1651a257760a769b122baa1cc84d686c72e952e8
---
M demos/pages/widgets.php
M php/widgets/MultilineTextInputWidget.php
M php/widgets/TextInputWidget.php
M src/widgets/TextInputWidget.js
4 files changed, 7 insertions(+), 4 deletions(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/demos/pages/widgets.php b/demos/pages/widgets.php
index 9932470..9f1c971 100644
--- a/demos/pages/widgets.php
+++ b/demos/pages/widgets.php
@@ -430,7 +430,7 @@
new OOUI\MultilineTextInputWidget( [
'value' => "Multiline\nMultiline",
'icon' => 'tag',
-   'indicator' => 'required'
+   'indicator' => 'alert'
] ),
[
'label' => "MultilineTextInputWidget (icon, 
indicator)\xE2\x80\x8E",
diff --git a/php/widgets/MultilineTextInputWidget.php 
b/php/widgets/MultilineTextInputWidget.php
index 73d3975..1ccf7d9 100644
--- a/php/widgets/MultilineTextInputWidget.php
+++ b/php/widgets/MultilineTextInputWidget.php
@@ -23,7 +23,8 @@
 * @param number $config['maxLength'] Maximum allowed number of 
characters to input
 * @param int $config['rows'] If multiline, number of visible lines in 
textarea
 * @param bool $config['required'] Mark the field as required.
-*   Implies `indicator: 'required'`. (default: false)
+*   Implies `indicator: 'required'`. Note that `false` & setting 
`indicator: 'required'
+*   will result in no indicator shown. (default: false)
 */
public function __construct( array $config = [] ) {
// Config initialization
diff --git a/php/widgets/TextInputWidget.php b/php/widgets/TextInputWidget.php
index a576f6a..f879c6a 100644
--- a/php/widgets/TextInputWidget.php
+++ b/php/widgets/TextInputWidget.php
@@ -51,7 +51,8 @@
 * @param bool $config['multiline'] Allow multiple lines of text 
(default: false)
 * @param int $config['rows'] If multiline, number of visible lines in 
textarea
 * @param bool $config['required'] Mark the field as required.
-*   Implies `indicator: 'required'`. (default: false)
+*   Implies `indicator: 'required'`. Note that `false` & setting 
`indicator: 'required'
+*   will result in no indicator shown. (default: false)
 * @param bool $config['autocomplete'] If the field should support 
autocomplete
 *   or not (default: true)
 * @param bool $config['spellcheck'] If the field should support 
spellcheck
diff --git a/src/widgets/TextInputWidget.js b/src/widgets/TextInputWidget.js
index 0032013..45908d1 100644
--- a/src/widgets/TextInputWidget.js
+++ b/src/widgets/TextInputWidget.js
@@ -35,7 +35,8 @@
  * @cfg {number} [maxLength] Maximum number of characters allowed in the input.
  * @cfg {string} [labelPosition='after'] The position of the inline label 
relative to that of
  *  the value or placeholder text: `'before'` or `'after'`
- * @cfg {boolean} [required=false] Mark the field as required. Implies 
`indicator: 'required'`.
+ * @cfg {boolean} [required=false] Mark the field as required with `true`. 
Implies `indicator: 'required'`.
+ *  Note that `false` & setting `indicator: 'required' will result in no 
indicator shown.
  * @cfg {boolean} [autocomplete=true] Should the browser support autocomplete 
for this field
  * @cfg {boolean} [spellcheck] Should the browser support spellcheck for this 
field (`undefined` means
  *  leaving it up to the browser).

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1651a257760a769b122baa1cc84d686c72e952e8
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Prtksxna 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: apt: make apt::conf happen before removing apt.conf

2018-01-15 Thread Giuseppe Lavagetto (Code Review)

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404307 )

Change subject: apt: make apt::conf happen before removing apt.conf
..


apt: make apt::conf happen before removing apt.conf

Else, we might end up with a period where packages are installed with an
invalid configuration and can fail to install, or even be installed at
wrong versions.

Change-Id: I321f86d185e642e810e72d21cbcdc964162b6f6e
---
M modules/apt/manifests/init.pp
1 file changed, 14 insertions(+), 8 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified
  Volans: Looks good to me, but someone else must approve



diff --git a/modules/apt/manifests/init.pp b/modules/apt/manifests/init.pp
index ed35d23..9f376a9 100644
--- a/modules/apt/manifests/init.pp
+++ b/modules/apt/manifests/init.pp
@@ -49,14 +49,6 @@
 purge   => $purge_sources,
 }
 
-# This will munge /etc/apt/apt.conf that get's created during installation
-# process (either labs vmbuilder or d-i). Given the ones below exist, it is
-# no longer needed after the installation is over
-file { '/etc/apt/apt.conf':
-ensure => absent,
-notify => Exec['apt-get update'],
-}
-
 if $use_proxy {
 $http_proxy = "http://webproxy.${::site}.wmnet:8080;
 
@@ -66,12 +58,14 @@
 priority => '80',
 key  => 'Acquire::http::Proxy::security.debian.org',
 value=> $http_proxy,
+before   => File['/etc/apt/apt.conf'],
 }
 apt::conf { 'security-cdn-debian-proxy':
 ensure   => present,
 priority => '80',
 key  => 'Acquire::http::Proxy::security-cdn.debian.org',
 value=> $http_proxy,
+before   => File['/etc/apt/apt.conf']
 }
 } elsif $::operatingsystem == 'Ubuntu' {
 apt::conf { 'security-ubuntu-proxy':
@@ -79,6 +73,7 @@
 priority => '80',
 key  => 'Acquire::http::Proxy::security.ubuntu.com',
 value=> $http_proxy,
+before   => File['/etc/apt/apt.conf']
 }
 
 apt::conf { 'ubuntu-cloud-archive-proxy':
@@ -86,6 +81,7 @@
 priority => '80',
 key  => 
'Acquire::http::Proxy::ubuntu-cloud.archive.canonical.com',
 value=> $http_proxy,
+before   => File['/etc/apt/apt.conf']
 }
 
 apt::conf { 'old-releases-proxy':
@@ -93,6 +89,7 @@
 priority => '80',
 key  => 'Acquire::http::Proxy::old-releases.ubuntu.com',
 value=> $http_proxy,
+before   => File['/etc/apt/apt.conf']
 }
 } else {
 fail("Unknown operating system '${::operatingsystem}'.")
@@ -150,5 +147,14 @@
 priority => '90',
 key  => 'APT::Install-Recommends',
 value=> '0',
+before   => File['/etc/apt/apt.conf'],
+}
+
+# This will munge /etc/apt/apt.conf that get's created during installation
+# process (either labs vmbuilder or d-i). Given the ones below exist, it is
+# no longer needed after the installation is over
+file { '/etc/apt/apt.conf':
+ensure => absent,
+notify => Exec['apt-get update'],
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I321f86d185e642e810e72d21cbcdc964162b6f6e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Faidon Liambotis 
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] labs/private[master]: Deprecate passwords::grafana::production

2018-01-15 Thread Alexandros Kosiaris (Code Review)

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404318 )

Change subject: Deprecate passwords::grafana::production
..


Deprecate passwords::grafana::production

Move the data into hiera. Also kill passwords::grafana that seems to be
unused for a long time now

Change-Id: I94f83359acef6e303721b337db99ee0124c608e9
---
A hieradata/role/common/webserver_misc_apps.yaml
M modules/passwords/manifests/init.pp
2 files changed, 4 insertions(+), 6 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/webserver_misc_apps.yaml 
b/hieradata/role/common/webserver_misc_apps.yaml
new file mode 100644
index 000..c373ead
--- /dev/null
+++ b/hieradata/role/common/webserver_misc_apps.yaml
@@ -0,0 +1,2 @@
+profile::grafana::secret_key: a
+profile::grafana::admin_password: 
diff --git a/modules/passwords/manifests/init.pp 
b/modules/passwords/manifests/init.pp
index 2b4dbc8..1b9e2ed 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -398,17 +398,13 @@
 $db_pass = 'dummy'
 }
 
-class passwords::grafana {
-$secret_key = 'a'
-$admin_password = ''
-}
-
+# DEPRECATED - 2017-01-15
 class passwords::grafana::production {
 $secret_key = 'a'
 $admin_password = ''
 }
 
-# DEPRECATE
+# DEPRECATED - 2017-01-15
 class passwords::grafana::labs {
 $secret_key = 'ab'
 $admin_password = 'b'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I94f83359acef6e303721b337db99ee0124c608e9
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1089 and db1067"

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404317 )

Change subject: Revert "db-eqiad.php: Depool db1089 and db1067"
..


Revert "db-eqiad.php: Depool db1089 and db1067"

This reverts commit 185ce935678b0655f07fd1876d270354f5996b8d.

Change-Id: Ic920e3f2ae8e9271c4988f870812c286fe91ced9
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 63932c3..ce25a7a 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -104,13 +104,13 @@
 'sectionLoads' => [
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
-   # 'db1067' => 0,   # D1 2.8TB 160GB, old master # T162807
+   'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
'db1073' => 50,  # B3 2.8TB 160GB, api
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
-   # 'db1089' => 500, # C3 3.6TB 512GB # T162807
+   'db1089' => 500, # C3 3.6TB 512GB
'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic920e3f2ae8e9271c4988f870812c286fe91ced9
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Create "eliminator" user group on ur.wikipedia

2018-01-15 Thread Jayprakash12345 (Code Review)

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

Change subject: Create "eliminator" user group on ur.wikipedia
..

Create "eliminator" user group on ur.wikipedia

Bug: T184607
Change-Id: Ie5ee8a11175968f5269be39291633e8067e6dea4
---
M wmf-config/InitialiseSettings.php
1 file changed, 13 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/27/404327/2

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 06d52ed..a79a49b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -9593,6 +9593,15 @@
'autoeditor' => [ 'autoreview' => true ],
],
'urwiki' => [
+   'eliminator' => [
+   'block' => true,
+   'delete' => true,
+   'deleterevision' => true,
+   'mergehistory' => true,
+   'protect' => true,
+   'suppressredirect'  => true,
+   'deletedhistory' => true
+   ], // T184607
'accountcreator' => [ 'tboverride-account' => true, 
'override-antispoof' => true ], // T137888
'filemover' => [ 'movefile' => true ], // T137888
'interface-editor' => [ 'editinterface' => true ], // T120348
@@ -10464,8 +10473,8 @@
'sysop' => [ 'autoeditor' ],
],
'+urwiki' => [
-   // T44737, T47643, T120348, T133564, T137888, T139302, T144701
-   'bureaucrat' => [ 'import', 'abusefilter', 'rollbacker', 
'massmessage-sender', 'interface-editor' ],
+   // T44737, T47643, T120348, T133564, T137888, T139302, T144701, 
T184607
+   'bureaucrat' => [ 'import', 'abusefilter', 'rollbacker', 
'massmessage-sender', 'interface-editor', 'eliminator' ],
'sysop' => [ 'confirmed', 'abusefilter', 'rollbacker', 
'accountcreator', 'filemover', 'autopatrolled', 'massmessage-sender' ],
],
'+viwiki' => [
@@ -11219,8 +11228,8 @@
'sysop' => [ 'autoeditor' ],
],
'+urwiki' => [
-   // T44737, T47643, T120348, T133564, T137888, T139302, T144701
-   'bureaucrat' => [ 'import', 'abusefilter', 'rollbacker', 
'massmessage-sender', 'interface-editor' ],
+   // T44737, T47643, T120348, T133564, T137888, T139302, T144701, 
T184607
+   'bureaucrat' => [ 'import', 'abusefilter', 'rollbacker', 
'massmessage-sender', 'interface-editor', 'eliminator' ],
'sysop' => [ 'confirmed', 'accountcreator', 'filemover', 
'autopatrolled', 'massmessage-sender' ],
],
'+viwiki' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5ee8a11175968f5269be39291633e8067e6dea4
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jayprakash12345 <0freerunn...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Timeless[master]: OOjs UI: Display windows on top of the fixed header

2018-01-15 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404333 )

Change subject: OOjs UI: Display windows on top of the fixed header
..

OOjs UI: Display windows on top of the fixed header

Workaround copied from Vector.

Bug: T183284
Change-Id: I7a4847f8d7c81e30610964762d6e591d753fa207
---
M resources/ooui.less
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Timeless 
refs/changes/33/404333/1

diff --git a/resources/ooui.less b/resources/ooui.less
index efa2c96..08b70b5 100644
--- a/resources/ooui.less
+++ b/resources/ooui.less
@@ -1,3 +1,8 @@
+.oo-ui-windowManager-modal,
+.skin-timeless .ve-ui-overlay-global {
+   z-index: 101;
+}
+
 .oo-ui-defaultOverlay {
z-index: 101;
font-size: 0.95em;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7a4847f8d7c81e30610964762d6e591d753fa207
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Timeless
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Localisation updates from https://translatewiki.net.

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404257 )

Change subject: Localisation updates from https://translatewiki.net.
..


Localisation updates from https://translatewiki.net.

Change-Id: I3daaebe6bfea25032a619d26ce9a0c4ea8f31562
---
M app/src/main/res/values-bg/strings.xml
M app/src/main/res/values-bn/strings.xml
M app/src/main/res/values-br/strings.xml
M app/src/main/res/values-ca/strings.xml
M app/src/main/res/values-da/strings.xml
M app/src/main/res/values-de/strings.xml
M app/src/main/res/values-es/strings.xml
M app/src/main/res/values-eu/strings.xml
M app/src/main/res/values-fi/strings.xml
M app/src/main/res/values-fr/strings.xml
M app/src/main/res/values-gl/strings.xml
M app/src/main/res/values-in/strings.xml
M app/src/main/res/values-ko/strings.xml
M app/src/main/res/values-lb/strings.xml
M app/src/main/res/values-mk/strings.xml
M app/src/main/res/values-ms/strings.xml
M app/src/main/res/values-pt-rBR/strings.xml
M app/src/main/res/values-pt/strings.xml
M app/src/main/res/values-ru/strings.xml
M app/src/main/res/values-sah/strings.xml
M app/src/main/res/values-skr/strings.xml
M app/src/main/res/values-sr/strings.xml
M app/src/main/res/values-sv/strings.xml
M app/src/main/res/values-zh-rTW/strings.xml
M app/src/main/res/values-zh/strings.xml
25 files changed, 176 insertions(+), 24 deletions(-)

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



diff --git a/app/src/main/res/values-bg/strings.xml 
b/app/src/main/res/values-bg/strings.xml
index 81154bb..0695007 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -241,7 +241,7 @@
   Съобщение: „%s“
   Адресът е копиран в клипборда
   Текстът е копиран в клипборда
-  Прочитане на статия
+  Прочитане на статията
   Добавяне към списъка за 
четене
   Статията не 
може да бъде заредена в офлайн режим.
   Съвет: Добавете 
статията към списък за четене и тя ще бъде изтеглена щом се свържете към 
Интернет.
@@ -270,6 +270,7 @@
   Предпочитане на 
офлайн съдържание
   Пестете мобилни 
данни, като зареждате статии, които са налични в офлайн режим, вместо да 
зареждате последната им версия.
   Включване на офлайн 
библиотека
+  Достъп до пакети 
със статии от Уикипедия (показани като .ZIM файлове), които са били изтеглени 
на устройството Ви за четене, когато нямате мрежа. a 
href=\"https://www.mediawiki.org/wiki/Wikimedia_Apps/Offline_support\"Научете
 повече/a
   За съжаление, приложението се срина 
последния път
   Желаете ли да изпратите доклад за 
срива на HockeyApp / услуга на трети страни, така че Уикимедия да разгледа 
срива и да оправи бъга, който го е причинил?
   Пропускане
@@ -331,8 +332,8 @@
   Отмяна
   %s е изтрит
   Все още няма списъци за четене
-  Запазете статии в 
списъци за четене, така че да можете да ги прегледате по-късно, дори когато 
нямате мрежа.
-  Създавайте 
списъци за четене от статии, които искате да четете по-късно, дори когато 
нямате мрежа!
+  Добавяйте статии в списъци за 
четене по-късно, дори когато нямате мрежа.
+  Добавяйте статии към списък за 
четене по-късно, дори когато нямате Интернет!
   Например
   Места за посещение
   Любими животни
@@ -362,6 +363,9 @@
   Съхранено
   Списък по подразбиране за 
Вашите запазени статии
   Организирайте статии в списъци
+  Създавайте списъци с места за пътуване, 
любими теми и много други
+  %1$s (направен от 
потребител)
+  Има ограничение от 1000 статии за 
списък за четене. Съществуващите списъци с повече от това ограничение бяха 
разделени на няколко списъка.
   
 Тази статия вече е налична офлайн.
 Тези статии вече са налични офлайн.
@@ -420,6 +424,7 @@
   Персонализиране на 
хранилката
   Нулиране на изгледа по 
подразбиране
   Избиране на всички
+  Анулиране на всички 
избрани
   Статии за текущи събития
   Събития в историята на този 
ден
   Бърза връзка обратно към 
четене на отворена статия в един от разделите Ви
@@ -430,6 +435,7 @@
   Начална страница на Уикипедия с 
дневно избрано съдържание
   Генериране на произволни статии за 
четене
   Персонализиране
+  strongПерсонализирайте 
вашата хранилка за откриване/strongbr /br / Сега можете 
да изберете какво да се показва във Вашата хранилка, както и да давате 
приоритет на любимия си вид съдържание.
   Описание на заглавието
   Публикуване
   Добавяне на описание на 
заглавието
@@ -469,7 +475,9 @@
   вашият принос изглеждаше като 
експеримент или вандализъм.
   Ако се интересувате, 
прегледайте a href=\"%1$s\"историята на редакциите/a.
   Няма връзка с 
Интернет. Уверете се, че сте свързани, след което опитайте отново.
+  Нужно е разрешение за 
достъп на съхранението на устройството Ви за офлайн разглеждане.
   Не е позволено четенето от 
съхранението на устройството.
+  В момента разглеждате Уикипедия в офлайн 
режим със статии от Вашата Офлайн библиотека.
   В момента разглеждате офлайн 
Уикипедия от пакети статии във Вашата

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix alignment of Edit pencil when description editing is dis...

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403985 )

Change subject: Fix alignment of Edit pencil when description editing is 
disabled.
..


Fix alignment of Edit pencil when description editing is disabled.

When an article has no description, and description editing is disabled,
the edit pencil wasn't properly aligned.

Bug: T184825
Change-Id: I7a71ec7b77e189e9b47ae96d7952b0afff859dd1
---
M app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git 
a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java 
b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
index 8072167..6e04581 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
+++ b/app/src/main/java/org/wikipedia/page/leadimages/PageHeaderView.java
@@ -274,7 +274,7 @@
 subtitleText.setText(subtitleSpanned());
 subtitleText.setVisibility(VISIBLE);
 } else {
-subtitleText.setVisibility(GONE);
+subtitleText.setVisibility(INVISIBLE);
 }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7a71ec7b77e189e9b47ae96d7952b0afff859dd1
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Dbrant 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: restbase: reprovision restbase1018

2018-01-15 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404325 )

Change subject: restbase: reprovision restbase1018
..

restbase: reprovision restbase1018

Bug: T184100
Change-Id: I3a2ad3c40f24903b9faae012351a310365b01a88
---
M hieradata/role/common/restbase/production.yaml
M hieradata/role/common/restbase/production_ng.yaml
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
4 files changed, 48 insertions(+), 11 deletions(-)


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

diff --git a/hieradata/role/common/restbase/production.yaml 
b/hieradata/role/common/restbase/production.yaml
index 6326ff5..d1f6b2a 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -141,13 +141,13 @@
   # listen_address: 10.64.32.131
   #   c:
   # listen_address: 10.64.32.132
-  "restbase1018.eqiad.wmnet":
-a:
-  listen_address: 10.64.48.98
-b:
-  listen_address: 10.64.48.99
-c:
-  listen_address: 10.64.48.100
+  #"restbase1018.eqiad.wmnet":
+  #  a:
+  #listen_address: 10.64.48.98
+  #  b:
+  #listen_address: 10.64.48.99
+  #  c:
+  #listen_address: 10.64.48.100
   # "restbase2001.codfw.wmnet":
   #   a:
   # listen_address: 10.192.16.162
diff --git a/hieradata/role/common/restbase/production_ng.yaml 
b/hieradata/role/common/restbase/production_ng.yaml
index 4118263..c3d55a9 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -395,6 +395,43 @@
   hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
   saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-c/saved_caches
   jmx_exporter_enabled: true
+  "restbase1018.eqiad.wmnet":
+a:
+  listen_address: 10.64.48.98
+  data_file_directories:
+- /srv/sda4/cassandra-a/data
+- /srv/sdb4/cassandra-a/data
+- /srv/sdc4/cassandra-a/data
+- /srv/sdd4/cassandra-a/data
+  heapdump_directory: /srv/sda4/cassandra-a
+  commitlog_directory: /srv/cassandra/instance-data/cassandra-a/commitlog
+  hints_directory: /srv/cassandra/instance-data/cassandra-a/hints
+  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-a/saved_caches
+  jmx_exporter_enabled: true
+b:
+  listen_address: 10.64.48.99
+  data_file_directories:
+- /srv/sda4/cassandra-b/data
+- /srv/sdb4/cassandra-b/data
+- /srv/sdc4/cassandra-b/data
+- /srv/sdd4/cassandra-b/data
+  heapdump_directory: /srv/sdb4/cassandra-b
+  commitlog_directory: /srv/cassandra/instance-data/cassandra-b/commitlog
+  hints_directory: /srv/cassandra/instance-data/cassandra-b/hints
+  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-b/saved_caches
+  jmx_exporter_enabled: true
+c:
+  listen_address: 10.64.48.100
+  data_file_directories:
+- /srv/sda4/cassandra-c/data
+- /srv/sdb4/cassandra-c/data
+- /srv/sdc4/cassandra-c/data
+- /srv/sdd4/cassandra-c/data
+  heapdump_directory: /srv/sdc4/cassandra-c
+  commitlog_directory: /srv/cassandra/instance-data/cassandra-c/commitlog
+  hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
+  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-c/saved_caches
+  jmx_exporter_enabled: true
   "restbase2001.codfw.wmnet":
 a:
   listen_address: 10.192.16.162
diff --git a/manifests/site.pp b/manifests/site.pp
index 967ed6a..03417e7 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1834,11 +1834,11 @@
 }
 
 # restbase eqiad cluster
-node /^restbase101[3568]\.eqiad\.wmnet$/ {
+node /^restbase101[356]\.eqiad\.wmnet$/ {
 role(spare::system)
 }
 
-node /^restbase10(0[789]|1[01247])\.eqiad\.wmnet$/ {
+node /^restbase10(0[789]|1[012478])\.eqiad\.wmnet$/ {
 role(restbase::production_ng)
 }
 
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index ee406c4..aef94c4 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -155,8 +155,8 @@
 restbase100[0-6]) echo partman/cassandrahosts-5ssd.cfg ;; \
 restbase100[789]|restbase101[0124]) echo 
partman/cassandrahosts-5ssd-jbod.cfg ;; \
 restbase101[35]) echo partman/cassandrahosts-5ssd.cfg ;; \
-restbase1017) echo partman/cassandrahosts-4ssd-jbod.cfg ;; \
-restbase101[68]|restbase-dev100[456]) echo 
partman/cassandrahosts-4ssd.cfg ;; \
+restbase101[78]) echo partman/cassandrahosts-4ssd-jbod.cfg ;; \
+restbase1016|restbase-dev100[456]) echo 
partman/cassandrahosts-4ssd.cfg ;; \
 restbase-test2*)  echo partman/cassandrahosts-2ssd.cfg ;; \

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Fix status parameter documentation

2018-01-15 Thread Lucas Werkmeister (WMDE) (Code Review)

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404326 )

Change subject: Fix status parameter documentation
..

Fix status parameter documentation

Originally, I had planned to support caching for requests with e. g.
only the violation|warning statuses as well. However, while implementing
this, I realized that removing results from the response array structure
is not trivial, and so I changed my mind and we now only cache results
for requests which specify exactly the right three statuses.
Unfortunately, I failed to update the commit message to account for
this change.

Bug: T183927
Change-Id: Id81382c35aa5cac5a995432673727bc53bff9eec
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
 refs/changes/26/404326/1

diff --git a/i18n/en.json b/i18n/en.json
index 7bb971a..f10ed45 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -54,7 +54,7 @@
"apihelp-wbcheckconstraints-param-id": "ID list of the entities to get 
the data from. Separate values with '|' or alternative.",
"apihelp-wbcheckconstraints-param-claimid": "GUID list identifying a 
claim to check a constraint report.  Separate values with '|'.",
"apihelp-wbcheckconstraints-param-constraintid": "Optional filter to 
return only the constraints that have the specified constraint ID.",
-   "apihelp-wbcheckconstraints-param-status": "Optional filter to return 
only check results with the selected statuses.\n\nNote that only results for 
the 'violation', 'warning' and 'bad-parameters' statuses are cached, so any 
request that is not limited to only those statuses (or a subset of them) does 
not benefit from caching.",
+   "apihelp-wbcheckconstraints-param-status": "Optional filter to return 
only check results with the selected statuses.\n\nNote that only results for 
the 'violation', 'warning' and 'bad-parameters' statuses are cached, so only 
requests that are limited to exactly those statuses benefit from caching.",
"apihelp-wbcheckconstraints-paramvalue-status-compliance": "The 
statement satisfies the constraint.",
"apihelp-wbcheckconstraints-paramvalue-status-violation": "The 
statement violates the constraint.",
"apihelp-wbcheckconstraints-paramvalue-status-exception": "The subject 
entity of the statement is a known exception to the constraint.",

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id81382c35aa5cac5a995432673727bc53bff9eec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

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

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Fix usage of string resource for "OK".

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403986 )

Change subject: Fix usage of string resource for "OK".
..


Fix usage of string resource for "OK".

The resource "R.string.OK" should not be used, since this resource
actually comes from Mapbox, and isn't really under our control.

It's better to use Android's built-in resource "android.R.string.OK".

Change-Id: I1231c25434491feb01b3b12993e0cfe54787f10f
---
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java 
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index a74d2ae..494f6e3 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -232,7 +232,7 @@
 @Subscribe public void on(SplitLargeListsEvent event) {
 new AlertDialog.Builder(BaseActivity.this)
 .setMessage(R.string.split_reading_list_message)
-.setPositiveButton(R.string.ok, null)
+.setPositiveButton(android.R.string.ok, null)
 .show();
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1231c25434491feb01b3b12993e0cfe54787f10f
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant 
Gerrit-Reviewer: Brion VIBBER 
Gerrit-Reviewer: Cooltey 
Gerrit-Reviewer: Sharvaniharan 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Enforce limit on 1 with fishing net rule.

2018-01-15 Thread Eileen (Code Review)

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

Change subject: Enforce limit on 1 with fishing net rule.
..

Enforce limit on 1 with fishing net rule.

The fishing net rule is more intensive that other rules so should only run on a
single contact.

On testing I was not hitting a large query using 'merge and go to listing' like
I thought I identified in the ticket so I think people may have been doing a 
merge
& winding up at the main dedupe screen & choosing the rule from there. I'll 
double check
with Leanne if there is another way to trigger a bad query. I think the 
exacerbating thing
here is that if the contact you start from is deleted (standard if they have 
the higher
id) then the redirect back to see other dedupe pairs doesn't find any & you 
wind up
on the main screen.

I think we need to add this hook to fix that flow
https://github.com/civicrm/civicrm-core/pull/11519

Bug: T182251
Change-Id: Idab71e3f11dfac1bab0d1de7ee9258bbdbbedb23
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.module
1 file changed, 4 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/30/404330/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.module 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
index 67664cd..aaf6054 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.module
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.module
@@ -3967,6 +3967,10 @@
 if (!$fields['limit']) {
   $errors['limit'] = ts('Save the database. Use a limit');
 }
+$ruleGroupID = $form->rgid;
+if ($fields['limit'] > 1 && 'fishing_net' === civicrm_api3('RuleGroup', 
'getvalue', ['id' => $ruleGroupID, 'return' => 'name'])) {
+  $errors['limit'] = ts('The fishing net rule should only be applied to a 
single contact');
+}
   }
   if ($formName == 'CRM_Contribute_Form_Contribution') {
 $engageErrors = wmf_civicrm_validate_contribution($fields, $form);

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idab71e3f11dfac1bab0d1de7ee9258bbdbbedb23
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] mediawiki...Vector[master]: OOjs UI: Remove confusing 'position' override

2018-01-15 Thread Code Review

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404396 )

Change subject: OOjs UI: Remove confusing 'position' override
..

OOjs UI: Remove confusing 'position' override

Vector is the only skin that does this, setting 'position: relative'
for .oo-ui-windowManager-modal (normally 'position: static') and for
.ve-ui-overlay-global (normally 'position: absolute').

The override for .oo-ui-windowManager-modal caused it to create a new
stacking context, which is the only reason the 'z-index' override
worked. Use the right selector to override 'z-index' instead.

The override for .ve-ui-overlay-global was completely pointless and
it's surprising that it never broke anything.

Change-Id: Icd1dec43e2da9ef2090b18145099838de3a7890a
---
M skinStyles/ooui.less
1 file changed, 1 insertion(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Vector 
refs/changes/96/404396/1

diff --git a/skinStyles/ooui.less b/skinStyles/ooui.less
index 12123b2..fa03233 100644
--- a/skinStyles/ooui.less
+++ b/skinStyles/ooui.less
@@ -1,9 +1,8 @@
 @import '../variables.less';
 
-.oo-ui-windowManager-modal,
+.skin-vector .oo-ui-windowManager-modal > .oo-ui-dialog,
 .skin-vector .ve-ui-overlay-global {
z-index: 101;
-   position: relative;
 }
 
 .oo-ui-defaultOverlay {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd1dec43e2da9ef2090b18145099838de3a7890a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Add status parameter to gadget’s API requests

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404322 )

Change subject: Add status parameter to gadget’s API requests
..


Add status parameter to gadget’s API requests

Only with this parameter does the gadget benefit from server-side
caching, otherwise it requests lots of results which we don’t cache and
which therefore require a full constraint check.

(Note: for the check of an individual statement, we don’t cache results
either, but specifying the status at least reduces the response size.)

Bug: T183927
Change-Id: I7457566fdf4181719473dfc84e3ff872b49b3d4b
---
M modules/gadget.js
1 file changed, 6 insertions(+), 3 deletions(-)

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



diff --git a/modules/gadget.js b/modules/gadget.js
index b368d6e..da4d542 100644
--- a/modules/gadget.js
+++ b/modules/gadget.js
@@ -1,7 +1,8 @@
 ( function( mw, wb, $, OO ) {
'use strict';
 
-   var entityId;
+   var entityId,
+   cachedStatuses = 'violation|warning|bad-parameters';
 
function buildPopup( $content, $container, icon, iconTitleMessageKey, 
flags /* = '' */ ) {
var widget = new OO.ui.PopupButtonWidget( {
@@ -311,7 +312,8 @@
format: 'json',
formatversion: 2,
uselang: lang,
-   id: entityId
+   id: entityId,
+   status: cachedStatuses
} ).then( function( data ) {
$( '.wikibase-statementgroupview 
.wikibase-statementview' )
.each( function () { addReportsToStatement( 
data.wbcheckconstraints[ entityId ], $( this ) ); } );
@@ -337,7 +339,8 @@
format: 'json',
formatversion: 2,
uselang: lang,
-   claimid: statementId
+   claimid: statementId,
+   status: cachedStatuses
} ).then( function( data ) {
var statementClass = 'wikibase-statement-' + 
statementId.replace( /\$/, '\\$$' );
$( '.wikibase-statementgroupview 
.wikibase-statementview.' + statementClass )

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7457566fdf4181719473dfc84e3ff872b49b3d4b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Ladsgroup 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: Add civitoken extension.

2018-01-15 Thread Eileen (Code Review)

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

Change subject: Add civitoken extension.
..

Add civitoken extension.

This extension adds a load of tokens for use in mailings. The one Major Gifts 
require is the
address block token, which prints out an address block per site config, without 
extra
lines where a field (e.g city) is blank.

Civitoken is an existing extension which is a bit of a dumping ground for random
tokens. I considered trying to port this one into core... until I saw the core 
code
and also trying to strip the relevant extension out into something separate, but
I opted for creating the ability to disable unloved tokens. The ones I have 
enabled are

address_block - formatted address block in html, suitable for MG letters
address_text  - formatted address block in text - mostly for text only emails
conditional_country - I think this is required for the above, printed country 
if not US
(since WMF is configured as US)
today_format_full - yes this really is missing from core - a today's date token
today_format_raw - same deal, mostly useful if some sort of code comparison is 
in play
so maybe not so much for us.

Bug: T184647
Change-Id: I2c6c77acf947b4a252f8708cf6cc938c6109793a
---
M sites/all/modules/wmf_civicrm/wmf_civicrm.install
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/LICENSE.txt
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/README.md
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/ang/civitoken.ang.php
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/ang/civitoken.css
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/ang/civitoken.js
A 
sites/default/civicrm/extensions/nz.co.fuzion.civitoken/ang/civitoken/Setting.html
A 
sites/default/civicrm/extensions/nz.co.fuzion.civitoken/ang/civitoken/Setting.js
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/civitoken.civix.php
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/civitoken.php
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/docs/token_listing.png
A 
sites/default/civicrm/extensions/nz.co.fuzion.civitoken/docs/token_listing_2.png
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/info.xml
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/phpunit.xml.dist
A 
sites/default/civicrm/extensions/nz.co.fuzion.civitoken/settings/Civitoken.setting.php
A 
sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tests/phpunit/CRM/BaseUnitTestClass.php
A 
sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tests/phpunit/CRM/CivitokenTest.php
A 
sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tests/phpunit/bootstrap.php
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tokens/.gitignore
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tokens/README.md
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tokens/address.inc
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tokens/date.inc
A 
sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tokens/latestcontribs.inc
A 
sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tokens/latestcurrentmembership.inc
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tokens/phones.inc
A 
sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tokens/relationships.inc
A 
sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tokens/upcomingevents.inc
A sites/default/civicrm/extensions/nz.co.fuzion.civitoken/tokens/user.inc
28 files changed, 2,548 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/29/404329/1

diff --git a/sites/all/modules/wmf_civicrm/wmf_civicrm.install 
b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
index b92f1c4..dbc86d7 100644
--- a/sites/all/modules/wmf_civicrm/wmf_civicrm.install
+++ b/sites/all/modules/wmf_civicrm/wmf_civicrm.install
@@ -64,8 +64,8 @@
   wmf_civicrm_update_7575();
   wmf_civicrm_update_7580();
   wmf_civicrm_update_7585();
-  wmf_civicrm_update_7595();
   wmf_civicrm_update_7605();
+  wmf_civicrm_update_7610();
 }
 
 /**
@@ -3324,3 +3324,25 @@
   civicrm_api3('extension', 'refresh', array());
   civicrm_api3('extension', 'install', array('key' => 
'org.wikimedia.contacteditor'));
 }
+
+/**
+ * Add civitoken extension.
+ *
+ * We want the formatted address blocks from here.
+ *
+ * We disable most of the others to keep things clean.
+ *
+ * Bug: T184647
+ */
+function wmf_civicrm_update_7610() {
+  civicrm_initialize();
+  civicrm_api3('extension', 'refresh', array());
+  civicrm_api3('extension', 'install', array('key' => 
'nz.co.fuzion.civitoken'));
+  civicrm_api3('Setting', 'create', array('civitoken_enabled_tokens' => array(
+'address.address_block',
+'address.address_text',
+'address.conditional_country',
+'date.today_format_full',
+'date.today_format_raw',
+  )));
+}
diff --git

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Replace db1063 with db1087 as vslow"

2018-01-15 Thread Marostegui (Code Review)

Hello Urbanecm, jenkins-bot, Zoranzoki21,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "db-eqiad.php: Replace db1063 with db1087 as vslow"
..

Revert "db-eqiad.php: Replace db1063 with db1087 as vslow"

This reverts commit 2c00748d80179cf83f3c8f0fe8d5f1d3cc4f8c6f.

Change-Id: I6198e2acc147d19270bb94c5a2ec08e702cf16f5
---
M wmf-config/db-eqiad.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/04/404404/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index d951d47..4aea996 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -169,8 +169,8 @@
],
's8' => [
'db1071' => 0,   # D1 2.8TB 160GB, master
-   # 'db1063' => 0,   # C5 2.8TB 128GB, vslow, dump # to be moved 
to s6
-   'db1087' => 0, # C2 3.6TB 512GB, vslow, dump # db1095 master
+   'db1063' => 0,   # C5 2.8TB 128GB, vslow, dump
+   'db1087' => 500, # C2 3.6TB 512GB, # db1095 master
'db1092' => 300, # D2 3.6TB 512GB, api
'db1099:3318' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
@@ -475,10 +475,10 @@
],
's8' => [
'vslow' => [
-   'db1087' => 1,
+   'db1063' => 1,
],
'dump' => [
-   'db1087' => 1,
+   'db1063' => 1,
],
'api' => [
'db1092' => 3,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6198e2acc147d19270bb94c5a2ec08e702cf16f5
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1092

2018-01-15 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Depool db1092
..

db-eqiad.php: Depool db1092

Needs alter table + kernel upgrade

Bug: T174569
Change-Id: I84fff1b98b578078a9828783c24bca8055fe7cf1
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/05/404405/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index ce25a7a..1d5b980 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -171,10 +171,10 @@
'db1071' => 0,   # D1 2.8TB 160GB, master
# 'db1063' => 0,   # C5 2.8TB 128GB, vslow, dump # to be moved 
to s6
'db1087' => 0, # C2 3.6TB 512GB, vslow, dump # db1095 master
-   'db1092' => 300, # D2 3.6TB 512GB, api
+   # 'db1092' => 300, # D2 3.6TB 512GB, api # T174569
'db1099:3318' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
-   'db1104' => 300,  # B3 3.6TB 512GB, api
+   'db1104' => 100,  # B3 3.6TB 512GB, api
'db1109' => 500,  # D8 3.6TB 512GB
],
 
@@ -481,7 +481,7 @@
'db1087' => 1,
],
'api' => [
-   'db1092' => 3,
+   # 'db1092' => 3,
'db1104' => 1,
],
'watchlist' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I84fff1b98b578078a9828783c24bca8055fe7cf1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1092

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404405 )

Change subject: db-eqiad.php: Depool db1092
..


db-eqiad.php: Depool db1092

Needs alter table + kernel upgrade

Bug: T174569
Change-Id: I84fff1b98b578078a9828783c24bca8055fe7cf1
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index ce25a7a..1d5b980 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -171,10 +171,10 @@
'db1071' => 0,   # D1 2.8TB 160GB, master
# 'db1063' => 0,   # C5 2.8TB 128GB, vslow, dump # to be moved 
to s6
'db1087' => 0, # C2 3.6TB 512GB, vslow, dump # db1095 master
-   'db1092' => 300, # D2 3.6TB 512GB, api
+   # 'db1092' => 300, # D2 3.6TB 512GB, api # T174569
'db1099:3318' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1101:3318' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
-   'db1104' => 300,  # B3 3.6TB 512GB, api
+   'db1104' => 100,  # B3 3.6TB 512GB, api
'db1109' => 500,  # D8 3.6TB 512GB
],
 
@@ -481,7 +481,7 @@
'db1087' => 1,
],
'api' => [
-   'db1092' => 3,
+   # 'db1092' => 3,
'db1104' => 1,
],
'watchlist' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I84fff1b98b578078a9828783c24bca8055fe7cf1
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Revert "puppet: pin to version 3.*"

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/403096 )

Change subject: Revert "puppet: pin to version 3.*"
..


Revert "puppet: pin to version 3.*"

Undo Puppet3 pinning when we have merged the stretch-migration branch which 
migrates our Puppet tree to a Puppet4 compatible format.

This reverts commit 458e47cff5ae09695d724e801e3b1c5d2fb49226.

Change-Id: I3eb187c047efa37a23263d5eb60b9bccdc26d57c
---
M puppet/modules/puppet/manifests/agent.pp
M support/puppet-bootstrap.sh
2 files changed, 1 insertion(+), 8 deletions(-)

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



diff --git a/puppet/modules/puppet/manifests/agent.pp 
b/puppet/modules/puppet/manifests/agent.pp
index a9c1cd1..82f6bab 100644
--- a/puppet/modules/puppet/manifests/agent.pp
+++ b/puppet/modules/puppet/manifests/agent.pp
@@ -18,11 +18,4 @@
 ensure => $ensure,
 enable => $enable,
 }
-
-# T184038: pin puppet to 3.x to prevent accidentally getting Puppet4
-apt::pin { 'puppet':
-package  => 'puppet',
-pin  => 'version 3.*',
-priority => 1001,
-}
 }
diff --git a/support/puppet-bootstrap.sh b/support/puppet-bootstrap.sh
index afec9e8..cf64fff 100755
--- a/support/puppet-bootstrap.sh
+++ b/support/puppet-bootstrap.sh
@@ -17,4 +17,4 @@
 -y \
 -o Dpkg::Options::="--force-confdef" \
 -o Dpkg::Options::="--force-confold" \
-install puppet=3.\* puppet-common=3.\* >/dev/null 2>&1
+install puppet >/dev/null 2>&1

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3eb187c047efa37a23263d5eb60b9bccdc26d57c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db1055 and db1056 for maintenance

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404409 )

Change subject: mariadb: Depool db1055 and db1056 for maintenance
..


mariadb: Depool db1055 and db1056 for maintenance

We will reboot them before pooling them again to apply pending
patches.

Bug: T183469
Change-Id: Iee0a4c8eff82b0c5500e1cf9e57cd1d694a92f0c
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Marostegui: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 1d5b980..5e3271b 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -716,9 +716,9 @@
],
# ExtensionStore shard1
'extension1' => [
-   '10.64.16.20' => 0, # db1031, B1 1.5TB 64GB, master
-   '10.64.32.25' => 1, # db1055, C2 2.8TB 96GB
-   '10.64.32.26' => 1, # db1056, C3 2.8TB 96GB
+   '10.64.16.20' => 1, # db1031, B1 1.5TB 64GB, master
+   # '10.64.32.25' => 1, # db1055, C2 2.8TB 96GB
+   # '10.64.32.26' => 1, # db1056, C3 2.8TB 96GB
],
 ],
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iee0a4c8eff82b0c5500e1cf9e57cd1d694a92f0c
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Don't disable local preferences if a local exception is bein...

2018-01-15 Thread Samwilson (Code Review)

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

Change subject: Don't disable local preferences if a local exception is being 
saved
..

Don't disable local preferences if a local exception is being saved

Local preferences are disabled unless their already flagged as
having a local exception, or such a flag is being set in the
current request.

Bug: T184973
Change-Id: I5c063c9b4c63069b4912a6e0a980fbd94f4750de
---
M includes/GlobalPreferencesFactory.php
1 file changed, 16 insertions(+), 7 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalPreferences 
refs/changes/11/404411/1

diff --git a/includes/GlobalPreferencesFactory.php 
b/includes/GlobalPreferencesFactory.php
index 3d29e59..111af80 100644
--- a/includes/GlobalPreferencesFactory.php
+++ b/includes/GlobalPreferencesFactory.php
@@ -20,6 +20,7 @@
 use RequestContext;
 use SpecialPage;
 use User;
+use WebRequest;
 
 /**
  * Global preferences.
@@ -106,7 +107,7 @@
if ( $this->onGlobalPrefsPage() ) {
return $this->getPreferencesGlobal( $preferences, 
$globalPrefNames );
}
-   return $this->getPreferencesLocal( $preferences, 
$globalPrefNames );
+   return $this->getPreferencesLocal( $preferences, 
$globalPrefNames, $context->getRequest() );
}
 
/**
@@ -114,18 +115,26 @@
 * and add the link to Special:GlobalPreferences to the personal 
preferences tab.
 * @param mixed[][] $preferences The preferences array.
 * @param string[] $globalPrefNames The names of those preferences that 
are already global.
+* @param WebRequest $request The current request, to check for local 
exceptions being set.
 * @return mixed[][]
 */
-   protected function getPreferencesLocal( $preferences, $globalPrefNames 
) {
+   protected function getPreferencesLocal( $preferences, $globalPrefNames, 
WebRequest $request ) {
$modifiedPrefs = [];
foreach ( $preferences as $name => $def ) {
$modifiedPrefs[$name] = $def;
 
// If this has been set globally.
if ( in_array( $name, $globalPrefNames ) ) {
-   // Disable this preference unless it has a 
local exception.
-   $localException = $this->user->getOption( $name 
. static::LOCAL_EXCEPTION_SUFFIX );
-   $modifiedPrefs[$name]['disabled'] = is_null( 
$localException );
+   // Disable this local preference unless it 
either
+   // A) already has a local exception, or
+   // B) a local exception is being enabled in the 
current request.
+   // This is because HTMLForm changes submitted 
values to their defaults
+   // after preferences have been defined here, if 
a field is disabled.
+   $localExName = $name . 
static::LOCAL_EXCEPTION_SUFFIX;
+   $localExValue = $this->user->getOption( 
$localExName );
+   $requestHasLocalEx = $request->getVal( 'wp' . 
$localExName );
+   $modifiedPrefs[$name]['disabled'] = is_null( 
$localExValue )
+   && is_null( $requestHasLocalEx );
 
// Add a new local exception preference after 
this one.
$cssClasses = [
@@ -134,10 +143,10 @@
];
$secFragment = static::getSectionFragmentId( 
$def['section'] );
$labelMsg = wfMessage( 
'globalprefs-set-local-exception', [ $secFragment ] );
-   $modifiedPrefs[ $name . 
static::LOCAL_EXCEPTION_SUFFIX ] = [
+   $modifiedPrefs[ $localExName ] = [
'type' => 'toggle',
'label-raw' => $labelMsg->parse(),
-   'default' => $this->user->getOption( 
$name . static::LOCAL_EXCEPTION_SUFFIX ),
+   'default' => $localExValue,
'section' => $def['section'],
'cssclass' => join( ' ', $cssClasses ),
];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5c063c9b4c63069b4912a6e0a980fbd94f4750de
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalPreferences
Gerrit-Branch: master
Gerrit-Owner: Samwilson

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Replace Package[portmap] with Package[rpcbind]

2018-01-15 Thread BryanDavis (Code Review)

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

Change subject: Replace Package[portmap] with Package[rpcbind]
..

Replace Package[portmap] with Package[rpcbind]

The portmap package is a pure virtual package that is actually provided
by the rpcbind package.

Bug: T184497
Change-Id: Iec888b634627b9c17323016c4e7e4692251687da
---
M puppet/modules/mwv/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/03/404403/1

diff --git a/puppet/modules/mwv/manifests/packages.pp 
b/puppet/modules/mwv/manifests/packages.pp
index f0b2eee..1bb6c4a 100644
--- a/puppet/modules/mwv/manifests/packages.pp
+++ b/puppet/modules/mwv/manifests/packages.pp
@@ -24,7 +24,7 @@
 # mess with the default apt cache location.
 require_package(
 'nfs-common',
-'portmap',
+'rpcbind',
 )
 
 # Cron resources need a cron provider installed

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec888b634627b9c17323016c4e7e4692251687da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] operations/software[master]: s8.hosts: Add dbstore2001

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404406 )

Change subject: s8.hosts: Add dbstore2001
..


s8.hosts: Add dbstore2001

dbstore2001 has now s8 on port 3318

Bug: T177208
Change-Id: I079cf27bbe0b816560c6cbad6fcea03b98795e68
---
M dbtools/s8.hosts
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/dbtools/s8.hosts b/dbtools/s8.hosts
index 4192671..1b725c5 100644
--- a/dbtools/s8.hosts
+++ b/dbtools/s8.hosts
@@ -1,3 +1,4 @@
+dbstore2001.codfw.wmnet3318
 db2086.codfw.wmnet 3318
 db2085.codfw.wmnet 3318
 db2083.codfw.wmnet 3306

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I079cf27bbe0b816560c6cbad6fcea03b98795e68
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Depool db1055 and db1056 for maintenance

2018-01-15 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Depool db1055 and db1056 for maintenance
..

mariadb: Depool db1055 and db1056 for maintenance

We will reboot them before pooling them again to apply pending
patches.

Bug: T183469
Change-Id: Iee0a4c8eff82b0c5500e1cf9e57cd1d694a92f0c
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/09/404409/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 63932c3..f140a51 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -716,9 +716,9 @@
],
# ExtensionStore shard1
'extension1' => [
-   '10.64.16.20' => 0, # db1031, B1 1.5TB 64GB, master
-   '10.64.32.25' => 1, # db1055, C2 2.8TB 96GB
-   '10.64.32.26' => 1, # db1056, C3 2.8TB 96GB
+   '10.64.16.20' => 1, # db1031, B1 1.5TB 64GB, master
+   # '10.64.32.25' => 1, # db1055, C2 2.8TB 96GB
+   # '10.64.32.26' => 1, # db1056, C3 2.8TB 96GB
],
 ],
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iee0a4c8eff82b0c5500e1cf9e57cd1d694a92f0c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

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

[MediaWiki-commits] [Gerrit] operations/software[master]: s8.hosts: Add a dbstore and labs servers

2018-01-15 Thread Marostegui (Code Review)

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

Change subject: s8.hosts: Add a dbstore and labs servers
..

s8.hosts: Add a dbstore and labs servers

dbstore and labs servers also replicate wikidata and thus need to be
added to s8.hosts

Bug: T174569
Change-Id: I45ae4deadc51c0ed591a42a47079e67a48241486
---
M dbtools/s8.hosts
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/07/404407/1

diff --git a/dbtools/s8.hosts b/dbtools/s8.hosts
index 1b725c5..cf39842 100644
--- a/dbtools/s8.hosts
+++ b/dbtools/s8.hosts
@@ -7,6 +7,11 @@
 db2080.codfw.wmnet 3306
 db2079.codfw.wmnet 3306
 db2045.codfw.wmnet 3306
+dbstore1001.eqiad.wmnet3306
+dbstore1002.eqiad.wmnet3306
+labsdb1011.eqiad.wmnet 3306
+labsdb1010.eqiad.wmnet 3306
+labsdb1009.eqiad.wmnet 3306
 db1109.eqiad.wmnet 3306
 db1104.eqiad.wmnet 3306
 db1101.eqiad.wmnet 3318

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45ae4deadc51c0ed591a42a47079e67a48241486
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] operations/software[master]: s8.hosts: Add sanitarium to s8

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404408 )

Change subject: s8.hosts: Add sanitarium to s8
..


s8.hosts: Add sanitarium to s8

db1095 is the sanitarium host for s8

Change-Id: I950a3df62a23549ad4822614dd097009dcd56652
---
M dbtools/s8.hosts
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/dbtools/s8.hosts b/dbtools/s8.hosts
index cf39842..a50ae72 100644
--- a/dbtools/s8.hosts
+++ b/dbtools/s8.hosts
@@ -12,6 +12,7 @@
 labsdb1011.eqiad.wmnet 3306
 labsdb1010.eqiad.wmnet 3306
 labsdb1009.eqiad.wmnet 3306
+db1095.eqiad.wmnet 3306
 db1109.eqiad.wmnet 3306
 db1104.eqiad.wmnet 3306
 db1101.eqiad.wmnet 3318

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I950a3df62a23549ad4822614dd097009dcd56652
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
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] operations/mediawiki-config[master]: db-eqiad.php: Depool db1066 and db1089

2018-01-15 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Depool db1066 and db1089
..

db-eqiad.php: Depool db1066 and db1089

Fixing data drifts

Bug: T162807
Change-Id: I79579c883b10050a9a8b04faedb1e8eb45c53113
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/10/404410/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 5e3271b..8e4c9fc 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -106,11 +106,11 @@
'db1052' => 0,   # B3 2.8TB  96GB, master
'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
-   'db1066' => 50,  # D1 2.8TB 160GB, api
+   # 'db1066' => 50,  # D1 2.8TB 160GB, api # T162807
'db1073' => 50,  # B3 2.8TB 160GB, api
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
-   'db1089' => 500, # C3 3.6TB 512GB
+   # 'db1089' => 500, # C3 3.6TB 512GB # T162807
'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],
@@ -288,7 +288,7 @@
'api' => [
'db1080' => 1,
'db1073' => 1,
-   'db1066' => 1,
+   # 'db1066' => 1,
],
],
's2' => [

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79579c883b10050a9a8b04faedb1e8eb45c53113
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Replace Package[portmap] with Package[rpcbind]

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404403 )

Change subject: Replace Package[portmap] with Package[rpcbind]
..


Replace Package[portmap] with Package[rpcbind]

The portmap package is a pure virtual package that is actually provided
by the rpcbind package.

Bug: T184497
Change-Id: Iec888b634627b9c17323016c4e7e4692251687da
---
M puppet/modules/mwv/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/puppet/modules/mwv/manifests/packages.pp 
b/puppet/modules/mwv/manifests/packages.pp
index f0b2eee..1bb6c4a 100644
--- a/puppet/modules/mwv/manifests/packages.pp
+++ b/puppet/modules/mwv/manifests/packages.pp
@@ -24,7 +24,7 @@
 # mess with the default apt cache location.
 require_package(
 'nfs-common',
-'portmap',
+'rpcbind',
 )
 
 # Cron resources need a cron provider installed

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec888b634627b9c17323016c4e7e4692251687da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/software[master]: s8.hosts: Add a dbstore and labs servers

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404407 )

Change subject: s8.hosts: Add a dbstore and labs servers
..


s8.hosts: Add a dbstore and labs servers

dbstore and labs servers also replicate wikidata and thus need to be
added to s8.hosts

Bug: T174569
Change-Id: I45ae4deadc51c0ed591a42a47079e67a48241486
---
M dbtools/s8.hosts
1 file changed, 5 insertions(+), 0 deletions(-)

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



diff --git a/dbtools/s8.hosts b/dbtools/s8.hosts
index 1b725c5..cf39842 100644
--- a/dbtools/s8.hosts
+++ b/dbtools/s8.hosts
@@ -7,6 +7,11 @@
 db2080.codfw.wmnet 3306
 db2079.codfw.wmnet 3306
 db2045.codfw.wmnet 3306
+dbstore1001.eqiad.wmnet3306
+dbstore1002.eqiad.wmnet3306
+labsdb1011.eqiad.wmnet 3306
+labsdb1010.eqiad.wmnet 3306
+labsdb1009.eqiad.wmnet 3306
 db1109.eqiad.wmnet 3306
 db1104.eqiad.wmnet 3306
 db1101.eqiad.wmnet 3318

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I45ae4deadc51c0ed591a42a47079e67a48241486
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
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] operations/software[master]: s8.hosts: Add sanitarium to s8

2018-01-15 Thread Marostegui (Code Review)

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

Change subject: s8.hosts: Add sanitarium to s8
..

s8.hosts: Add sanitarium to s8

db1095 is the sanitarium host for s8

Change-Id: I950a3df62a23549ad4822614dd097009dcd56652
---
M dbtools/s8.hosts
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/08/404408/1

diff --git a/dbtools/s8.hosts b/dbtools/s8.hosts
index cf39842..a50ae72 100644
--- a/dbtools/s8.hosts
+++ b/dbtools/s8.hosts
@@ -12,6 +12,7 @@
 labsdb1011.eqiad.wmnet 3306
 labsdb1010.eqiad.wmnet 3306
 labsdb1009.eqiad.wmnet 3306
+db1095.eqiad.wmnet 3306
 db1109.eqiad.wmnet 3306
 db1104.eqiad.wmnet 3306
 db1101.eqiad.wmnet 3318

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I950a3df62a23549ad4822614dd097009dcd56652
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1066 and db1089

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404410 )

Change subject: db-eqiad.php: Depool db1066 and db1089
..


db-eqiad.php: Depool db1066 and db1089

Fixing data drifts

Bug: T162807
Change-Id: I79579c883b10050a9a8b04faedb1e8eb45c53113
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 5e3271b..8e4c9fc 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -106,11 +106,11 @@
'db1052' => 0,   # B3 2.8TB  96GB, master
'db1067' => 0,   # D1 2.8TB 160GB, old master
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
-   'db1066' => 50,  # D1 2.8TB 160GB, api
+   # 'db1066' => 50,  # D1 2.8TB 160GB, api # T162807
'db1073' => 50,  # B3 2.8TB 160GB, api
'db1080' => 300, # A2 3.6TB 512GB, api
'db1083' => 500, # B1 3.6TB 512GB
-   'db1089' => 500, # C3 3.6TB 512GB
+   # 'db1089' => 500, # C3 3.6TB 512GB # T162807
'db1099:3311' => 1,   # B2 3.6TB 512GB # rc, log: s1 and s8
'db1105:3311' => 1,   # C3 3.6TB 512GB # rc, log: s1 and s2
],
@@ -288,7 +288,7 @@
'api' => [
'db1080' => 1,
'db1073' => 1,
-   'db1066' => 1,
+   # 'db1066' => 1,
],
],
's2' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79579c883b10050a9a8b04faedb1e8eb45c53113
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add lazy loading and image rows

2018-01-15 Thread StudentSydney (Code Review)

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

Change subject: Add lazy loading and image rows
..

Add lazy loading and image rows

Lazily load images for the image result bowser. Display images in rows of 
varying height, with
every elment in a row of the same height. This prevents staggaring at the 
bottom and makes the
order of images clear. Images load in parallel and rows display as soon as 
every image in the
row loads.

Bug: T166216
Change-Id: I8447b28c0db0015a257879dc77c1a74c44f3c62c
---
M embed.html
M index.html
M style.less
M wikibase/queryService/ui/ResultView.js
M wikibase/queryService/ui/resultBrowser/ImageResultBrowser.js
A wikibase/tests/queryService/ui/resultBrowser/ImageResultBrowser.test.js
M wikibase/tests/queryService/ui/resultBrowser/ResultBrowser.test.js
7 files changed, 337 insertions(+), 72 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/02/404402/1

diff --git a/embed.html b/embed.html
index 708a3f2..bdb66bc 100644
--- a/embed.html
+++ b/embed.html
@@ -108,7 +108,10 @@
 .header-toolbar:hover {
opacity: 1;
 }
-
+.img-grid {
+   width: 95vw;
+}
+   
 
 

@@ -130,7 +133,6 @@



-   

https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help/Result_Views;>

diff --git a/index.html b/index.html
index 031dbd4..ac585a4 100644
--- a/index.html
+++ b/index.html
@@ -260,6 +260,12 @@

Test 
error

+   
+   
+   
+   Loading...
+   
+   
 


diff --git a/style.less b/style.less
index a743b1b..90fe29a 100644
--- a/style.less
+++ b/style.less
@@ -394,75 +394,64 @@
color: rgba( 51, 122, 183, 0.45 );
 }
 
-/* masonry */
-.masonry {
+/* image grid */
+.img-grid {
width: 95%;
margin: 3em auto;
-   margin: 1.5em 0;
+   margin: 1.5em auto;
padding: 0;
-   -moz-column-gap: 1.5em;
-   -webkit-column-gap: 1.5em;
-   column-gap: 1.5em;
font-size: 0.85em;
 }
-.item > a > img {
+.item.hidden {
+   visibility: hidden;
+}
+.item-row {
width: 100%;
-   display: inline-block;
+}
+.hidden-row {
+   height: 50px;
+   visibility: hidden;
 }
 .item {
-   display: inline-block;
background: #fff;
padding: 1em;
-   margin: 0 0 1.5em;
-   width: 100%;
+   margin: 0 0.75em 1.5em;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-shadow: 2px 2px 4px 0 #ccc;
+   display: inline-block;
+}
+.hidden-row>.item{
+   display: none;
+}
+.item-img {
+   width: 100%;
+}
+.summary>div {
+   height: 1.5em;
+}
+.summary>div>span {
+   white-space: nowrap;
+text-overflow: ellipsis;
+display: block;
+overflow: hidden;
+}
+.summary .glyphicon {
+   display: inline;
 }
 
-@media only screen and ( min-width: 400px ) {
-   .masonry {
-   -moz-column-count: 2;
-   -webkit-column-count: 2;
-   column-count: 2;
-   }
+/* loading spinner */
+#loading-spinner {
+   display: none;
+   color: #777;
+}
+#loading-spinner>.fa-spinner {
+   margin: 0 auto 20px;
+   display: block;
 }
 
-@media only screen and ( min-width: 700px ) {
-   .masonry {
-   -moz-column-count: 3;
-   -webkit-column-count: 3;
-   column-count: 3;
-   }
-}
-
-@media only screen and ( min-width: 900px ) {
-   .masonry {
-   -moz-column-count: 4;
-   -webkit-column-count: 4;
-   column-count: 4;
-   }
-}
-
-@media only screen and ( min-width: 1100px ) {
-   .masonry {
-   -moz-column-count: 5;
-   -webkit-column-count: 5;
-   column-count: 5;
-   }
-}
-
-@media only screen and ( min-width: 1280px ) {
-   .wrapper {
-   width: 1260px;
-   }
-}
-
-/*
-   ActionBar
-*/
-
+/* ActionBar */
 .action-bar .progress {
height: 30px;
font-size: 30px;
diff --git a/wikibase/queryService/ui/ResultView.js 
b/wikibase/queryService/ui/ResultView.js
index 8332078..c12b012 100644
--- a/wikibase/queryService/ui/ResultView.js
+++ b/wikibase/queryService/ui/ResultView.js
@@ -477,7 +477,9 @@
 */
SELF.prototype._drawResult = function( resultBrowser ) {
var self = this;
-
+   
+   $(

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "mariadb: Depool db1055 and db1056 for maintenance"

2018-01-15 Thread Jcrespo (Code Review)

Hello Urbanecm, Marostegui, jenkins-bot, Zoranzoki21,

I'd like you to do a code review.  Please visit

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

to review the following change.


Change subject: Revert "mariadb: Depool db1055 and db1056 for maintenance"
..

Revert "mariadb: Depool db1055 and db1056 for maintenance"

This reverts commit e26eaae65150ccbc2f8cea888ace9579894a7698.

Change-Id: I66250c6b5ec7397759491f8ca297c46131f0bac8
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/12/404412/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 5e3271b..1d5b980 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -716,9 +716,9 @@
],
# ExtensionStore shard1
'extension1' => [
-   '10.64.16.20' => 1, # db1031, B1 1.5TB 64GB, master
-   # '10.64.32.25' => 1, # db1055, C2 2.8TB 96GB
-   # '10.64.32.26' => 1, # db1056, C3 2.8TB 96GB
+   '10.64.16.20' => 0, # db1031, B1 1.5TB 64GB, master
+   '10.64.32.25' => 1, # db1055, C2 2.8TB 96GB
+   '10.64.32.26' => 1, # db1056, C3 2.8TB 96GB
],
 ],
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66250c6b5ec7397759491f8ca297c46131f0bac8
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/software[master]: s8.hosts: Add dbstore2001

2018-01-15 Thread Marostegui (Code Review)

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

Change subject: s8.hosts: Add dbstore2001
..

s8.hosts: Add dbstore2001

dbstore2001 has now s8 on port 3318

Bug: T177208
Change-Id: I079cf27bbe0b816560c6cbad6fcea03b98795e68
---
M dbtools/s8.hosts
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/06/404406/1

diff --git a/dbtools/s8.hosts b/dbtools/s8.hosts
index 4192671..1b725c5 100644
--- a/dbtools/s8.hosts
+++ b/dbtools/s8.hosts
@@ -1,3 +1,4 @@
+dbstore2001.codfw.wmnet3318
 db2086.codfw.wmnet 3318
 db2085.codfw.wmnet 3318
 db2083.codfw.wmnet 3306

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I079cf27bbe0b816560c6cbad6fcea03b98795e68
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: scholarships: Add OAuth provisioning

2018-01-15 Thread BryanDavis (Code Review)

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

Change subject: scholarships: Add OAuth provisioning
..

scholarships: Add OAuth provisioning

Provision an OAuth consumer and configure Scholarships to use it.

When adding this functionality to an existing VM where Scholarships has
already been provisioned the user will need to delete their existing
/vagrant/srv/scholarships/.env file. The Puppet module does not modify
existing environment files to allow for easier local debugging.

Bug: T119534
Change-Id: I097b8784d050c0fb5e93f92ab25512d3b7d9fb4d
---
M puppet/hieradata/common.yaml
M puppet/modules/role/manifests/scholarships.pp
M puppet/modules/scholarships/manifests/init.pp
M puppet/modules/scholarships/templates/env.erb
4 files changed, 30 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/98/404398/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 700b8d5..2d78951 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -442,6 +442,9 @@
 role::phragile::install_dir: "%{hiera('mwv::services_dir')}/phragile"
 role::phragile::vhost_name: "phragile%{hiera('mwv::tld')}"
 
+role::scholarships::oauth_consumer_key: b7228f20b437989dbfc09178085df71a
+role::scholarships::oauth_secret_key: 3f01bf19915f3a56d9f6e5b5b7729593
+
 role::sentry::dsn: "%{hiera('sentry::dsn_file')}"
 
 role::wikidata::main_page: "Wiki:Main Page"
@@ -455,6 +458,9 @@
 scholarships::deploy_dir: "%{hiera('mwv::services_dir')}/scholarships"
 scholarships::cache_dir: /var/cache/scholarships
 scholarships::log_file: /vagrant/logs/scholarships.log
+scholarships::oauth_server: 
"http://dev.wiki.local.wmftest.net%{::port_fragment};
+scholarships::oauth_consumer_token: b7228f20b437989dbfc09178085df71a
+scholarships::oauth_secret_token: f7841ded67f3f290360c67d347f9a62c85f171e5
 
 sentry::db_name: sentry
 sentry::db_user: sentry
diff --git a/puppet/modules/role/manifests/scholarships.pp 
b/puppet/modules/role/manifests/scholarships.pp
index 5511bd0..b40b2fa 100644
--- a/puppet/modules/role/manifests/scholarships.pp
+++ b/puppet/modules/role/manifests/scholarships.pp
@@ -4,6 +4,18 @@
 # *Note*: The application is provisioned using an Apache named virtual host.
 # Once the role is enabled and provisioned use the URL
 # http://scholarships.local.wmftest.net:8080/ to access the site.
-class role::scholarships {
+class role::scholarships (
+$oauth_consumer_key,
+$oauth_secret_key,
+) {
+include ::mediawiki
 include ::scholarships
+
+role::oauth::consumer { 'Wikimania Scholarships':
+description  => 'Wikimania Scholarships',
+consumer_key => $oauth_consumer_key,
+secret_key   => $oauth_secret_key,
+callback_url => 
"http://${::scholarships::vhost_name}${::port_fragment}/;,
+grants   => ['authonlyprivate'],
+}
 }
diff --git a/puppet/modules/scholarships/manifests/init.pp 
b/puppet/modules/scholarships/manifests/init.pp
index 492a4e5..2f45a9c 100644
--- a/puppet/modules/scholarships/manifests/init.pp
+++ b/puppet/modules/scholarships/manifests/init.pp
@@ -37,6 +37,9 @@
 $vhost_name,
 $cache_dir,
 $log_file,
+$oauth_server,
+$oauth_consumer_token,
+$oauth_secret_token,
 ){
 include ::php
 include ::apache
diff --git a/puppet/modules/scholarships/templates/env.erb 
b/puppet/modules/scholarships/templates/env.erb
index 92c38a0..22eadc6 100644
--- a/puppet/modules/scholarships/templates/env.erb
+++ b/puppet/modules/scholarships/templates/env.erb
@@ -24,6 +24,14 @@
 ; Value should be compatible with PHP's strtotime() function
 APPLICATION_CLOSE=2038-01-01T00:00
 
+; OAuth settings
+USE_OAUTH=true
+OAUTH_CONSUMER_TOKEN=<%= @oauth_consumer_token %>
+OAUTH_SECRET_TOKEN=<%= @oauth_secret_token %>
+OAUTH_ENDPOINT="<%= @oauth_server %>/w/index.php?title=Special:OAuth"
+OAUTH_REDIR="<%= @oauth_server %>/wiki/Special:OAuth/authenticate?"
+OAUTH_CALLBACK=http://<%= @vhost_name %><%= scope['::port_fragment'] 
%>/oauth/callback
+
 ; This is a testing deployment
 MOCK=1
 SLIM_MODE=development

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I097b8784d050c0fb5e93f92ab25512d3b7d9fb4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "Disable EducationProgram on cs.wikipedia"

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404312 )

Change subject: Revert "Disable EducationProgram on cs.wikipedia"
..


Revert "Disable EducationProgram on cs.wikipedia"

https://gerrit.wikimedia.org/r/#/c/391163/

Bug: T180426
Change-Id: I67fecef534e040865f41819e04596b5677b687de
---
M wmf-config/InitialiseSettings.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 06d52ed..3bc8c5b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -8244,6 +8244,7 @@
'abusefilter-log-detail' => true,
'abusefilter-view-private' => true, // T174357
'abusefilter-log-private' => true, // T174357
+   'epcoordinator' => [ 'noratelimit' => true ], // T131684
],
'rollbacker' => [ 'rollback' => true, ], // T126931
'patroller' => [ // T126931
@@ -17352,6 +17353,7 @@
'default' => false,
'arwiki' => true, // T59729
'cawiki' => true, // T73381
+   'cswiki' => true, // T56223
'dewikiversity' => true,
'elwiki' => true, // T58771
'enwiki' => true,
@@ -17374,6 +17376,7 @@
 
 'wmgEducationProgramDYKCat' => [
'default' => 'MyCourses Did You Know',
+   'cswiki' => 'Moje kurzy - Víte že?', // T56223
'eswiki' => 'Mis cursos ¿sabías que?', // T56826
'fawiki' => 'نکته روز ویکی‌پدیا',
'lvwiki' => 'Mani kursi — Vai tu zināji?', // T89898

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I67fecef534e040865f41819e04596b5677b687de
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Aklapper 
Gerrit-Reviewer: Chad 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[stretch-migration]: scholarships: Add OAuth provisioning

2018-01-15 Thread BryanDavis (Code Review)

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

Change subject: scholarships: Add OAuth provisioning
..

scholarships: Add OAuth provisioning

Provision an OAuth consumer and configure Scholarships to use it.

When adding this functionality to an existing VM where Scholarships has
already been provisioned the user will need to delete their existing
/vagrant/srv/scholarships/.env file. The Puppet module does not modify
existing environment files to allow for easier local debugging.

Bug: T119534
Change-Id: I097b8784d050c0fb5e93f92ab25512d3b7d9fb4d
---
M puppet/hieradata/common.yaml
M puppet/modules/role/manifests/scholarships.pp
M puppet/modules/scholarships/manifests/init.pp
M puppet/modules/scholarships/templates/env.erb
4 files changed, 30 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/97/404397/1

diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 0ab34fe..2b53491 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -431,6 +431,9 @@
 role::phragile::install_dir: "%{hiera('mwv::services_dir')}/phragile"
 role::phragile::vhost_name: "phragile%{hiera('mwv::tld')}"
 
+role::scholarships::oauth_consumer_key: b7228f20b437989dbfc09178085df71a
+role::scholarships::oauth_secret_key: 3f01bf19915f3a56d9f6e5b5b7729593
+
 role::sentry::dsn: "%{hiera('sentry::dsn_file')}"
 
 role::wikidata::main_page: "Wiki:Main Page"
@@ -442,6 +445,9 @@
 scholarships::deploy_dir: "%{hiera('mwv::services_dir')}/scholarships"
 scholarships::cache_dir: /var/cache/scholarships
 scholarships::log_file: /vagrant/logs/scholarships.log
+scholarships::oauth_server: 
"http://dev.wiki.local.wmftest.net%{::port_fragment};
+scholarships::oauth_consumer_token: b7228f20b437989dbfc09178085df71a
+scholarships::oauth_secret_token: f7841ded67f3f290360c67d347f9a62c85f171e5
 
 sentry::db_name: sentry
 sentry::db_user: sentry
diff --git a/puppet/modules/role/manifests/scholarships.pp 
b/puppet/modules/role/manifests/scholarships.pp
index 5511bd0..b40b2fa 100644
--- a/puppet/modules/role/manifests/scholarships.pp
+++ b/puppet/modules/role/manifests/scholarships.pp
@@ -4,6 +4,18 @@
 # *Note*: The application is provisioned using an Apache named virtual host.
 # Once the role is enabled and provisioned use the URL
 # http://scholarships.local.wmftest.net:8080/ to access the site.
-class role::scholarships {
+class role::scholarships (
+$oauth_consumer_key,
+$oauth_secret_key,
+) {
+include ::mediawiki
 include ::scholarships
+
+role::oauth::consumer { 'Wikimania Scholarships':
+description  => 'Wikimania Scholarships',
+consumer_key => $oauth_consumer_key,
+secret_key   => $oauth_secret_key,
+callback_url => 
"http://${::scholarships::vhost_name}${::port_fragment}/;,
+grants   => ['authonlyprivate'],
+}
 }
diff --git a/puppet/modules/scholarships/manifests/init.pp 
b/puppet/modules/scholarships/manifests/init.pp
index 492a4e5..2f45a9c 100644
--- a/puppet/modules/scholarships/manifests/init.pp
+++ b/puppet/modules/scholarships/manifests/init.pp
@@ -37,6 +37,9 @@
 $vhost_name,
 $cache_dir,
 $log_file,
+$oauth_server,
+$oauth_consumer_token,
+$oauth_secret_token,
 ){
 include ::php
 include ::apache
diff --git a/puppet/modules/scholarships/templates/env.erb 
b/puppet/modules/scholarships/templates/env.erb
index 92c38a0..22eadc6 100644
--- a/puppet/modules/scholarships/templates/env.erb
+++ b/puppet/modules/scholarships/templates/env.erb
@@ -24,6 +24,14 @@
 ; Value should be compatible with PHP's strtotime() function
 APPLICATION_CLOSE=2038-01-01T00:00
 
+; OAuth settings
+USE_OAUTH=true
+OAUTH_CONSUMER_TOKEN=<%= @oauth_consumer_token %>
+OAUTH_SECRET_TOKEN=<%= @oauth_secret_token %>
+OAUTH_ENDPOINT="<%= @oauth_server %>/w/index.php?title=Special:OAuth"
+OAUTH_REDIR="<%= @oauth_server %>/wiki/Special:OAuth/authenticate?"
+OAUTH_CALLBACK=http://<%= @vhost_name %><%= scope['::port_fragment'] 
%>/oauth/callback
+
 ; This is a testing deployment
 MOCK=1
 SLIM_MODE=development

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I097b8784d050c0fb5e93f92ab25512d3b7d9fb4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: stretch-migration
Gerrit-Owner: BryanDavis 

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

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: Merge remote-tracking branch 'origin/stretch-migration'

2018-01-15 Thread BryanDavis (Code Review)

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

Change subject: Merge remote-tracking branch 'origin/stretch-migration'
..

Merge remote-tracking branch 'origin/stretch-migration'

Merge the feature branch which has been used to perform the initial
migration from Debian Jessie to Debian Stretch to master.

Bug: T181353
Change-Id: Id44c34f25ad1ceb5a2b5fff0ee34f13eb8b6e539
---
M Gemfile.lock
M Rakefile
M puppet/hieradata/common.yaml
M puppet/modules/apt/files/wikimedia-pubkey.asc
M puppet/modules/crm/manifests/tools.pp
M puppet/modules/mediawiki/manifests/apache.pp
D puppet/modules/mediawiki/templates/mediawiki-php5-site.erb
M puppet/modules/mediawiki/templates/mwrepl/mwrepl.erb
M puppet/modules/mediawiki/templates/systemd/jobchron.erb
M puppet/modules/mediawiki/templates/systemd/jobrunner.erb
M puppet/modules/php/manifests/composer.pp
M puppet/modules/role/manifests/commons.pp
M puppet/modules/role/manifests/ldapauth.pp
M puppet/modules/role/manifests/ores.pp
M puppet/modules/role/manifests/wikidata.pp
D puppet/modules/role/manifests/zend.pp
M puppet/modules/role/templates/elk/apache.conf.erb
M puppet/modules/swift/manifests/init.pp
M puppet/modules/thumbor/manifests/init.pp
19 files changed, 3 insertions(+), 251 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/99/404399/1

diff --git a/Gemfile.lock b/Gemfile.lock
index a717be2..a600c41 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -193,12 +193,8 @@
   puppetlabs_spec_helper (< 2.0.0)
   rake (~> 10.4.2)
   rspec (~> 3.1, >= 3.1.0)
-<<< HEAD   (c9374b scholarships: Add OAuth provisioning)
-  rubocop (~> 0.51.0)
-===
   rspec-puppet (~> 2.6.5)
   rubocop (~> 0.51)
->>> BRANCH (256c4a analytics: remove cdh modules and roles)
   safe_yaml (~> 1.0.4)
   vagrant!
   yard (~> 0.8, >= 0.8.7.6)
diff --git a/Rakefile b/Rakefile
index fe4f012..6bb1eff 100644
--- a/Rakefile
+++ b/Rakefile
@@ -31,12 +31,8 @@
   }
   config.ignore_paths += ['puppet/modules/stdlib/**/*.pp']
   config.ignore_paths += ['tmp/**/*.pp']
-  config.log_format = '%{path}:%{linenumber} %{KIND}: %{message}'
+  config.log_format = '%{path}:%{line} %{KIND}: %{message}'
 end
-<<< HEAD   (c9374b scholarships: Add OAuth provisioning)
-Cucumber::Rake::Task.new(:cucumber)
-RSpec::Core::RakeTask.new(:spec)
-===
 Cucumber::Rake::Task.new(:cucumber) do |t|
   t.cucumber_opts = '-r tests/features tests/features'
 end
@@ -56,7 +52,6 @@
 desc 'Compile puppet catalogs'
 task compile: [:compile_host, :compile_roles]
 
->>> BRANCH (256c4a analytics: remove cdh modules and roles)
 RuboCop::RakeTask.new(:rubocop)
 
 task default: [:test]
diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index aeda12e..a01a531 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -148,12 +148,6 @@
 hhvm::logroot: /vagrant/logs
 hhvm::admin_site_name: "hhvm-admin%{hiera('mwv::tld')}"
 
-<<< HEAD   (c9374b scholarships: Add OAuth provisioning)
-kibana::deploy_dir: /usr/share/kibana
-kibana::default_route: /dashboard/elasticsearch/default
-
-===
->>> BRANCH (256c4a analytics: remove cdh modules and roles)
 logstash::heap_memory_mb: 192
 logstash::pipeline_workers: 1
 logstash::output::elasticsearch::host: 127.0.0.1
@@ -222,10 +216,6 @@
 mediawiki::branch: master
 
 mediawiki::apache::docroot: "%{hiera('apache::docroot')}"
-<<< HEAD   (c9374b scholarships: Add OAuth provisioning)
-mediawiki::apache::php5_site_name: "php5%{hiera('mwv::tld')}"
-===
->>> BRANCH (256c4a analytics: remove cdh modules and roles)
 
 mediawiki::jobrunner::enable: true
 mediawiki::jobrunner::dir: "%{hiera('mwv::services_dir')}/jobrunner"
diff --git a/puppet/modules/apt/files/wikimedia-pubkey.asc 
b/puppet/modules/apt/files/wikimedia-pubkey.asc
index 3e433b4..76d7aba 100644
--- a/puppet/modules/apt/files/wikimedia-pubkey.asc
+++ b/puppet/modules/apt/files/wikimedia-pubkey.asc
@@ -1,35 +1,6 @@
 -BEGIN PGP PUBLIC KEY BLOCK-
 Version: GnuPG v1.4.11 (GNU/Linux)
 
-<<< HEAD   (c9374b scholarships: Add OAuth provisioning)
-mQGiBEUtBY8RBACJTZdWEBZHlibArWM1HrX5rcPCb+o2nmeTfNrtMpmVbkmi9vBE
-VmIDnjc+VQlJNoiBOKMhAhRSO0rIwEbOTewiQSPERfsClGpv0ikb3kQVFls5HpfZ
-49u9EAERRez+P2VJUH7CBmigKdxtKRGM5aLI+eOLUl+lZUn4NU6BsQOUGwCgtLiL
-I+8DSNkoiV40UR3uFsS9KLMD/30Lth9A9JgwrDTFl8rlNxq3Eluulv0+2MYoDutW
-2p384vJ8Vil+x1GPzZXT1NVHCPdJMXqfnUl33XkPJEFSJ3B1WhwU3muItPoM+GKM
-cnJMn2rYJa6Fae7UZy8iRJwSuqSg4mGNa900m/izyYoijJzl1u4HtZhbV++lgubO
-j+YfA/4sz68H/ZQZwG+d8X/xTgZ3+9qekqGFgxdGTICtiD7IRPPaQ7EUWOBml6tn
-SHfd0TBkCKtfFkr6+rA3ZJ5pyo3OwO2yUAvlBOPeaX4ZKTl7+8lG9kqqGIBm/iZy
-bHC75DF506Zm4IiesAXRmRqfB8gReOHEJybZkaCg8FZqhdGErLQ8V2lraW1lZGlh
-IEFyY2hpdmUgQXV0b21hdGljIFNpZ25pbmcgS2V5IDxyb290QHdpa2ltZWRpYS5v
-cmc+iF8EExECACAFAkUtBY8CGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAJ
-29n5P2zUSmaGAJjipA+xkWInJJHCCcoJrf7rBzqEAJ9OEsJuxbBOvOJBovwpWtNh

[MediaWiki-commits] [Gerrit] mediawiki...SendGrid[master]: Add PHPUnit tests

2018-01-15 Thread Phantom42 (Code Review)

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

Change subject: Add PHPUnit tests
..

Add PHPUnit tests

This adds tests for SendGridHooks.
Please note that SendGridHooks code was changed to make
sendgrid object mockable.
Additionally, UnitTestsList hook was added.

Bug: T183572
Change-Id: Iabbcb66467b180bab7250d27b869037d5bc57f5f
---
M SendGridHooks.php
M extension.json
A tests/phpunit/SendGridHooksTest.php
3 files changed, 133 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SendGrid 
refs/changes/00/404400/1

diff --git a/SendGridHooks.php b/SendGridHooks.php
index 1b3947a..d2a1f09 100644
--- a/SendGridHooks.php
+++ b/SendGridHooks.php
@@ -43,17 +43,22 @@
array $to,
MailAddress $from,
$subject,
-   $body
+   $body,
+   $sendgrid=null
) {
-   $conf = RequestContext::getMain()->getConfig();
+   if ( $sendgrid == null ) {
+   $conf = RequestContext::getMain()->getConfig();
 
-   // Value gotten from "wgSendGridAPIKey" variable from 
LocalSettings.php
-   $sendgridAPIKey = $conf->get( 'SendGridAPIKey' );
+   // Value gotten from "wgSendGridAPIKey" variable from 
LocalSettings.php
+   $sendgridAPIKey = $conf->get( 'SendGridAPIKey' );
 
-   if ( $sendgridAPIKey == "" ) {
-   throw new MWException(
-   'Please update your LocalSettings.php with the 
correct SendGrid API key.'
-   );
+   if ( $sendgridAPIKey == "" ) {
+   throw new MWException(
+   'Please update your LocalSettings.php 
with the correct SendGrid API key.'
+   );
+   }
+
+   $sendgrid = new \SendGrid( $sendgridAPIKey );
}
 
// Get $to and $from email addresses from the array and 
MailAddress object respectively
@@ -61,7 +66,6 @@
$to = new SendGrid\Email( null, $to[0]->address );
$body = new SendGrid\Content( "text/plain", $body );
$mail = new SendGrid\Mail( $from, $subject, $to, $body );
-   $sendgrid = new \SendGrid( $sendgridAPIKey );
 
try {
$sendgrid->client->mail()->send()->post( $mail );
@@ -72,4 +76,30 @@
return false;
}
 
+   /**
+* Handler for UnitTestsList hook.
+* @see http://www.mediawiki.org/wiki/Manual:Hooks/UnitTestsList
+* @param array &$files Array of unit test files
+* @return bool true in all cases
+*/
+   public static function onUnitTestsList( &$files ) {
+   // @codeCoverageIgnoreStart
+   $directoryIterator = new RecursiveDirectoryIterator( __DIR__ . 
'/tests/' );
+
+   /**
+* @var SplFileInfo $fileInfo
+*/
+   $ourFiles = [];
+   foreach ( new RecursiveIteratorIterator( $directoryIterator ) 
as $fileInfo ) {
+   if ( substr( $fileInfo->getFilename(), -8 ) === 
'Test.php' ) {
+   $ourFiles[] = $fileInfo->getPathname();
+   }
+   }
+
+   $files = array_merge( $files, $ourFiles );
+
+   return true;
+   // @codeCoverageIgnoreEnd
+   }
+
 }
diff --git a/extension.json b/extension.json
index 1cde31d..4d3f7ac 100644
--- a/extension.json
+++ b/extension.json
@@ -18,7 +18,8 @@
"Hooks": {
"AlternateUserMailer": [
"SendGridHooks::onAlternateUserMailer"
-   ]
+   ],
+   "UnitTestsList": "SendGridHooks::onUnitTestsList"
},
"load_composer_autoloader": true,
"config": {
diff --git a/tests/phpunit/SendGridHooksTest.php 
b/tests/phpunit/SendGridHooksTest.php
new file mode 100644
index 000..be2f0b5
--- /dev/null
+++ b/tests/phpunit/SendGridHooksTest.php
@@ -0,0 +1,92 @@
+setExpectedException(
+MWException::class,
+'Please update your LocalSettings.php with the correct SendGrid 
API key.'
+);
+
+RequestContext::getMain()->setConfig( new MultiConfig( [
+new HashConfig( [
+'SendGridAPIKey' => '',
+] ),
+] ) );
+
+SendGridHooks::onAlternateUserMailer(
+[ 'SomeHeader' => 'SomeValue' ],
+[ new MailAddress( 'recei...@example.com' ) ],
+new MailAddress( 'sen...@example.com' ),
+'Some subject',
+'Email body'
+);
+}
+
+/**
+ * Test sending mail in onAlternateUserMailer hook.

[MediaWiki-commits] [Gerrit] mediawiki/vagrant[master]: scholarships: Add OAuth provisioning

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404398 )

Change subject: scholarships: Add OAuth provisioning
..


scholarships: Add OAuth provisioning

Provision an OAuth consumer and configure Scholarships to use it.

When adding this functionality to an existing VM where Scholarships has
already been provisioned the user will need to delete their existing
/vagrant/srv/scholarships/.env file. The Puppet module does not modify
existing environment files to allow for easier local debugging.

Bug: T119534
Change-Id: I097b8784d050c0fb5e93f92ab25512d3b7d9fb4d
---
M puppet/hieradata/common.yaml
M puppet/modules/role/manifests/scholarships.pp
M puppet/modules/scholarships/manifests/init.pp
M puppet/modules/scholarships/templates/env.erb
4 files changed, 30 insertions(+), 1 deletion(-)

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



diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml
index 700b8d5..2d78951 100644
--- a/puppet/hieradata/common.yaml
+++ b/puppet/hieradata/common.yaml
@@ -442,6 +442,9 @@
 role::phragile::install_dir: "%{hiera('mwv::services_dir')}/phragile"
 role::phragile::vhost_name: "phragile%{hiera('mwv::tld')}"
 
+role::scholarships::oauth_consumer_key: b7228f20b437989dbfc09178085df71a
+role::scholarships::oauth_secret_key: 3f01bf19915f3a56d9f6e5b5b7729593
+
 role::sentry::dsn: "%{hiera('sentry::dsn_file')}"
 
 role::wikidata::main_page: "Wiki:Main Page"
@@ -455,6 +458,9 @@
 scholarships::deploy_dir: "%{hiera('mwv::services_dir')}/scholarships"
 scholarships::cache_dir: /var/cache/scholarships
 scholarships::log_file: /vagrant/logs/scholarships.log
+scholarships::oauth_server: 
"http://dev.wiki.local.wmftest.net%{::port_fragment};
+scholarships::oauth_consumer_token: b7228f20b437989dbfc09178085df71a
+scholarships::oauth_secret_token: f7841ded67f3f290360c67d347f9a62c85f171e5
 
 sentry::db_name: sentry
 sentry::db_user: sentry
diff --git a/puppet/modules/role/manifests/scholarships.pp 
b/puppet/modules/role/manifests/scholarships.pp
index 5511bd0..b40b2fa 100644
--- a/puppet/modules/role/manifests/scholarships.pp
+++ b/puppet/modules/role/manifests/scholarships.pp
@@ -4,6 +4,18 @@
 # *Note*: The application is provisioned using an Apache named virtual host.
 # Once the role is enabled and provisioned use the URL
 # http://scholarships.local.wmftest.net:8080/ to access the site.
-class role::scholarships {
+class role::scholarships (
+$oauth_consumer_key,
+$oauth_secret_key,
+) {
+include ::mediawiki
 include ::scholarships
+
+role::oauth::consumer { 'Wikimania Scholarships':
+description  => 'Wikimania Scholarships',
+consumer_key => $oauth_consumer_key,
+secret_key   => $oauth_secret_key,
+callback_url => 
"http://${::scholarships::vhost_name}${::port_fragment}/;,
+grants   => ['authonlyprivate'],
+}
 }
diff --git a/puppet/modules/scholarships/manifests/init.pp 
b/puppet/modules/scholarships/manifests/init.pp
index 492a4e5..2f45a9c 100644
--- a/puppet/modules/scholarships/manifests/init.pp
+++ b/puppet/modules/scholarships/manifests/init.pp
@@ -37,6 +37,9 @@
 $vhost_name,
 $cache_dir,
 $log_file,
+$oauth_server,
+$oauth_consumer_token,
+$oauth_secret_token,
 ){
 include ::php
 include ::apache
diff --git a/puppet/modules/scholarships/templates/env.erb 
b/puppet/modules/scholarships/templates/env.erb
index 92c38a0..22eadc6 100644
--- a/puppet/modules/scholarships/templates/env.erb
+++ b/puppet/modules/scholarships/templates/env.erb
@@ -24,6 +24,14 @@
 ; Value should be compatible with PHP's strtotime() function
 APPLICATION_CLOSE=2038-01-01T00:00
 
+; OAuth settings
+USE_OAUTH=true
+OAUTH_CONSUMER_TOKEN=<%= @oauth_consumer_token %>
+OAUTH_SECRET_TOKEN=<%= @oauth_secret_token %>
+OAUTH_ENDPOINT="<%= @oauth_server %>/w/index.php?title=Special:OAuth"
+OAUTH_REDIR="<%= @oauth_server %>/wiki/Special:OAuth/authenticate?"
+OAUTH_CALLBACK=http://<%= @vhost_name %><%= scope['::port_fragment'] 
%>/oauth/callback
+
 ; This is a testing deployment
 MOCK=1
 SLIM_MODE=development

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I097b8784d050c0fb5e93f92ab25512d3b7d9fb4d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: Dduvall 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add WikiAdmin dependency for BlueSpiceInterWikiLinks extension

2018-01-15 Thread Phantom42 (Code Review)

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

Change subject: Add WikiAdmin dependency for BlueSpiceInterWikiLinks extension
..

Add WikiAdmin dependency for BlueSpiceInterWikiLinks extension

Needed for minus-x tests in If650a30daeabf09d13a734cd143337625efa1e20

Bug: T175794
Change-Id: I80a8f9c46b5c0e763a8545ad4438ab5e7979748c
---
M zuul/parameter_functions.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/01/404401/1

diff --git a/zuul/parameter_functions.py b/zuul/parameter_functions.py
index 2247bf6..054f962 100644
--- a/zuul/parameter_functions.py
+++ b/zuul/parameter_functions.py
@@ -174,7 +174,7 @@
 'BlueSpiceInsertLink': ['BlueSpiceFoundation'],
 'BlueSpiceInsertMagic': ['BlueSpiceFoundation'],
 'BlueSpiceInsertTemplate': ['BlueSpiceFoundation'],
-'BlueSpiceInterWikiLinks': ['BlueSpiceFoundation'],
+'BlueSpiceInterWikiLinks': ['BlueSpiceFoundation', 'WikiAdmin'],
 'BlueSpiceMenues': ['BlueSpiceFoundation'],
 'BlueSpiceMultiUpload': ['BlueSpiceFoundation'],
 'BlueSpiceNamespaceCSS': ['BlueSpiceFoundation'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80a8f9c46b5c0e763a8545ad4438ab5e7979748c
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Phantom42 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: voting debian-glue for php-ast

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404291 )

Change subject: voting debian-glue for php-ast
..


voting debian-glue for php-ast

Passed on https://gerrit.wikimedia.org/r/#/c/404283/

Change-Id: I0eb4f0ac4b8ddc4dbac03ffac4da6460e51a2e6e
---
M zuul/layout.yaml
1 file changed, 5 insertions(+), 1 deletion(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 1ec7929..005a664 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2275,7 +2275,11 @@
   - { name: operations/debs/phantomjs,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/php-mailparse,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/pkg-php/php,  test: 
['debian-glue-non-voting'] }
-  - { name: operations/debs/pkg-php/php-ast,  test: 
['debian-glue-non-voting'] }
+  - name: operations/debs/pkg-php/php-ast
+test:
+  - debian-glue
+gate-and-submit:
+  - debian-glue
   - { name: operations/debs/pkg-php/php-defaults, test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/pkg-php/php-redis,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/prometheus,   test: 
['debian-glue-non-voting'] }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0eb4f0ac4b8ddc4dbac03ffac4da6460e51a2e6e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: [WIP] WikiDiff PHPunit Tests

2018-01-15 Thread Andrew-WMDE (Code Review)

Andrew-WMDE has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404294 )

Change subject: [WIP] WikiDiff PHPunit Tests
..

[WIP] WikiDiff PHPunit Tests

Bug: T183131
Change-Id: Ib2f401b8155d3ae815e7ef1ec31385f96ecf6328
---
A tests/phpunit/includes/diff/wikidiff/WikiDiffTest.php
A tests/phpunit/includes/diff/wikidiff/files/1/a.txt
A tests/phpunit/includes/diff/wikidiff/files/1/b.txt
A tests/phpunit/includes/diff/wikidiff/files/1/res.txt
A tests/phpunit/includes/diff/wikidiff/files/2/a.txt
A tests/phpunit/includes/diff/wikidiff/files/2/b.txt
A tests/phpunit/includes/diff/wikidiff/files/2/res.txt
7 files changed, 421 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/94/404294/1

diff --git a/tests/phpunit/includes/diff/wikidiff/WikiDiffTest.php 
b/tests/phpunit/includes/diff/wikidiff/WikiDiffTest.php
new file mode 100644
index 000..aad4b0a
--- /dev/null
+++ b/tests/phpunit/includes/diff/wikidiff/WikiDiffTest.php
@@ -0,0 +1,37 @@
+
+ *
+ * @group Diff
+ */
+class WikiDiffTest extends MediaWikiTestCase {
+
+   /**
+* @var DifferenceEngine
+*/
+   private $diffEngine;
+
+   protected function setUp() {
+   parent::setUp();
+   $this->diffEngine = new DifferenceEngine();
+   }
+
+   private function getTestCases() {
+   return [
+   [1, "Honeyguide"],
+   [2, "Rogers"]
+   ];
+   }
+
+   public function testDiffOutput() {
+   foreach ($this->getTestCases() as $case) {
+   $fileA = file_get_contents(__DIR__ . "/files/" . 
$case[0] . "/a.txt");
+   $fileB = file_get_contents(__DIR__ . "/files/" . 
$case[0] . "/b.txt");
+   $fileRes = file_get_contents(__DIR__ . "/files/" . 
$case[0] . "/res.txt");
+
+   $diff = $this->diffEngine->generateTextDiffBody($fileA, 
$fileB);
+   $this->assertEquals($fileRes, $diff, $case[1]);
+   }
+   }
+}
\ No newline at end of file
diff --git a/tests/phpunit/includes/diff/wikidiff/files/1/a.txt 
b/tests/phpunit/includes/diff/wikidiff/files/1/a.txt
new file mode 100644
index 000..8e6affd
--- /dev/null
+++ b/tests/phpunit/includes/diff/wikidiff/files/1/a.txt
@@ -0,0 +1,82 @@
+{{Automatic Taxobox
+| name = Honeyguides
+| image = Wahlberg's Honeyguide (Prodotiscus regulus).jpg
+| image_caption = [[Brown-backed honeybird]]
+| taxon = Indicatoridae
+| authority = [[William John Swainson|Swainson]], 1837
+| subdivision_ranks = Genera
+| subdivision =
+''[[Indicator (genus)|Indicator]]''
+''[[Melichneutes]]''
+''[[Melignomon]]''
+''[[Prodotiscus]]''
+}}
+
+'''Honeyguides''' ([[family (biology)|family]] '''Indicatoridae''') are [[near 
passerine]] [[bird]] species of the order [[Piciformes]]. They are also known 
as '''indicator birds''', or '''honey birds''', although the latter term is 
also used more narrowly to refer to species of the genus ''[[Prodotiscus]]''. 
They have an [[Old World]] tropical distribution, with the greatest number of 
species in [[Africa]] and two in [[Asia]]. These birds are best known for their 
interaction with humans. Honeyguides are noted and named for one or two species 
that will deliberately lead humans (but, contrary to popular claims, not 
[[honey badger]]s) directly to bee colonies, so that they can feast on the 
grubs and [[beeswax]] that are left behind.
+
+== Description ==
+[[File:Wahlberg's Honeyguide (Prodotiscus regulus) - Juvenile fed by host 
parent Rock-loving Cisticola.jpg|thumb|left|[[Brown-backed honeybird]] juvenile 
fed by host parent, a [[rock-loving cisticola
+
+Most honeyguides are dull-colored, though some have bright yellow coloring in 
the plumage. All have light outer tail feathers, which are white in all the 
African species.
+
+They are among the few birds that feed regularly on [[wax]][[beeswax]] 
in most species, and presumably the waxy secretions of [[scale insect]]s in the 
genus ''[[Prodotiscus]]'' and to a lesser extent in ''[[Melignomon]]'' and the 
smaller species of ''[[Indicator (genus)|Indicator]]''. They also feed on 
[[waxworm]]s which are the larvae of the waxmoth ''Galleria mellonella'', on 
[[bee]] colonies, and on flying and crawling insects, [[spider]]s, and 
occasional fruits. Many species join [[mixed-species feeding flock]]s.
+
+==Behavior==
+===Guiding===
+
+Honeyguides are named for a remarkable habit seen in one or two species: 
guiding humans to [[bee hive|bee colonies]]. Once the hive is open and the 
honey is taken, the bird feeds on the remaining larvae and wax. This behavior 
is well studied in the [[greater honeyguide]]; some authorities (following 
Friedmann, 1955) state that it also occurs in the [[scaly-throated 
honeyguide]], while others disagree (Short and Horne, 2002). Wild honeyguides

[MediaWiki-commits] [Gerrit] analytics/wikistats2[release]: Release 2.1.4

2018-01-15 Thread Fdans (Code Review)

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

Change subject: Release 2.1.4
..

Release 2.1.4

Change-Id: Ibae5fb23c11b8704fae22e4879749c5638191bcd
---
A dist/0.9155a7e9a34a43778291.js
M dist/index.html
A dist/main.bundle.ef2f15d9277ad60530b9.css
A dist/main.bundle.ef2f15d9277ad60530b9.js
M package.json
M src/components/TopicExplorer.vue
M src/components/WikiSelector.vue
M src/components/detail/GraphPanel.vue
M src/components/detail/chart/BarChart.vue
M src/components/detail/chart/LineChart.vue
M src/models/GraphModel.js
11 files changed, 310 insertions(+), 21 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wikistats2 
refs/changes/95/404295/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibae5fb23c11b8704fae22e4879749c5638191bcd
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikistats2
Gerrit-Branch: release
Gerrit-Owner: Fdans 

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

[MediaWiki-commits] [Gerrit] mediawiki...mobileapps[master]: Hygiene: add more summary tests

2018-01-15 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/404241 )

Change subject: Hygiene: add more summary tests
..


Hygiene: add more summary tests

Change-Id: I245cb3b3715cb67b7c589f42079f34203c25d32d
---
M test/features/summary/pagecontent.js
1 file changed, 17 insertions(+), 6 deletions(-)

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



diff --git a/test/features/summary/pagecontent.js 
b/test/features/summary/pagecontent.js
index 9d5d999..3ffa217 100644
--- a/test/features/summary/pagecontent.js
+++ b/test/features/summary/pagecontent.js
@@ -57,13 +57,24 @@
 });
 });
 
-it('204 should be returned for redirect page', () => {
-const uri = localUri('Barack');
+function should204(uri) {
 return preq.get({ uri })
-.then((res) => {
-assert.deepEqual(res.status, 204);
-assert.ok(!res.body);
-});
+.then((res) => {
+assert.deepEqual(res.status, 204);
+assert.deepEqual(res.body, undefined, 'no content');
+});
+}
+
+it('204 should be returned for a file page', () => {
+should204(localUri('File:En-Alliterative_verse-article.ogg', 
'commons.wikimedia.org'));
+});
+
+it('204 should be returned for a talk page', () => {
+should204(localUri('Talk:Foobar'));
+});
+
+it('204 should be returned for a redirected page', () => {
+should204(localUri('Barack'));
 });
 
 it('timestamp should refer to the requested revision, not the latest 
revision', () => {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I245cb3b3715cb67b7c589f42079f34203c25d32d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: BearND 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mholloway 
Gerrit-Reviewer: Mhurd 
Gerrit-Reviewer: Ppchelko 
Gerrit-Reviewer: jenkins-bot <>

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

1 2 >

1 - 100 of 187 matches

Mail list logo