date:20160304

[MediaWiki-commits] [Gerrit] Calculate an engine score - change (wikimedia...relevanceForge)

2016-03-04 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Calculate an engine score
..

Calculate an engine score

This is based on Paul Nelson's talk on search relevance. It sources
query and click logs from the TestSearchSatisfaction schema, runs the
queries, and then generates an engine score and a histogram of the
result positions.

Change-Id: I167d29e934b7f048e120f908a28e883a77d61c00
---
M .gitignore
A cache/.gitkeep
A engineScore.ini
A engineScore.py
M relevancyRunner.py
5 files changed, 257 insertions(+), 34 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/relevanceForge 
refs/changes/58/275158/1

diff --git a/.gitignore b/.gitignore
index 09ce239..1ffc9ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 relevance/
 .tox/
 *.sw?
+cache/.gitkeep
diff --git a/cache/.gitkeep b/cache/.gitkeep
new file mode 100644
index 000..e69de29
--- /dev/null
+++ b/cache/.gitkeep
diff --git a/engineScore.ini b/engineScore.ini
new file mode 100644
index 000..c3ea8a7
--- /dev/null
+++ b/engineScore.ini
@@ -0,0 +1,17 @@
+[settings]
+stats_server = stat1002.eqiad.wmnet
+mysql_options = 
--defaults-extra-file=/etc/mysql/conf.d/analytics-research-client.cnf --host 
dbstore1002.eqiad.wmnet
+date_start = 2016022200
+date_end = 2016022900
+dwell_threshold = 12
+wiki = enwiki
+num_sessions = 2000
+click_log_cache_dir = ./cache/
+factor = .9
+workDir = ./relevance
+
+[test1]
+name = I need to be better at naming things...
+labHost = searchdemo.eqiad.wmflabs
+searchCommand = cd /srv/mediawiki-vagrant && mwvagrant ssh -- mwscript 
extensions/CirrusSearch/maintenance/runSearch.php --baseName enwiki --fork 2 
--limit 20
+allow_reuse = 1
diff --git a/engineScore.py b/engineScore.py
new file mode 100644
index 000..5e5a7e2
--- /dev/null
+++ b/engineScore.py
@@ -0,0 +1,192 @@
+import os
+import sys
+import json
+import argparse
+import md5
+import tempfile
+import ConfigParser
+import subprocess
+import relevancyRunner
+
+verbose = False
+def debug(string):
+if verbose:
+print(string)
+
+def fetch_query_and_click_logs(settings):
+with open('sql/extract_query_and_click_logs.sql') as f:
+queryFormat = f.read()
+
+query = queryFormat.format(**{
+'date_start': settings('date_start'),
+'date_end': settings('date_end'),
+'dwell_threshold': settings('dwell_threshold'),
+'wiki': settings('wiki'),
+'limit': settings('num_sessions'),
+})
+
+m = md5.new();
+m.update(query)
+hash = m.hexdigest()
+cache_path = settings('click_log_cache_dir') + '/click_log.' + hash
+try:
+with open(cache_path, 'r') as f:
+return f.read().split("\n")
+except IOError:
+pass
+
+p = subprocess.Popen(['ssh', settings('stats_server'), 'mysql ' +
+ settings('mysql_options')],
+ stdin=subprocess.PIPE, stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+
+stdout, stderr = p.communicate(input=query)
+if len(stdout) == 0:
+raise RuntimeError("Could run SQL query:\n%s" % (stderr))
+
+with open(cache_path, 'w') as f:
+f.write(stdout)
+return stdout.split("\n")
+   
+def extract_sessions(sql_result):
+header = sql_result.pop(0)
+sessions = {}
+queries = set()
+clicks = 0
+for line in result:
+if len(line) == 0:
+continue
+sessionId, articleId, query = line.split("\t", 2)
+if sessionId in sessions:
+session = sessions[sessionId]
+else:
+session = {
+'queries': set([]),
+'clicks': set([]),
+}
+sessions[sessionId] = session
+
+if not articleId == 'NULL':
+session['clicks'].update([articleId])
+clicks += 1
+if not query == 'NULL':
+session['queries'].update([query])
+queries.update([query])
+
+print('Loaded %d sessions with %d clicks and %d unique queries' %
+(len(sessions), clicks, len(queries)))
+
+return (sessions, queries)
+
+def genSettings(config):
+def get(key):
+return config.get('settings', key)
+return get
+
+def load_results(results_path):
+# Load the results
+results = {}
+with open(results_path) as f:
+for line in f:
+decoded = json.loads(line)
+hits = []
+if not 'error' in decoded:
+for hit in decoded['rows']:
+hits.append(hit['pageId'])
+results[decoded['query']] = hits
+return results
+
+def calc_engine_score(sessions, results, factor):
+# Calculate a score per session
+session_score = 0.
+histogram = Histogram()
+for sessionId in sessions:
+debug(sessionId)
+session = sessions[sessionId]
+

[MediaWiki-commits] [Gerrit] Dont log to CirrusSearchRequestSet when disabled - change (mediawiki...CirrusSearch)

2016-03-04 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Dont log to CirrusSearchRequestSet when disabled
..

Dont log to CirrusSearchRequestSet when disabled

runSearch.php sets a global variable to tell cirrussearch not
to log it's requests. This works for the CirrusSearchRequests
channel but the new CirrusSearchRequestSet channel was ignoring
it. Fix that.

Change-Id: I93e9f44a3400b25d99529fefdcd8a5b6ab870e32
---
M includes/ElasticsearchIntermediary.php
1 file changed, 9 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/57/275157/1

diff --git a/includes/ElasticsearchIntermediary.php 
b/includes/ElasticsearchIntermediary.php
index 3610955..e12e03c 100644
--- a/includes/ElasticsearchIntermediary.php
+++ b/includes/ElasticsearchIntermediary.php
@@ -536,6 +536,8 @@
 * @return array
 */
private function buildLogContext( $took, Client $client = null ) {
+   global $wgCirrusSearchLogElasticRequests;
+
if ( $client ) {
$query = $client->getLastRequest();
$result = $client->getLastResponse();
@@ -582,12 +584,14 @@
}
}
 
-   if ( count( self::$logContexts ) === 0 ) {
-   DeferredUpdates::addCallableUpdate( function () {
-   ElasticsearchIntermediary::reportLogContexts();
-   } );
+   if ( $wgCirrusSearchLogElasticRequests ) {
+   if ( count( self::$logContexts ) === 0 ) {
+   DeferredUpdates::addCallableUpdate( function () 
{
+   
ElasticsearchIntermediary::reportLogContexts();
+   } );
+   }
+   self::$logContexts[] = $params;
}
-   self::$logContexts[] = $params;
 
return $params;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93e9f44a3400b25d99529fefdcd8a5b6ab870e32
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 

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

[MediaWiki-commits] [Gerrit] Monkeypatch Horizon to simplify the instance-creation panel. - change (operations/puppet)

2016-03-04 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review.

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

Change subject: Monkeypatch Horizon to simplify the instance-creation panel.
..

Monkeypatch Horizon to simplify the instance-creation panel.

This uses a built in Horizon facility, 'customization_module'.

Change-Id: I12ca1bbf25546f89465aba4425d2dd2847f9dd1a
---
A modules/openstack/files/liberty/horizon/overrides.py
M modules/openstack/manifests/horizon/service.pp
M modules/openstack/templates/liberty/horizon/local_settings.py.erb
3 files changed, 21 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/275156/1

diff --git a/modules/openstack/files/liberty/horizon/overrides.py 
b/modules/openstack/files/liberty/horizon/overrides.py
new file mode 100644
index 000..5203ba0
--- /dev/null
+++ b/modules/openstack/files/liberty/horizon/overrides.py
@@ -0,0 +1,11 @@
+#  --  Tidy up the instance creation panel  --
+
+from  openstack_dashboard.dashboards.project.instances.workflows import 
create_instance
+#  Remove a couple of unwanted tabs from the instance creation panel:
+#   PostCreationStep just provides confusing competition with puppet.
+#   SetAdvanced provides broken features like configdrive and partitioning.
+
+create_instance.LaunchInstance.default_steps = 
(create_instance.SelectProjectUser,
+
create_instance.SetInstanceDetails,
+
create_instance.SetAccessControls,
+create_instance.SetNetwork)
diff --git a/modules/openstack/manifests/horizon/service.pp 
b/modules/openstack/manifests/horizon/service.pp
index bd1ddd2..be215da 100644
--- a/modules/openstack/manifests/horizon/service.pp
+++ b/modules/openstack/manifests/horizon/service.pp
@@ -136,6 +136,15 @@
 mode=> '0644',
 }
 
+# Monkeypatches for Horizon customization
+file { '/usr/lib/python2.7/dist-packages/horizon/overrides.py':
+source  => 
"puppet:///modules/openstack/${openstack_version}/horizon/overrides.py",
+owner   => 'root',
+group   => 'root',
+require => Package['python-openstack-auth'],
+mode=> '0644',
+}
+
 apache::site { $webserver_hostname:
 content => 
template("openstack/${$openstack_version}/horizon/${webserver_hostname}.erb"),
 require => File['/etc/openstack-dashboard/local_settings.py'],
diff --git a/modules/openstack/templates/liberty/horizon/local_settings.py.erb 
b/modules/openstack/templates/liberty/horizon/local_settings.py.erb
index cc9cb7e..c5b0f5f 100644
--- a/modules/openstack/templates/liberty/horizon/local_settings.py.erb
+++ b/modules/openstack/templates/liberty/horizon/local_settings.py.erb
@@ -74,6 +74,7 @@
 'exceptions': {'recoverable': exceptions.RECOVERABLE,
'not_found': exceptions.NOT_FOUND,
'unauthorized': exceptions.UNAUTHORIZED},
+'customization_module': 'horizon.overrides',
 }
 
 # Specify a regular expression to validate user passwords.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I12ca1bbf25546f89465aba4425d2dd2847f9dd1a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] TalkpageManager method renames - change (mediawiki...Flow)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: TalkpageManager method renames
..


TalkpageManager method renames

I thought some 2 method names were slightly confusing:

* checkIfCreationTechnicallyAllowed could be interpreted like "we'll
  check if you have permissions in theory (which may still be
  overruled in practice)" - "technically" could be considered the
  opposite of "practically", but here it means "system limitations"
* checkedAllowCreation could be interpreted like "this IS checked, so
  go ahead and do it" instead of "this WILL BE checked"

I also removed one of BoardMover's constructor args, now we no longer
need it.

Change-Id: I0d8cfb322ab88fbee09c5599c6d538b1db14acb8
---
M Hooks.php
M container.php
M includes/Api/ApiFlow.php
M includes/BoardMover.php
M includes/Dump/Importer.php
M includes/Import/Importer.php
M includes/Import/OptInController.php
M includes/Specials/SpecialEnableFlow.php
M includes/SubmissionHandler.php
M includes/TalkpageManager.php
M maintenance/FlowUpdateWorkflowPageId.php
M tests/phpunit/HookTest.php
M tests/phpunit/PostRevisionTestCase.php
M tests/phpunit/TalkpageManagerTest.php
14 files changed, 53 insertions(+), 56 deletions(-)

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



diff --git a/Hooks.php b/Hooks.php
index 6edbeda..de25558 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -1275,7 +1275,7 @@
}
 
$occupationController = self::getOccupationController();
-   $flowStatus = 
$occupationController->checkIfCreationTechnicallyAllowed( $newTitle, 
/*mustNotExist*/ true );
+   $flowStatus = $occupationController->checkIfCreationIsPossible( 
$newTitle, /*mustNotExist*/ true );
$status->merge( $flowStatus );
 
return true;
@@ -1618,7 +1618,7 @@
 
/**
 * @param Title $title Title corresponding to the article restored
-* @param bool $create Whether or not the restoration caused the page 
to be created (i.e. it didn't exist before).
+* @param bool $created Whether or not the restoration caused the page 
to be created (i.e. it didn't exist before).
 * @param string $comment The comment associated with the undeletion.
 * @param int $oldPageId ID of page previously deleted (from archive 
table)
 * @return bool
@@ -1652,6 +1652,9 @@
$bogusTitle = clone $newTitle;
$bogusTitle->resetArticleID( $oldTitle->getArticleID() 
);
 
+   // This is only safe because we have called
+   // checkIfCreationIsPossible and (usually) 
checkIfUserHasPermission.
+   Container::get( 'occupation_controller' 
)->forceAllowCreation( $bogusTitle );
// complete hack to make sure that when the page is 
saved to new
// location and rendered it doesn't throw an error 
about the wrong title
Container::get( 'factory.loader.workflow' 
)->pageMoveInProgress();
diff --git a/container.php b/container.php
index cc7202a..21aeaba 100644
--- a/container.php
+++ b/container.php
@@ -1298,8 +1298,7 @@
$c['db.factory'],
$c['memcache.local_buffered'],
$c['storage'],
-   $c['occupation_controller']->getTalkpageManager(),
-   $c['occupation_controller']
+   $c['occupation_controller']->getTalkpageManager()
);
 };
 
diff --git a/includes/Api/ApiFlow.php b/includes/Api/ApiFlow.php
index 48401f1..3205350 100644
--- a/includes/Api/ApiFlow.php
+++ b/includes/Api/ApiFlow.php
@@ -123,9 +123,9 @@
// Just check for permissions, nothing else to do. The 
Flow board
// will be put in place right before the rest of the 
data is stored
// (in SubmissionHandler::commit), after everything's 
been validated.
-   $status = $controller->checkedAllowCreation( $page, 
$this->getUser() );
+   $status = $controller->safeAllowCreation( $page, 
$this->getUser() );
if ( !$status->isGood() ) {
-   $this->dieUsage( "Page provided does not have 
Flow enabled and checkedAllowCreation failed with: " . 
$status->getMessage()->parse(), 'invalid-page' );
+   $this->dieUsage( "Page provided does not have 
Flow enabled and safeAllowCreation failed with: " . 
$status->getMessage()->parse(), 'invalid-page' );
}
}
 
diff --git a/includes/BoardMover.php b/includes/BoardMover.php
index 8abccc5..a8a50c8 100644
--- a/includes/BoardMover.php
+++ b/includes/BoardMover.php
@@ -11,9 +11,6 @@
 use Title;
 use User;
 
-/**
- *
- */
 class BoardMover {
/**
 * @var DbFactory
@@ -31,21 +28,15 @@

[MediaWiki-commits] [Gerrit] Namespace configuration on wuu.wikipedia - change (operations/mediawiki-config)

2016-03-04 Thread Dereckson (Code Review)

Dereckson has uploaded a new change for review.

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

Change subject: Namespace configuration on wuu.wikipedia
..

Namespace configuration on wuu.wikipedia

NS_PROJECT is called:
* Canonical name: Wikipedia
* Alias: 维基百科

This is coherent with the community decision to use English for
canonical namespaces and Wu for aliases.

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


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4f54353..8e5579b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -2419,7 +2419,6 @@
'vowikibooks' => 'Vükibuks',
'vowiktionary' => 'Vükivödabuk',
'wikimaniateamwiki' => 'WikimaniaTeam',
-   'wuuwiki' => '维基百科', // T128354
'xmfwiki' => 'ვიკიპედია',
'yiwiki' => 'װיקיפּעדיע',
'yiwikisource' => 'װיקיביבליאָטעק',
@@ -3795,12 +3794,13 @@
'WP' => NS_PROJECT,
'T' => NS_TEMPLATE,
 
-   // Wu aliases - T124389
+   // Wu aliases - T124389, T128354
'媒体' => NS_MEDIA,
'特殊' => NS_SPECIAL,
'讨论' => NS_TALK,
'用户' => NS_USER,
'用户讨论' => NS_USER_TALK,
+   '维基百科' => NS_PROJECT,
'文件' => NS_FILE,
'模板' => NS_TEMPLATE,
'模板讨论' => NS_TEMPLATE_TALK,

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

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

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

[MediaWiki-commits] [Gerrit] Namespace configuration on he.wikivoyage - change (operations/mediawiki-config)

2016-03-04 Thread Dereckson (Code Review)

Dereckson has uploaded a new change for review.

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

Change subject: Namespace configuration on he.wikivoyage
..

Namespace configuration on he.wikivoyage

New namespaces:
* 110: מפה (Map)
* 111: שיחת_מפה (Map talk)

This namespace will be used for this feature:
http://en.wikivoyage.org/wiki/Wikivoyage:How_to_use_dynamic_maps#Adding_boundaries_and_tracks

Bug: T127654
Change-Id: Ib09764ead9ef869b88a405918d47aeb3305e976e
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 4f54353..9f91d9f 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -6511,6 +6511,8 @@
'hewikivoyage' => array(
108 => 'ספר', // Book
109 => 'שיחת_ספר', // Book talk
+   110 => 'מפה', // Map
+   111 => 'שיחת_מפה',
),
'itwikivoyage' => array(
100 => 'Portale',

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

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

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

[MediaWiki-commits] [Gerrit] Revert to non-Parsoid align styling - change (mediawiki...Kartographer)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Revert to non-Parsoid align styling
..


Revert to non-Parsoid align styling

Doesn't work without  that we aren't going to use right now anyway.

Change-Id: I674dbf5459bdb57c8c6905be63195857752406e5
---
M includes/Tag/MapFrame.php
M tests/parserTests.txt
2 files changed, 7 insertions(+), 7 deletions(-)

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



diff --git a/includes/Tag/MapFrame.php b/includes/Tag/MapFrame.php
index 6d98f4d..e00727a 100644
--- a/includes/Tag/MapFrame.php
+++ b/includes/Tag/MapFrame.php
@@ -33,9 +33,9 @@
global $wgKartographerFrameMode;
 
$alignClasses = [
-   'left' => 'mw-halign-left',
-   'center' => 'mw-halign-center',
-   'right' => 'mw-halign-right',
+   'left' => 'floatleft',
+   'center' => 'center',
+   'right' => 'floatright',
];
 
switch ( $wgKartographerFrameMode ) {
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 3e92ed1..8d1713f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -86,10 +86,10 @@
 
 
 !! result
-
-
-
-
+
+
+
+
 
 !! end
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I674dbf5459bdb57c8c6905be63195857752406e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Yurik 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Revert to non-Parsoid align styling - change (mediawiki...Kartographer)

2016-03-04 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Revert to non-Parsoid align styling
..

Revert to non-Parsoid align styling

Doesn't work without  that we aren't going to use right now anyway.

Change-Id: I674dbf5459bdb57c8c6905be63195857752406e5
---
M includes/Tag/MapFrame.php
M tests/parserTests.txt
2 files changed, 7 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/53/275153/1

diff --git a/includes/Tag/MapFrame.php b/includes/Tag/MapFrame.php
index 6d98f4d..e00727a 100644
--- a/includes/Tag/MapFrame.php
+++ b/includes/Tag/MapFrame.php
@@ -33,9 +33,9 @@
global $wgKartographerFrameMode;
 
$alignClasses = [
-   'left' => 'mw-halign-left',
-   'center' => 'mw-halign-center',
-   'right' => 'mw-halign-right',
+   'left' => 'floatleft',
+   'center' => 'center',
+   'right' => 'floatright',
];
 
switch ( $wgKartographerFrameMode ) {
diff --git a/tests/parserTests.txt b/tests/parserTests.txt
index 3e92ed1..8d1713f 100644
--- a/tests/parserTests.txt
+++ b/tests/parserTests.txt
@@ -86,10 +86,10 @@
 
 
 !! result
-
-
-
-
+
+
+
+
 
 !! end
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I674dbf5459bdb57c8c6905be63195857752406e5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Handle API errors when refetching the edit token - change (mediawiki...VisualEditor)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Handle API errors when refetching the edit token
..


Handle API errors when refetching the edit token

This can happen when the user gets logged out on a private wiki.
We get a badtoken error, so we try to refetch the token, which
itself returns an error. Token refetches didn't have error handling
at all and got the save dialog stuck in the pending state.

We can't offer the user to proceed with a different identity here,
because we encountered an error while trying to figure out what their
current identity is. The best we can do is encourage them to
log back in in a different tab.

Bug: T128934
Change-Id: I17d4452f688ec22631dbd12af223731635004d66
---
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
4 files changed, 32 insertions(+), 30 deletions(-)

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



diff --git a/extension.json b/extension.json
index 118674a..0136e19 100644
--- a/extension.json
+++ b/extension.json
@@ -364,6 +364,7 @@
"visualeditor-loadwarning",
"visualeditor-loadwarning-token",
"visualeditor-savedialog-identify-anon",
+   "visualeditor-savedialog-identify-trylogin",
"visualeditor-savedialog-identify-user",
"visualeditor-timeout"
]
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index b00bfa5..0eef90b 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -285,8 +285,9 @@
"visualeditor-preference-tabs-prefer-wt": "Always give me the wikitext 
editor",
"visualeditor-preference-tabs-remember-last": "Remember my last editor",
"visualeditor-recreate": "The page has been deleted since you started 
editing. Press \"$1\" to recreate it.",
-   "visualeditor-savedialog-error-badtoken": "We could not process your 
edit because the session was no longer valid.",
+   "visualeditor-savedialog-error-badtoken": "We could not save your edit 
because the session was no longer valid.",
"visualeditor-savedialog-identify-anon": "Do you want to save this page 
as an anonymous user instead? Your IP address will be recorded in this page's 
edit history.",
+   "visualeditor-savedialog-identify-trylogin": "You are no longer logged 
in. Please log back in from a different tab and try again.",
"visualeditor-savedialog-identify-user": "You are now logged in as 
[[User:$1|$1]]. Your edit will be associated with this account if you save this 
edit.",
"visualeditor-savedialog-label-create": "Create page",
"visualeditor-savedialog-label-error": "Error",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 1178e53..e21865a 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -298,6 +298,7 @@
"visualeditor-recreate": "Text shown when the editor fails to save the 
page due to it having been deleted since they opened VE. $1 is the message 
{{msg-mw|ooui-dialog-process-continue}}.",
"visualeditor-savedialog-error-badtoken": "Error displayed in the save 
dialog if saving the edit failed due to an invalid edit token (likely due to 
the user having logged out in a separate window, or logged in again)",
"visualeditor-savedialog-identify-anon": "Displayed in the save dialog 
if saving failed because the session expired and the session is now an 
anonymous user. Warning about IP address being recorded is based on 
{{msg-mw|anoneditwarning}}.\n\n{{format|jquerymsg}}",
+   "visualeditor-savedialog-identify-trylogin": "Displayed in the save 
dialog if saving failed because the session expired and we also encountered an 
error while trying to figure out for which user the current session. This is 
usually due to the user getting logged out on a private wiki.",
"visualeditor-savedialog-identify-user": "Displayed in the save dialog 
if saving failed because the session expired and the session is now for a 
different user account.\n{{format|jquerymsg}}\nParameters:\n* $1 - username",
"visualeditor-savedialog-label-create": "Label text for save button 
when the user is creating a new page\n{{Identical|Create page}}",
"visualeditor-savedialog-label-error": "Label in front of a save dialog 
error sentence, separated by {{msg-mw|colon-separator}}.\n{{Identical|Error}}",
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 8a6e234..d95ea1a 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -104,8 +104,9 @@
 
 /**
  * @event saveErrorBadToken
- * Fired on save

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 074885d..ea11c33 - change (mediawiki/extensions)

2016-03-04 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 074885d..ea11c33
..


Syncronize VisualEditor: 074885d..ea11c33

Change-Id: I69c806672fea219356f6bb70b41d8d14eb62a9ff
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 074885d..ea11c33 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 074885d7cf59900458c1a43034dce1c7a1ff2931
+Subproject commit ea11c33e6d7174090a431bb487c640b79449f71b

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I69c806672fea219356f6bb70b41d8d14eb62a9ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 074885d..ea11c33 - change (mediawiki/extensions)

2016-03-04 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 074885d..ea11c33
..

Syncronize VisualEditor: 074885d..ea11c33

Change-Id: I69c806672fea219356f6bb70b41d8d14eb62a9ff
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/52/275152/1

diff --git a/VisualEditor b/VisualEditor
index 074885d..ea11c33 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 074885d7cf59900458c1a43034dce1c7a1ff2931
+Subproject commit ea11c33e6d7174090a431bb487c640b79449f71b

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69c806672fea219356f6bb70b41d8d14eb62a9ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Full screen map button for - change (mediawiki...Kartographer)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Full screen map button for 
..


Full screen map button for 

Bug: T126608
Change-Id: I82756b096e621c520c862f4ee87fd32090155bcd
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/kartographer.js
4 files changed, 38 insertions(+), 2 deletions(-)

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



diff --git a/extension.json b/extension.json
index 3f98598..8f0ba5e 100644
--- a/extension.json
+++ b/extension.json
@@ -43,6 +43,7 @@
"lib/mapbox-style-fixes.css"
],
"messages": [
+   "kartographer-fullscreen-text",
"mapbox-control-zoomin-title",
"mapbox-control-zoomout-title"
],
diff --git a/i18n/en.json b/i18n/en.json
index d18103d..7f1fa88 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -50,6 +50,7 @@
"mapbox-control-zoomin-title": "Zoom in",
"mapbox-control-zoomout-title": "Zoom out",
"kartographer-fullscreen-close": "Close",
+   "kartographer-fullscreen-text": "Show in full screen",
"visualeditor-mwmapsdialog-geojson": "GeoJSON",
"visualeditor-mwmapsdialog-size": "Size",
"visualeditor-mwmapsdialog-title": "Map"
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4cbbbe7..0492de2 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -52,6 +52,7 @@
"mapbox-control-zoomin-title": "Title for map zoom in 
button\n{{Identical|Zoom in}}",
"mapbox-control-zoomout-title": "Title for map zoom out 
button\n{{Identical|Zoom out}}",
"kartographer-fullscreen-close": "Title of the fullscreen close 
button\n{{Identical|Close}}",
+   "kartographer-fullscreen-text": "Tooltip for a button that puts the map 
into full screen",
"visualeditor-mwmapsdialog-geojson": "{{optional}}\nLabel for map 
GeoJSON data",
"visualeditor-mwmapsdialog-size": "Label for map 
size\n{{Identical|Size}}",
"visualeditor-mwmapsdialog-title": "Title of the map 
dialog\n{{Identical|Map}}"
diff --git a/modules/kartographer.js b/modules/kartographer.js
index 82405af..5c6deee 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -39,6 +39,32 @@
 
mw.kartographer = {};
 
+   mw.kartographer.FullScreenControl = L.Control.extend( {
+   options: {
+   // Do not switch for RTL because zoom also stays in 
place
+   position: 'topright'
+   },
+
+   onAdd: function ( map ) {
+   var container = L.DomUtil.create( 'div', 
'leaflet-control-mapbox-share leaflet-bar' ),
+   link = L.DomUtil.create( 'a', 'mapbox-share 
mapbox-icon mapbox-icon-share', container );
+
+   link.href = '#';
+   link.title = mw.msg( 'kartographer-fullscreen-text' );
+   this.map = map;
+
+   L.DomEvent.addListener( link, 'click', 
this.onShowFullScreen, this );
+   L.DomEvent.disableClickPropagation( container );
+
+   return container;
+   },
+
+   onShowFullScreen: function ( e ) {
+   L.DomEvent.stop( e );
+   mw.kartographer.openFullscreenMap( 
this.options.mapPositionData, this.map );
+   }
+   } );
+
/**
 * Create a new interactive map
 *
@@ -49,6 +75,7 @@
 * @param {number} data.zoom Zoom
 * @param {string} [data.style] Map style
 * @param {string[]} [data.overlays] Names of overlay groups to show
+* @param {boolean} [data.enableFullScreenButton] add zoom
 * @return {L.mapbox.Map} Map object
 */
mw.kartographer.createMap = function ( container, data ) {
@@ -69,6 +96,11 @@
}
map.setView( [ data.latitude, data.longitude ], data.zoom );
map.attributionControl.setPrefix( '' );
+
+   if ( data.enableFullScreenButton ) {
+   map.addControl( new mw.kartographer.FullScreenControl( 
{ mapPositionData: data } ) );
+   }
+
L.tileLayer( mapServer + '/' + style + urlFormat, {
maxZoom: 18,
attribution: mw.message( 'kartographer-attribution' 
).parse()
@@ -179,6 +211,8 @@
data.longitude = center.lng;
data.zoom = map.getZoom();
}
+   // full screen map should never show "full screen" 
button
+   data.enableFullScreenButton = false;
getWindowManager()
.openWindow( mapDialog, data )

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 022d7c2..074885d - change (mediawiki/extensions)

2016-03-04 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 022d7c2..074885d
..

Syncronize VisualEditor: 022d7c2..074885d

Change-Id: I9a0be87e9298d50adf0c8bc82bdbe3a83fcab140
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/51/275151/1

diff --git a/VisualEditor b/VisualEditor
index 022d7c2..074885d 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 022d7c2694d49c5aec29ef16d85c747766f6c169
+Subproject commit 074885d7cf59900458c1a43034dce1c7a1ff2931

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a0be87e9298d50adf0c8bc82bdbe3a83fcab140
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Follow-up 2c24efae: fix typo in event name for unknown save ... - change (mediawiki...VisualEditor)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Follow-up 2c24efae: fix typo in event name for unknown save 
errors
..


Follow-up 2c24efae: fix typo in event name for unknown save errors

This probably means we stopped logging unknown save errors
back in August.

Change-Id: I4a5bac244a469e73643e8a7d978d9212dd838fb0
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
M modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js
2 files changed, 12 insertions(+), 11 deletions(-)

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



diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 6ec0510..8a6e234 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -120,6 +120,7 @@
 
 /**
  * @event saveErrorUnknown
+ * @param {string} errorMsg Error message shown to the user
  * Fired for any other type of save error
  */
 
@@ -654,20 +655,20 @@
  * @method
  * @param {Object} editApi
  * @param {Object|null} data API response data
- * @fires onSaveErrorUnknown
+ * @fires saveErrorUnknown
  */
 ve.init.mw.ArticleTarget.prototype.saveErrorUnknown = function ( editApi, data 
) {
+   var errorMsg = ( editApi && editApi.info ) ||
+   ( data && data.error && data.error.info ) ||
+   ( editApi && editApi.code ) ||
+   ( data && data.error && data.error.code ) ||
+   'Unknown error';
+
this.showSaveError(
-   $( document.createTextNode(
-   ( editApi && editApi.info ) ||
-   ( data.error && data.error.info ) ||
-   ( editApi && editApi.code ) ||
-   ( data.error && data.error.code ) ||
-   'Unknown error'
-   ) ),
+   $( document.createTextNode( errorMsg ) ),
false // prevents reapply
);
-   this.emit( 'onSaveErrorUnknown' );
+   this.emit( 'saveErrorUnknown', errorMsg );
 };
 
 /**
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js
index 2567023..c6c10f8 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTargetEvents.js
@@ -149,8 +149,8 @@
type: typeMap[ type ] || 'responseUnknown',
timing: ve.now() - this.timings.saveInitiated + ( 
this.timings.serializeForCache || 0 )
};
-   if ( type === 'unknown' && failureArguments[ 1 ].error && 
failureArguments[ 1 ].error.code ) {
-   data.message = failureArguments[ 1 ].error.code;
+   if ( type === 'unknown' && failureArguments[ 1 ] ) {
+   data.message = failureArguments[ 1 ];
}
ve.track( 'mwedit.saveFailure', data );
 };

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4a5bac244a469e73643e8a7d978d9212dd838fb0
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Jforrester 
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] Syncronize VisualEditor: 022d7c2..074885d - change (mediawiki/extensions)

2016-03-04 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 022d7c2..074885d
..


Syncronize VisualEditor: 022d7c2..074885d

Change-Id: I9a0be87e9298d50adf0c8bc82bdbe3a83fcab140
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 022d7c2..074885d 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 022d7c2694d49c5aec29ef16d85c747766f6c169
+Subproject commit 074885d7cf59900458c1a43034dce1c7a1ff2931

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a0be87e9298d50adf0c8bc82bdbe3a83fcab140
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Only check if the title is an interwiki if it is for the loc... - change (mediawiki...MassMessage)

2016-03-04 Thread Legoktm (Code Review)

Legoktm has uploaded a new change for review.

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

Change subject: Only check if the title is an interwiki if it is for the local 
site (mm-ch)
..

Only check if the title is an interwiki if it is for the local site (mm-ch)

Basically the same as c03a32de522422e, but for MassMessageListContent.

Bug: T128939
Change-Id: Id9bee3e3e352b6cbe51404109058c344d4213690
---
M includes/content/MassMessageListContentHandler.php
1 file changed, 6 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MassMessage 
refs/changes/50/275150/1

diff --git a/includes/content/MassMessageListContentHandler.php 
b/includes/content/MassMessageListContentHandler.php
index c2eadd2..6a3b703 100644
--- a/includes/content/MassMessageListContentHandler.php
+++ b/includes/content/MassMessageListContentHandler.php
@@ -152,23 +152,22 @@
if ( !$title
|| $title->getText() === ''
|| !$title->canExist()
-   || $title->isExternal()
) {
-   $result['errors'] = array( 'invalidtitle' );
+   $result['errors'][] = 'invalidtitle';
} else {
$result['title'] = $title->getPrefixedText(); // Use 
the canonical form.
}
 
if ( $site !== null && $site !== MassMessage::getBaseUrl( 
$wgCanonicalServer ) ) {
if ( !$wgAllowGlobalMessaging || 
MassMessage::getDBName( $site ) === null ) {
-   if ( array_key_exists( 'errors', $result ) ) {
-   $result['errors'][] = 'invalidsite';
-   } else {
-   $result['errors'] = array( 
'invalidsite' );
-   }
+   $result['errors'][] = 'invalidsite';
} else {
$result['site'] = $site;
}
+   } elseif ( $title && $title->isExternal() ) {
+   // Target has site set to current wiki, but external 
title
+   // TODO: Provide better error message?
+   $result['errors'][] = 'invalidtitle';
}
 
return $result;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9bee3e3e352b6cbe51404109058c344d4213690
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MassMessage
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] Ateneo de Manila University workshops throttle rule - change (operations/mediawiki-config)

2016-03-04 Thread Dereckson (Code Review)

Dereckson has uploaded a new change for review.

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

Change subject: Ateneo de Manila University workshops throttle rule
..

Ateneo de Manila University workshops throttle rule

New throttle rule:
* Event name  Ateneo de Manila University workshops
* Event start ... 2016-03-08 00:00 +8:00
* Event end . 2016-03-08 23:59 +8:00
* IP  202.125.102.33, 121.58.232.35
* Projects .. tlwiki, enwiki, commonswiki
* Attendees . 60-80 (margin set at 100)

Bug: T124284
Change-Id: I6c936d60bda98bb616df8ea6fbf02e6a376761e4
---
M wmf-config/throttle.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php
index 0ded9b9..e6b3ade 100644
--- a/wmf-config/throttle.php
+++ b/wmf-config/throttle.php
@@ -28,6 +28,14 @@
 # );
 ## Add throttling definitions below.
 
+$wmgThrottlingExceptions[] = array( // T128847 - Ateneo de Manila University 
workshops
+   'from'   => '2016-03-08T00:00 +8:00',
+   'to' => '2016-03-08T23:59 +8:00',
+   'IP' => array( '202.125.102.33', '121.58.232.35' ),
+   'dbname' => array( 'tlwiki', 'enwiki', 'commonswiki' ),
+   'value'  => 100 // 60-80 expected
+);
+
 ## Add throttling definitions above.
 
 /**

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

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

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

[MediaWiki-commits] [Gerrit] Handle API errors when refetching the edit token - change (mediawiki...VisualEditor)

2016-03-04 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Handle API errors when refetching the edit token
..

Handle API errors when refetching the edit token

This can happen when the user gets logged out on a private wiki.
We get a badtoken error, so we try to refetch the token, which
itself returns an error. Token refetches didn't have error handling
at all and got the save dialog stuck in the pending state.

We can't offer the user to proceed with a different identity here,
because we encountered an error while trying to figure out what their
current identity is. The best we can do is encourage them to
log back in in a different tab.

Bug: T128934
Change-Id: I17d4452f688ec22631dbd12af223731635004d66
---
M extension.json
M modules/ve-mw/i18n/en.json
M modules/ve-mw/i18n/qqq.json
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
4 files changed, 31 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/48/275148/1

diff --git a/extension.json b/extension.json
index 118674a..0136e19 100644
--- a/extension.json
+++ b/extension.json
@@ -364,6 +364,7 @@
"visualeditor-loadwarning",
"visualeditor-loadwarning-token",
"visualeditor-savedialog-identify-anon",
+   "visualeditor-savedialog-identify-trylogin",
"visualeditor-savedialog-identify-user",
"visualeditor-timeout"
]
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index b00bfa5..5980698 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -287,6 +287,7 @@
"visualeditor-recreate": "The page has been deleted since you started 
editing. Press \"$1\" to recreate it.",
"visualeditor-savedialog-error-badtoken": "We could not process your 
edit because the session was no longer valid.",
"visualeditor-savedialog-identify-anon": "Do you want to save this page 
as an anonymous user instead? Your IP address will be recorded in this page's 
edit history.",
+   "visualeditor-savedialog-identify-trylogin": "It appears you are no 
longer logged in. Try logging back in in a different tab and try again.",
"visualeditor-savedialog-identify-user": "You are now logged in as 
[[User:$1|$1]]. Your edit will be associated with this account if you save this 
edit.",
"visualeditor-savedialog-label-create": "Create page",
"visualeditor-savedialog-label-error": "Error",
diff --git a/modules/ve-mw/i18n/qqq.json b/modules/ve-mw/i18n/qqq.json
index 1178e53..f9a2f37 100644
--- a/modules/ve-mw/i18n/qqq.json
+++ b/modules/ve-mw/i18n/qqq.json
@@ -298,6 +298,7 @@
"visualeditor-recreate": "Text shown when the editor fails to save the 
page due to it having been deleted since they opened VE. $1 is the message 
{{msg-mw|ooui-dialog-process-continue}}.",
"visualeditor-savedialog-error-badtoken": "Error displayed in the save 
dialog if saving the edit failed due to an invalid edit token (likely due to 
the user having logged out in a separate window, or logged in again)",
"visualeditor-savedialog-identify-anon": "Displayed in the save dialog 
if saving failed because the session expired and the session is now an 
anonymous user. Warning about IP address being recorded is based on 
{{msg-mw|anoneditwarning}}.\n\n{{format|jquerymsg}}",
+   "visualeditor-savedialog-identify-trylogin": "Displayd in the save 
dialog if saving failed because the session expired and we encountered an error 
while trying to figure out which user the current session is for. This is 
usually due to the user getting logged out on a private wiki.",
"visualeditor-savedialog-identify-user": "Displayed in the save dialog 
if saving failed because the session expired and the session is now for a 
different user account.\n{{format|jquerymsg}}\nParameters:\n* $1 - username",
"visualeditor-savedialog-label-create": "Label text for save button 
when the user is creating a new page\n{{Identical|Create page}}",
"visualeditor-savedialog-label-error": "Label in front of a save dialog 
error sentence, separated by {{msg-mw|colon-separator}}.\n{{Identical|Error}}",
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 8a6e234..d95ea1a 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -104,8 +104,9 @@
 
 /**
  * @event saveErrorBadToken
- * Fired on save if we have to fetch a new edit token
- *  this is mainly for analytical purposes.
+ * @param {boolean} willRetry Whether an automatic retry will occur
+ * Fired on save if we have to fetch a new edit token.
+ * This is mainly for

[MediaWiki-commits] [Gerrit] wikitech: Remove confusing "Alias /w" that breaks static files - change (operations/puppet)

2016-03-04 Thread Krinkle (Code Review)

Krinkle has uploaded a new change for review.

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

Change subject: wikitech: Remove confusing "Alias /w" that breaks static files
..

wikitech: Remove confusing "Alias /w" that breaks static files

Wikitech was the only domain that had this. No other wikis have this (prod and 
beta).
The script path is already available through the DocumentRoot.

Follows-up 39bfe49.

* Remove superfluous public-wiki-rewrites.incl include from the :80 virtual host
  (only used as redirect, has no public wiki, without the redirect, this would
  make the include produce 404s that route to other 404s).

* Move public-wiki-rewrites.incl down to the section where the primary wiki 
director
  is, similar to all the domains in mediawiki/sites/main.conf in Puppet.

Bug: T128747
Change-Id: I894065cced0ffae675f7a1fd6d8b5541f790d855
---
M modules/openstack/templates/common/wikitech.wikimedia.org.erb
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/275147/1

diff --git a/modules/openstack/templates/common/wikitech.wikimedia.org.erb 
b/modules/openstack/templates/common/wikitech.wikimedia.org.erb
index 6a7b73c..b9d4771 100644
--- a/modules/openstack/templates/common/wikitech.wikimedia.org.erb
+++ b/modules/openstack/templates/common/wikitech.wikimedia.org.erb
@@ -30,8 +30,6 @@
 RewriteCond %{SERVER_PORT} !^443$
 RewriteRule ^/(.*)$ https://<%= @webserver_hostname %>/$1 [L,R]
 
-Include "sites-enabled/public-wiki-rewrites.incl"
-
 ErrorLog /var/log/apache2/error.log
 
 # Possible values include: debug, info, notice, warn, error, crit,
@@ -58,8 +56,6 @@
 RewriteRule ^/view/(.*)$ https://<%= @webserver_hostname %>/wiki/$1 [L,R]
 RewriteCond %{HTTP_HOST}   !^<%= @webserver_hostname.gsub(%r[\.],'\\.') %> 
[NC]
 RewriteRule ^/(.*) https://<%= @webserver_hostname %>/$1 [L,R]
-
-Include "sites-enabled/public-wiki-rewrites.incl"
 
 DocumentRoot /srv/mediawiki/docroot/wikimedia.org
 
@@ -103,11 +99,15 @@
 
 
 
+# Primary wiki redirector:
+Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
+RewriteRule ^/w/$ /w/index.php
+
+Include "sites-enabled/public-wiki-rewrites.incl"
 
 Alias /w/images /srv/org/wikimedia/controller/wikis/images
-Alias /w /srv/mediawiki/docroot/wikimedia.org/w
-Alias /wiki /srv/mediawiki/docroot/wikimedia.org/w/index.php
 Alias /dumps /a/backup/public
+
 <% if @realm == "labs" %>
 # Add additional wikis for development
 Alias /w2 /srv/org/wikimedia/controller/wikis/w2

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

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

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

[MediaWiki-commits] [Gerrit] ganglia: add unit file for systemd on jessie - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: ganglia: add unit file for systemd on jessie
..

ganglia: add unit file for systemd on jessie

Adds a very basic unit file for the ganglia-monitor-aggregator service
when using systemd on jessie.

Bug:T123674
Change-Id: I814ccb2c79b3a5a77b7231e7627a80ca0aa4bb94
---
A modules/ganglia/files/ganglia-monitor-aggregator.service
A modules/ganglia/files/systemd/ganglia-monitor-aggregator.service
M modules/ganglia/manifests/monitor/service.pp
3 files changed, 30 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/275146/1

diff --git a/modules/ganglia/files/ganglia-monitor-aggregator.service 
b/modules/ganglia/files/ganglia-monitor-aggregator.service
new file mode 100644
index 000..5a35eb2
--- /dev/null
+++ b/modules/ganglia/files/ganglia-monitor-aggregator.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Ganglia aggregator
+
+[Service]
+TimeoutStartSec=0
+ExecStart=/usr/sbin/gmond
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/modules/ganglia/files/systemd/ganglia-monitor-aggregator.service 
b/modules/ganglia/files/systemd/ganglia-monitor-aggregator.service
new file mode 100644
index 000..5a35eb2
--- /dev/null
+++ b/modules/ganglia/files/systemd/ganglia-monitor-aggregator.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Ganglia aggregator
+
+[Service]
+TimeoutStartSec=0
+ExecStart=/usr/sbin/gmond
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/modules/ganglia/manifests/monitor/service.pp 
b/modules/ganglia/manifests/monitor/service.pp
index dd29f5e..eb0de6d 100644
--- a/modules/ganglia/manifests/monitor/service.pp
+++ b/modules/ganglia/manifests/monitor/service.pp
@@ -11,6 +11,16 @@
 }
 }
 
+if os_version('debian >= jessie') {
+file { '/etc/systemd/system/ganglia-monitor-aggregator.service':
+owner  => 'root',
+group  => 'root',
+mode   => '0444',
+source => 
"puppet:///modules/${module_name}/systemd/ganglia-monitor-aggregator.service",
+before => Service['ganglia-monitor'],
+}
+}
+
 service { 'ganglia-monitor':
 ensure   => running,
 provider => $::initsystem,

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

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

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

[MediaWiki-commits] [Gerrit] Full screen map button for - change (mediawiki...Kartographer)

2016-03-04 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Full screen map button for 
..

Full screen map button for 

Bug: T126608
Change-Id: I82756b096e621c520c862f4ee87fd32090155bcd
---
M extension.json
M i18n/en.json
M i18n/qqq.json
M modules/kartographer.js
4 files changed, 39 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/45/275145/1

diff --git a/extension.json b/extension.json
index 3f98598..06fb9dc 100644
--- a/extension.json
+++ b/extension.json
@@ -43,6 +43,7 @@
"lib/mapbox-style-fixes.css"
],
"messages": [
+   "kartographer-fullscreen-button",
"mapbox-control-zoomin-title",
"mapbox-control-zoomout-title"
],
diff --git a/i18n/en.json b/i18n/en.json
index d18103d..fd4d5f2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -50,6 +50,7 @@
"mapbox-control-zoomin-title": "Zoom in",
"mapbox-control-zoomout-title": "Zoom out",
"kartographer-fullscreen-close": "Close",
+   "kartographer-fullscreen-button": "Full screen",
"visualeditor-mwmapsdialog-geojson": "GeoJSON",
"visualeditor-mwmapsdialog-size": "Size",
"visualeditor-mwmapsdialog-title": "Map"
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 4cbbbe7..8205bfd 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -52,6 +52,7 @@
"mapbox-control-zoomin-title": "Title for map zoom in 
button\n{{Identical|Zoom in}}",
"mapbox-control-zoomout-title": "Title for map zoom out 
button\n{{Identical|Zoom out}}",
"kartographer-fullscreen-close": "Title of the fullscreen close 
button\n{{Identical|Close}}",
+   "kartographer-fullscreen-button": "Label for fullscreen button",
"visualeditor-mwmapsdialog-geojson": "{{optional}}\nLabel for map 
GeoJSON data",
"visualeditor-mwmapsdialog-size": "Label for map 
size\n{{Identical|Size}}",
"visualeditor-mwmapsdialog-title": "Title of the map 
dialog\n{{Identical|Map}}"
diff --git a/modules/kartographer.js b/modules/kartographer.js
index 82405af..a31062d 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -39,6 +39,33 @@
 
mw.kartographer = {};
 
+   mw.kartographer.FullScreenControl = L.Control.extend( {
+   options: {
+   // FIXME: which is better?
+   // position: document.dir === 'rtl' ? 'topleft' : 
'topright'
+   position: $( document.body ).is( '.rtl' ) ? 'topleft' : 
'topright'
+   },
+
+   onAdd: function( map ) {
+   this._map = map;
+
+   var container = L.DomUtil.create( 'div', 
'leaflet-control-mapbox-share leaflet-bar' );
+   var link = L.DomUtil.create( 'a', 'mapbox-share 
mapbox-icon mapbox-icon-share', container );
+   link.href = '#';
+   link.title = mw.msg( 'kartographer-fullscreen-button' );
+
+   L.DomEvent.addListener( link, 'click', 
this._fullScreenClick, this );
+   L.DomEvent.disableClickPropagation( container );
+
+   return container;
+   },
+
+   _fullScreenClick: function( e ) {
+   L.DomEvent.stop( e );
+   mw.kartographer.openFullscreenMap( 
this.options.mapPositionData, this._map );
+   }
+   } );
+
/**
 * Create a new interactive map
 *
@@ -49,6 +76,7 @@
 * @param {number} data.zoom Zoom
 * @param {string} [data.style] Map style
 * @param {string[]} [data.overlays] Names of overlay groups to show
+* @param {boolean} [data.enableFullScreenButton] add zoom
 * @return {L.mapbox.Map} Map object
 */
mw.kartographer.createMap = function ( container, data ) {
@@ -69,6 +97,11 @@
}
map.setView( [ data.latitude, data.longitude ], data.zoom );
map.attributionControl.setPrefix( '' );
+
+   if ( data.enableFullScreenButton ) {
+   map.addControl( new mw.kartographer.FullScreenControl( 
{ mapPositionData: data } ) );
+   }
+
L.tileLayer( mapServer + '/' + style + urlFormat, {
maxZoom: 18,
attribution: mw.message( 'kartographer-attribution' 
).parse()
@@ -179,6 +212,8 @@
data.longitude = center.lng;
data.zoom = map.getZoom();
}
+   // full screen map should never show "full screen" 
button
+   delete

[MediaWiki-commits] [Gerrit] Adjust dwelltime calculation - change (wikimedia...ortiz)

2016-03-04 Thread Bearloga (Code Review)

Bearloga has uploaded a new change for review.

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

Change subject: Adjust dwelltime calculation
..

Adjust dwelltime calculation

- Makes dwell_time_ output max intertime
- Brings dwelltime > threshold check out
  into dwell_time

Bug: T128929
Change-Id: I60ad61077b1db34f668973180285937fbe7d300d
---
M DESCRIPTION
M NAMESPACE
M R/RcppExports.R
M R/dwell.R
A inst/extdata/search_satisfaction_event_logging.csv
M man/dwell_time.Rd
M man/ortiz.Rd
M src/RcppExports.cpp
M src/dwell.cpp
M src/dwell.h
M src/ortiz.cpp
A tests/testthat.R
A tests/testthat/test-dwelltime.R
13 files changed, 41,013 insertions(+), 45 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/ortiz 
refs/changes/44/275144/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I60ad61077b1db34f668973180285937fbe7d300d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/ortiz
Gerrit-Branch: master
Gerrit-Owner: Bearloga 

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

[MediaWiki-commits] [Gerrit] Hygiene: Remove srcset stripping in MobileFrontend - change (mediawiki...MobileFrontend)

2016-03-04 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Hygiene: Remove srcset stripping in MobileFrontend
..

Hygiene: Remove srcset stripping in MobileFrontend

This can be and is configured via $wgResponsiveImages
and EnterMobileMode hook.

Thanks for @krinkle for pointing this out:
https://github.com/wikimedia/
operations-mediawiki-config/blob/
1da33e4cdcd3144d3ca63469750361deee90ee15/wmf-config/mobile.php#L73

Change-Id: Ifb7c4673ce6bb2a60ed8086be5d85283711b5e60
---
M extension.json
M includes/MobileFrontend.hooks.php
2 files changed, 0 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/43/275143/1

diff --git a/extension.json b/extension.json
index 9ee40ae..a66bc25 100644
--- a/extension.json
+++ b/extension.json
@@ -1906,9 +1906,6 @@
"SkinPreloadExistence": [
"MobileFrontendHooks::onSkinPreloadExistence"
],
-   "ThumbnailBeforeProduceHTML": [
-   "MobileFrontendHooks::onThumbnailBeforeProduceHTML"
-   ],
"PageRenderingHash": [
"MobileFrontendHooks::onPageRenderingHash"
],
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 61d8ef9..6bf82cb 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1262,19 +1262,6 @@
}
 
/**
-* Omit srcset attributes from thumbnail image tags, to conserve 
bandwidth.
-*
-* @param ThumbnailImage $thumbnail
-* @param array &$attribs
-* @param array &$linkAttribs
-*/
-   public static function onThumbnailBeforeProduceHTML( $thumbnail, 
&$attribs, &$linkAttribs ) {
-   if ( MobileContext::singleton()->shouldDisplayMobileView() ) {
-   unset( $attribs['srcset'] );
-   }
-   }
-
-   /**
 * LoginFormValidErrorMessages hook handler to promote MF specific 
error message be valid.
 *
 * @param array $messages Array of already added messages

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifb7c4673ce6bb2a60ed8086be5d85283711b5e60
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] Limit 2 secondary actions outside the menu - change (mediawiki...Echo)

2016-03-04 Thread Mooeypoo (Code Review)

Mooeypoo has uploaded a new change for review.

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

Change subject: Limit 2 secondary actions outside the menu
..

Limit 2 secondary actions outside the menu

If there are more than 2 prioritized actions, put those actions
in the dotdotdot menu.

Also, correct the name of a variable from "isInsideMenu" to what
it actually represents, which is, in fact, "isOutsideMenu"

Bug: T126617
Change-Id: I95fcae8f822e51d9353599c09f1550797e4ad673
---
M modules/ooui/mw.echo.ui.NotificationItemWidget.js
1 file changed, 6 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/42/275142/1

diff --git a/modules/ooui/mw.echo.ui.NotificationItemWidget.js 
b/modules/ooui/mw.echo.ui.NotificationItemWidget.js
index ab000db..0b4478e 100644
--- a/modules/ooui/mw.echo.ui.NotificationItemWidget.js
+++ b/modules/ooui/mw.echo.ui.NotificationItemWidget.js
@@ -14,7 +14,7 @@
 * @cfg {boolean} [bundle=false] This notification item is part of a 
bundle.
 */
mw.echo.ui.NotificationItemWidget = function 
MwEchoUiNotificationItemWidget( model, config ) {
-   var i, secondaryUrls, urlObj, linkButton, $icon, isInsideMenu, 
echoMoment,
+   var i, secondaryUrls, urlObj, linkButton, $icon, isOutsideMenu, 
echoMoment,
$message = $( '' ).addClass( 
'mw-echo-ui-notificationItemWidget-content-message' ),
widget = this;
 
@@ -117,7 +117,7 @@
for ( i = 0; i < secondaryUrls.length; i++ ) {
urlObj = secondaryUrls[ i ];
 
-   isInsideMenu = !this.bundle && urlObj.prioritized !== 
undefined;
+   isOutsideMenu = !this.bundle && urlObj.prioritized !== 
undefined;
 
linkButton = new mw.echo.ui.MenuItemWidget( {
icon: urlObj.icon || 'next',
@@ -125,15 +125,17 @@
tooltip: urlObj.tooltip,
description: urlObj.description,
url: urlObj.url,
-   prioritized: isInsideMenu
+   prioritized: isOutsideMenu
} );
 
-   if ( isInsideMenu ) {
+   // Limit to 2 items outside the menu
+   if ( isOutsideMenu && i < 2 ) {
this.actionsButtonSelectWidget.addItems( [ 
linkButton ] );
} else {
this.menuPopupButtonWidget.getMenu().addItems( 
[ linkButton ] );
}
}
+
// Add a "mark as read" secondary action
this.markAsReadSecondary = new mw.echo.ui.MenuItemWidget( {
icon: 'check',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I95fcae8f822e51d9353599c09f1550797e4ad673
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

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

[MediaWiki-commits] [Gerrit] Move wrapping of body text after hook - change (mediawiki/core)

2016-03-04 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Move wrapping of body text after hook
..

Move wrapping of body text after hook

The MobileFrontend extension manipulates the bodytext value before
rendering with various transformations via the MobileFormatter but
still needs the content to be wrapped with this important information
relating to language.

Thus apply this after the hook.

This avoids unnecessary logic in I2b2aa15bee73454b1abc238c3413d30cdaa49f2c

Change-Id: I8a9e732d0682af89112869a2b30f61f10f531219
---
M includes/skins/SkinTemplate.php
1 file changed, 19 insertions(+), 16 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/41/275141/1

diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 1328870..c351d89 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -426,22 +426,6 @@
$tpl->set( 'sitenotice', $this->getSiteNotice() );
$tpl->set( 'bottomscripts', $this->bottomScripts() );
$tpl->set( 'printfooter', $this->printSource() );
-
-   # An ID that includes the actual body text; without categories, 
contentSub, ...
-   $realBodyAttribs = array( 'id' => 'mw-content-text' );
-
-   # Add a mw-content-ltr/rtl class to be able to style based on 
text direction
-   # when the content is different from the UI language, i.e.:
-   # not for special pages or file pages AND only when viewing
-   if ( !in_array( $title->getNamespace(), array( NS_SPECIAL, 
NS_FILE ) ) &&
-   Action::getActionName( $this ) === 'view' ) {
-   $pageLang = $title->getPageViewLanguage();
-   $realBodyAttribs['lang'] = $pageLang->getHtmlCode();
-   $realBodyAttribs['dir'] = $pageLang->getDir();
-   $realBodyAttribs['class'] = 'mw-content-' . 
$pageLang->getDir();
-   }
-
-   $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, 
$out->mBodytext );
$tpl->setRef( 'bodytext', $out->mBodytext );
 
$language_urls = $this->getLanguages();
@@ -473,6 +457,25 @@
wfDebug( __METHOD__ . ": Hook 
SkinTemplateOutputPageBeforeExec broke outputPage execution!\n" );
}
 
+   # An ID that includes the actual body text; without categories, 
contentSub, ...
+   $realBodyAttribs = array( 'id' => 'mw-content-text' );
+
+   # Add a mw-content-ltr/rtl class to be able to style based on 
text direction
+   # when the content is different from the UI language, i.e.:
+   # not for special pages or file pages AND only when viewing
+   if ( !in_array( $title->getNamespace(), array( NS_SPECIAL, 
NS_FILE ) ) &&
+   Action::getActionName( $this ) === 'view' ) {
+   $pageLang = $title->getPageViewLanguage();
+   $realBodyAttribs['lang'] = $pageLang->getHtmlCode();
+   $realBodyAttribs['dir'] = $pageLang->getDir();
+   $realBodyAttribs['class'] = 'mw-content-' . 
$pageLang->getDir();
+   }
+
+   // Wrap the bodyText with #mw-content-text element
+   // Do this after the hook in case anything has changed
+   $out->mBodytext = Html::rawElement( 'div', $realBodyAttribs, 
$out->mBodytext );
+   $tpl->setRef( 'bodytext', $out->mBodytext );
+
// Set the bodytext to another key so that skins can just 
output it on its own
// and output printfooter and debughtml separately
$tpl->set( 'bodycontent', $tpl->data['bodytext'] );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a9e732d0682af89112869a2b30f61f10f531219
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] ganglia: don't try to use upstart on jessie - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: ganglia: don't try to use upstart on jessie
..


ganglia: don't try to use upstart on jessie

Bug:T123674
Change-Id: I0f6dd718620fd3dd5ed9ac8863c251878ba17d0e
---
M modules/ganglia/manifests/monitor/aggregator.pp
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/modules/ganglia/manifests/monitor/aggregator.pp 
b/modules/ganglia/manifests/monitor/aggregator.pp
index d7f6e88..d82c860 100644
--- a/modules/ganglia/manifests/monitor/aggregator.pp
+++ b/modules/ganglia/manifests/monitor/aggregator.pp
@@ -35,9 +35,15 @@
 
 site_instances{ $sites: }
 
+if os_version('debian >= jessie') {
+  $ganglia_provider = 'systemd'
+} else {
+  $ganglia_provider = 'upstart'
+}
+
 service { 'ganglia-monitor-aggregator':
 ensure   => running,
-provider => 'upstart',
+provider => $ganglia_provider,
 name => 'ganglia-monitor-aggregator',
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] Follow-up 2c24efae: fix typo in event name for unknown save ... - change (mediawiki...VisualEditor)

2016-03-04 Thread Catrope (Code Review)

Catrope has uploaded a new change for review.

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

Change subject: Follow-up 2c24efae: fix typo in event name for unknown save 
errors.
..

Follow-up 2c24efae: fix typo in event name for unknown save errors.

This probably means we stopped logging unknown save errors
back in August.

Change-Id: I4a5bac244a469e73643e8a7d978d9212dd838fb0
---
M modules/ve-mw/init/ve.init.mw.ArticleTarget.js
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/40/275140/1

diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js 
b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 6ec0510..71e0c04 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -667,7 +667,7 @@
) ),
false // prevents reapply
);
-   this.emit( 'onSaveErrorUnknown' );
+   this.emit( 'saveErrorUnknown' );
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a5bac244a469e73643e8a7d978d9212dd838fb0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope 

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

[MediaWiki-commits] [Gerrit] Coordinate result browser - change (wikidata...gui)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Coordinate result browser
..


Coordinate result browser

Adds viewing result as map with Wikimedia tiles server.

Change-Id: I1f1f143fa07fbbd149ae8160e761ef20d5810033
---
M .jshintrc
M index.html
M style.css
A vendor/leaflet/images/layers-2x.png
A vendor/leaflet/images/layers.png
A vendor/leaflet/images/marker-icon-2x.png
A vendor/leaflet/images/marker-icon.png
A vendor/leaflet/images/marker-shadow.png
A vendor/leaflet/leaflet-src.js
A vendor/leaflet/leaflet.css
A vendor/leaflet/leaflet.js
M wikibase/queryService/ui/App.js
A wikibase/queryService/ui/resultBrowser/CoordinateResultBrowser.js
13 files changed, 9,850 insertions(+), 4 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1f1f143fa07fbbd149ae8160e761ef20d5810033
Gerrit-PatchSet: 10
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 
Gerrit-Reviewer: Aude 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ganglia: don't try to use upstart on jessie - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: ganglia: don't try to use upstart on jessie
..

ganglia: don't try to use upstart on jessie

Bug:T123674
Change-Id: I0f6dd718620fd3dd5ed9ac8863c251878ba17d0e
---
M modules/ganglia/manifests/monitor/aggregator.pp
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/39/275139/1

diff --git a/modules/ganglia/manifests/monitor/aggregator.pp 
b/modules/ganglia/manifests/monitor/aggregator.pp
index d7f6e88..97d24bb 100644
--- a/modules/ganglia/manifests/monitor/aggregator.pp
+++ b/modules/ganglia/manifests/monitor/aggregator.pp
@@ -35,9 +35,15 @@
 
 site_instances{ $sites: }
 
+if os_version('debian >= jessie') {
+   $ganglia_provider = 'systemd'
+} else {
+   $ganglia_provider = 'upstart'
+}
+
 service { 'ganglia-monitor-aggregator':
 ensure   => running,
-provider => 'upstart',
+provider => $ganglia_provider,
 name => 'ganglia-monitor-aggregator',
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] qunit: Don't require expect() anymore - change (mediawiki/core)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: qunit: Don't require expect() anymore
..


qunit: Don't require expect() anymore

This hasn't been useful in QUnit for a while now with the improved
assertion context object and tracking of asynchronous tests without
shared global state.

Change-Id: Icaf865b4d6e85e739bf79c4d1bacb8a71ec5a3da
---
M tests/qunit/data/testrunner.js
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js
index 07e6f26..1091d09 100644
--- a/tests/qunit/data/testrunner.js
+++ b/tests/qunit/data/testrunner.js
@@ -26,8 +26,6 @@
// killing the test and assuming timeout failure.
QUnit.config.testTimeout = 60 * 1000;
 
-   QUnit.config.requireExpects = true;
-
// Add a checkbox to QUnit header to toggle MediaWiki ResourceLoader 
debug mode.
QUnit.config.urlConfig.push( {
id: 'debug',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icaf865b4d6e85e739bf79c4d1bacb8a71ec5a3da
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Legoktm 
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: Database server to support Program Dashboard - change (operations/puppet)

2016-03-04 Thread Dduvall (Code Review)

Dduvall has uploaded a new change for review.

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

Change subject: labs: Database server to support Program Dashboard
..

labs: Database server to support Program Dashboard

Provision a basic MariaDB server to store Program Dashboard data. The
data directory is kept on an LVM volume to allow for periodic
snapshotting.

Bug: T127105
Change-Id: Ie816ea8f4127c8a2c9a817c8d815f3b7956b0cde
---
A hieradata/common/programdashboard/database.yaml
A modules/programdashboard/manifests/database.pp
A modules/programdashboard/templates/my.cnf.erb
A modules/role/manifests/programdashboard/database.pp
4 files changed, 100 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/common/programdashboard/database.yaml 
b/hieradata/common/programdashboard/database.yaml
new file mode 100644
index 000..1fb7ec6
--- /dev/null
+++ b/hieradata/common/programdashboard/database.yaml
@@ -0,0 +1,2 @@
+datadir: /srv/sqldata
+tmpdir: /srv/tmp
diff --git a/modules/programdashboard/manifests/database.pp 
b/modules/programdashboard/manifests/database.pp
new file mode 100644
index 000..ae27f68
--- /dev/null
+++ b/modules/programdashboard/manifests/database.pp
@@ -0,0 +1,40 @@
+# = Class: programdashboard::database
+#
+# A database server for the the Program Dashboard Rails application.
+#
+# === Parameters
+#
+# [*datadir*]
+#   MariaDB data directory. An XFS formatted LVM volume will be created from
+#   80% of the instance volume's free space and mounted at this directory.
+#
+# [*tmpdir*]
+#   MariaDB temporary directory. An XFS formatted LVM volume will be created
+#   from 20% of the instance volume's free space and mounted at this
+#   directory.
+#
+class programdashboard::database(
+$datadir,
+$tmpdir,
+) {
+include mariadb::packages
+
+labs_lvm::volume { 'dashboard-data':
+mountat => $datadir,
+size=> '80%FREE',
+}
+
+labs_lvm::volume { 'dashboard-tmp':
+mountat => $tmpdir,
+size=> '100%FREE',
+require => Labs_lvm::Volume['dashboard-db'],
+}
+
+class { 'mariadb::config':
+prompt   => 'DASHBOARD',
+config   => 'programdashboard/my.cnf.erb',
+datadir  => $datadir,
+tmpdir   => $tmpdir,
+require  => Labs_lvm::Volume['dashboard-db', 'dashboard-tmp'],
+}
+}
diff --git a/modules/programdashboard/templates/my.cnf.erb 
b/modules/programdashboard/templates/my.cnf.erb
new file mode 100644
index 000..224abb7
--- /dev/null
+++ b/modules/programdashboard/templates/my.cnf.erb
@@ -0,0 +1,46 @@
+# Use for Analytics Cluster misc meta stores (Hive, Oozie, etc.)
+
+[client]
+port   = 3306
+socket = /tmp/mysql.sock
+
+[mysqld]
+
+log_error=/var/log/mysql.err
+
+log_bin
+binlog_format = MIXED
+log_slave_updates
+skip-external-locking
+skip-name-resolve
+temp-pool
+log_basename=program-dashboard
+
+user  = mysql
+socket= /tmp/mysql.sock
+port  = 3306
+datadir   = <%= @datadir %>
+tmpdir= <%= @tmpdir %>
+server_id = <%= @server_id %>
+read_only = <%= (@read_only == 'off' or not @read_only) ? 0 : 1 %>
+
+max_allowed_packet = 64M
+sync_binlog= 1
+expire_logs_days   = 7
+
+innodb_file_per_table  = 1
+innodb_log_file_size   = 64M
+innodb_flush_method= O_DIRECT
+innodb_flush_log_at_trx_commit = 1
+innodb_buffer_pool_size= <%= (@memoryfree_mb * 0.9).floor %>M
+innodb_buffer_pool_instances   = <%= (@memoryfree_mb * 0.9 / 1024).ceil %>
+
+query_cache_type= 1
+query_cache_size= 16M
+
+[mysqldump]
+
+quick
+max_allowed_packet = 16M
+
+#!includedir /etc/mysql/conf.d/
diff --git a/modules/role/manifests/programdashboard/database.pp 
b/modules/role/manifests/programdashboard/database.pp
new file mode 100644
index 000..682b6ab
--- /dev/null
+++ b/modules/role/manifests/programdashboard/database.pp
@@ -0,0 +1,12 @@
+# = Class: role::programdashboard::database
+#
+# This role sets up a database server for the Program Dashboard Rails
+# application.
+#
+class role::programdashboard::database {
+include ::programdashboard::database
+
+system::role { 'role::programdashboard::database':
+description => 'Program Dashboard database server',
+}
+}

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

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

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

[MediaWiki-commits] [Gerrit] ganglia: temp. put aggregator on alsafi - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: ganglia: temp. put aggregator on alsafi
..


ganglia: temp. put aggregator on alsafi

This is temporary to test ganglia on jessie issues.
I tried for hours to do this in labs but could not get it to work.

Change-Id: I0d0dad3c0ed793f7874d6b7ab6697e6fb7a6a2f5
---
M manifests/site.pp
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index bfc08ed..59869f3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -33,6 +33,10 @@
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }
+
+class { 'ganglia::monitor::aggregator':
+sites =>  'codfw',
+}
 }
 
 # analytics1001 is the Hadoop master node:

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

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

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

[MediaWiki-commits] [Gerrit] Include error code in API failure message - change (mediawiki...Thanks)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Include error code in API failure message
..


Include error code in API failure message

Otherwise the error reports we get are completely useless.

Bug: T78697
Change-Id: Ic0244e2e947256c411c889a8850c8f18ee3658a4
---
M i18n/en.json
M i18n/qqq.json
M modules/ext.thanks.revthank.js
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index ee6946e..b5d4cb3 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -9,7 +9,7 @@
"thanks-thanked": "{{GENDER:$1|{{GENDER:$2|thanked",
"thanks-button-thank": "{{GENDER:$1|{{GENDER:$2|Thank",
"thanks-button-thanked": "{{GENDER:$1|{{GENDER:$2|Thanked",
-   "thanks-error-undefined": "Thank action failed. Please try again.",
+   "thanks-error-undefined": "Thank action failed (error code: $1). Please 
try again.",
"thanks-error-invalidrevision": "Revision ID is not valid.",
"thanks-error-ratelimited": "{{GENDER:$1|You}}'ve exceeded your rate 
limit. Please wait some time and try again.",
"thanks-thank-tooltip": "{{GENDER:$1|Send}} a thank you notification to 
this {{GENDER:$2|user}}",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index 131297c..709071c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -18,7 +18,7 @@
"thanks-thanked": "This message immediately replaces the message 
{{msg-mw|Thanks-thank}} after it's pressed. It means that the thanking 
operation has been completed.\n\nIt can be translated as \"''thanked''\" in 
\"You thanked the user\" or \"The user has just been ''thanked''\" - whatever 
is appropriate to your language.\nFor languages that need it, the gender of 
each of the thanked and thanking users is available.\n\nParameters:\n* $1 - The 
user that is thanking\n* $2 - The user that is thanked\n{{Identical|Thanked}}",
"thanks-button-thank": "Text of a button to thank another user. Same as 
{{msg-mw|Thanks-thank}}, but the context is in a button.\n\nParameters:\n* $1 - 
The user that is thanking, for gender\n* $2 - The user that is being thanked, 
for gender\n{{Identical|Thank}}",
"thanks-button-thanked": "This message immediately replaces the message 
{{msg-mw|Thanks-button-thank}} after it's pressed. It means that the thanking 
operation has been completed.\n\nSame as {{msg-mw|Thanks-thanked}}, but the 
context is in a button.\n\nParameters:\n* $1 - The user that is thanking, for 
gender\n* $2 - The user that is being thanked, for 
gender\n{{Identical|Thanked}}",
-   "thanks-error-undefined": "Error message that is displayed when the 
thank action fails.\n{{Identical|Please try again}}",
+   "thanks-error-undefined": "Error message that is displayed when the 
thank action fails. $1 is the error code returned by the API (an English 
string)",
"thanks-error-invalidrevision": "Error message that is displayed when 
the revision ID is not valid",
"thanks-error-ratelimited": "Error message that is displayed when user 
exceeds rate limit. Parameters:\n* $1 - gender",
"thanks-thank-tooltip": "Tooltip that appears when a user hovers over 
the \"thank\" link. Parameters:\n* $1 - The user sending the thanks.  Can be 
used for GENDER support.\n* $2 - The user receiving the thanks.  Can be used 
for GENDER support",
diff --git a/modules/ext.thanks.revthank.js b/modules/ext.thanks.revthank.js
index 593558d..63f413a 100644
--- a/modules/ext.thanks.revthank.js
+++ b/modules/ext.thanks.revthank.js
@@ -46,7 +46,7 @@
alert( mw.msg( 
'thanks-error-ratelimited', mw.user ) );
break;
default:
-   alert( mw.msg( 
'thanks-error-undefined' ) );
+   alert( mw.msg( 
'thanks-error-undefined', errorCode ) );
}
}
)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic0244e2e947256c411c889a8850c8f18ee3658a4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Thanks
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: Siebrand 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add newly validated query-based language models to TextCat - change (wikimedia/textcat)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add newly validated query-based language models to TextCat
..


Add newly validated query-based language models to TextCat

Add validated models for language ID of queries that are not
already present. Includes Czech, Indonesian, Italian, Japanese,
Dutch, Polish, Portuguese, Swedish, Turkish, Ukrainian, and
Vietnamese

Bug: T121539
Change-Id: I44cb67fe411de32c9b0848058ef18cc95e83231f
---
A LM-query/cs.lm
A LM-query/id.lm
A LM-query/it.lm
A LM-query/ja.lm
A LM-query/nl.lm
A LM-query/pl.lm
A LM-query/pt.lm
A LM-query/sv.lm
A LM-query/tr.lm
A LM-query/uk.lm
A LM-query/vi.lm
11 files changed, 110,044 insertions(+), 0 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I44cb67fe411de32c9b0848058ef18cc95e83231f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/textcat
Gerrit-Branch: master
Gerrit-Owner: Tjones 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ganglia: temp. put aggregator on alsafi - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: ganglia: temp. put aggregator on alsafi
..

ganglia: temp. put aggregator on alsafi

This is temporary to test ganglia on jessie issues.
I tried for hours to do this in labs but could not get it to work.

Change-Id: I0d0dad3c0ed793f7874d6b7ab6697e6fb7a6a2f5
---
M manifests/site.pp
1 file changed, 4 insertions(+), 0 deletions(-)


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

diff --git a/manifests/site.pp b/manifests/site.pp
index bfc08ed..59869f3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -33,6 +33,10 @@
 interface::add_ip6_mapped { 'main':
 interface => 'eth0',
 }
+
+class { 'ganglia::monitor::aggregator':
+sites =>  'codfw',
+}
 }
 
 # analytics1001 is the Hadoop master node:

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

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

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0d94d83..022d7c2 - change (mediawiki/extensions)

2016-03-04 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 0d94d83..022d7c2
..


Syncronize VisualEditor: 0d94d83..022d7c2

Change-Id: If34e04d410f553d3af8dc867db2e0e05305ca922
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 0d94d83..022d7c2 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 0d94d8312dd916d5142960dc563805673f3425e5
+Subproject commit 022d7c2694d49c5aec29ef16d85c747766f6c169

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If34e04d410f553d3af8dc867db2e0e05305ca922
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (f77ac2b) - change (mediawiki...VisualEditor)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Update VE core submodule to master (f77ac2b)
..


Update VE core submodule to master (f77ac2b)

New changes:
4cef3da ve.test.utils: Don't require QUnit expect() anymore
70ee810 Localisation updates from https://translatewiki.net.

Change-Id: If37267012a10e611b3eae63e58a5da3c77ab8fdb
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/lib/ve b/lib/ve
index 46f34e1..f77ac2b 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 46f34e19aa9e1195016e958b8e233d5cece9a07d
+Subproject commit f77ac2be79b59230e4acb49f837a54d6230be6bc

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If37267012a10e611b3eae63e58a5da3c77ab8fdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
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] Syncronize VisualEditor: 0d94d83..022d7c2 - change (mediawiki/extensions)

2016-03-04 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 0d94d83..022d7c2
..

Syncronize VisualEditor: 0d94d83..022d7c2

Change-Id: If34e04d410f553d3af8dc867db2e0e05305ca922
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/36/275136/1

diff --git a/VisualEditor b/VisualEditor
index 0d94d83..022d7c2 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 0d94d8312dd916d5142960dc563805673f3425e5
+Subproject commit 022d7c2694d49c5aec29ef16d85c747766f6c169

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If34e04d410f553d3af8dc867db2e0e05305ca922
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Don't treat configured but absent engine as executable - change (mediawiki/core)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Don't treat configured but absent engine as executable
..


Don't treat configured but absent engine as executable

E.g. if you have $wgExternalDiffEngine = 'wikidiff2' but after
a PHP update you no longer have the module you still shouldn't attempt
to shell out to some nonexistent wikidiff2.

Bug: T74030
Change-Id: I745cd1cb2e152f4fbb95c8f782d70117f8c844f1
---
M includes/diff/DifferenceEngine.php
1 file changed, 9 insertions(+), 8 deletions(-)

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



diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index 622137a..1fa1970 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -852,15 +852,16 @@
$wgExternalDiffEngine = false;
}
 
-   if ( $wgExternalDiffEngine == 'wikidiff2' && function_exists( 
'wikidiff2_do_diff' ) ) {
-   # Better external diff engine, the 2 may some day be 
dropped
-   # This one does the escaping and segmenting itself
-   $text = wikidiff2_do_diff( $otext, $ntext, 2 );
-   $text .= $this->debug( 'wikidiff2' );
+   if ( $wgExternalDiffEngine == 'wikidiff2' ) {
+   if ( function_exists( 'wikidiff2_do_diff' ) ) {
+   # Better external diff engine, the 2 may some 
day be dropped
+   # This one does the escaping and segmenting 
itself
+   $text = wikidiff2_do_diff( $otext, $ntext, 2 );
+   $text .= $this->debug( 'wikidiff2' );
 
-   return $text;
-   }
-   if ( $wgExternalDiffEngine != 'wikidiff3' && 
$wgExternalDiffEngine !== false ) {
+   return $text;
+   }
+   } elseif ( $wgExternalDiffEngine != 'wikidiff3' && 
$wgExternalDiffEngine !== false ) {
# Diff via the shell
$tmpDir = wfTempDir();
$tempName1 = tempnam( $tmpDir, 'diff_' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I745cd1cb2e152f4fbb95c8f782d70117f8c844f1
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 
Gerrit-Reviewer: Aaron Schulz 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Get rid of CRLF - change (analytics/reportupdater-queries)

2016-03-04 Thread Milimetric (Code Review)

Milimetric has submitted this change and it was merged.

Change subject: Get rid of CRLF
..


Get rid of CRLF

Change-Id: Idd49e6038680451e663da26d9958df933aab2eac
---
A .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..1377554
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idd49e6038680451e663da26d9958df933aab2eac
Gerrit-PatchSet: 1
Gerrit-Project: analytics/reportupdater-queries
Gerrit-Branch: master
Gerrit-Owner: Milimetric 
Gerrit-Reviewer: Milimetric 

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

[MediaWiki-commits] [Gerrit] Get rid of CRLF - change (analytics/reportupdater-queries)

2016-03-04 Thread Milimetric (Code Review)

Milimetric has uploaded a new change for review.

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

Change subject: Get rid of CRLF
..

Get rid of CRLF

Change-Id: Idd49e6038680451e663da26d9958df933aab2eac
---
A .gitignore
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/reportupdater-queries 
refs/changes/35/275135/1

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..1377554
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*.swp

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd49e6038680451e663da26d9958df933aab2eac
Gerrit-PatchSet: 1
Gerrit-Project: analytics/reportupdater-queries
Gerrit-Branch: master
Gerrit-Owner: Milimetric 

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

[MediaWiki-commits] [Gerrit] Update VE core submodule to master (f77ac2b) - change (mediawiki...VisualEditor)

2016-03-04 Thread Jforrester (Code Review)

Jforrester has uploaded a new change for review.

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

Change subject: Update VE core submodule to master (f77ac2b)
..

Update VE core submodule to master (f77ac2b)

New changes:
4cef3da ve.test.utils: Don't require QUnit expect() anymore
70ee810 Localisation updates from https://translatewiki.net.

Change-Id: If37267012a10e611b3eae63e58a5da3c77ab8fdb
---
M lib/ve
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/34/275134/1

diff --git a/lib/ve b/lib/ve
index 46f34e1..f77ac2b 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 46f34e19aa9e1195016e958b8e233d5cece9a07d
+Subproject commit f77ac2be79b59230e4acb49f837a54d6230be6bc

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: If37267012a10e611b3eae63e58a5da3c77ab8fdb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester 

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

[MediaWiki-commits] [Gerrit] ve.test.utils: Don't require QUnit expect() anymore - change (VisualEditor/VisualEditor)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: ve.test.utils: Don't require QUnit expect() anymore
..


ve.test.utils: Don't require QUnit expect() anymore

This hasn't been useful in QUnit for a over a year now with the improved
assertion context object and tracking of asynchronous tests without
shared global state.

It's also causing a conflict because VisualEditor-MediaWiki includes
this file and ends up overriding MediaWiki core's loser configuration.
And while MediaWiki still happens to pass requireExpects in REL1_26,
Wikibase has started to write tests that don't set expect() for each
test (which is fine).

Change-Id: I4929c10424be7bb8f717f8b01f1c139a25ad117f
---
M tests/ve.test.utils.js
1 file changed, 0 insertions(+), 3 deletions(-)

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



diff --git a/tests/ve.test.utils.js b/tests/ve.test.utils.js
index 6a52fb5..e53037b 100644
--- a/tests/ve.test.utils.js
+++ b/tests/ve.test.utils.js
@@ -13,9 +13,6 @@
new ve.init.sa.Target();
/*jshint nonew:true */
 
-   // Configure QUnit
-   QUnit.config.requireExpects = true;
-
// Disable scroll animatinos
ve.scrollIntoView = function () {};
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4929c10424be7bb8f717f8b01f1c139a25ad117f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] ganglia: remove labs hiera data again - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: ganglia: remove labs hiera data again
..


ganglia: remove labs hiera data again

Change-Id: I0b3c31de9076973ffdfee248cd845cf6f9a749ee
---
D hieradata/labs/ganglia/common.yaml
1 file changed, 0 insertions(+), 2 deletions(-)

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



diff --git a/hieradata/labs/ganglia/common.yaml 
b/hieradata/labs/ganglia/common.yaml
deleted file mode 100644
index 98be963..000
--- a/hieradata/labs/ganglia/common.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-sites:
-  - eqiad

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0b3c31de9076973ffdfee248cd845cf6f9a749ee
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 

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

[MediaWiki-commits] [Gerrit] ganglia: remove labs hiera data again - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: ganglia: remove labs hiera data again
..

ganglia: remove labs hiera data again

Change-Id: I0b3c31de9076973ffdfee248cd845cf6f9a749ee
---
D hieradata/labs/ganglia/common.yaml
1 file changed, 0 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/33/275133/1

diff --git a/hieradata/labs/ganglia/common.yaml 
b/hieradata/labs/ganglia/common.yaml
deleted file mode 100644
index 98be963..000
--- a/hieradata/labs/ganglia/common.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-sites:
-  - eqiad

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

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

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

[MediaWiki-commits] [Gerrit] Hack to give stats user access to hive on stat1002 - change (analytics/reportupdater-queries)

2016-03-04 Thread Milimetric (Code Review)

Milimetric has submitted this change and it was merged.

Change subject: Hack to give stats user access to hive on stat1002
..


Hack to give stats user access to hive on stat1002

Change-Id: I6ab6cea58d56a6a61bd1e819d8c185b3c8be689a
---
M browser/desktop_and_mobile_web_by_browser
M browser/desktop_and_mobile_web_by_os
M browser/desktop_and_mobile_web_by_os_and_browser
M browser/mobile_web_by_browser
M browser/mobile_web_by_os
5 files changed, 35 insertions(+), 95 deletions(-)

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



diff --git a/browser/desktop_and_mobile_web_by_browser 
b/browser/desktop_and_mobile_web_by_browser
index 499899b..71200ae 100755
--- a/browser/desktop_and_mobile_web_by_browser
+++ b/browser/desktop_and_mobile_web_by_browser
@@ -1,32 +1,20 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric 
--silent=true --outputformat=tsv2 -e "
 SELECT
-'{start_date}' AS date,
+'$1' AS date,
 browser_family,
 browser_major,
 SUM(view_count) as view_count
 FROM wmf.browser_general
 WHERE
 access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= 
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < 
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1' 
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
 GROUP BY
-'{start_date}',
+'$1',
 browser_family,
 browser_major
 ORDER BY view_count DESC
 LIMIT 1000
 ;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/desktop_and_mobile_web_by_os 
b/browser/desktop_and_mobile_web_by_os
index c713fae..4b8a0e4 100755
--- a/browser/desktop_and_mobile_web_by_os
+++ b/browser/desktop_and_mobile_web_by_os
@@ -1,32 +1,20 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric 
--silent=true --outputformat=tsv2 -e "
 SELECT
-'{start_date}' AS date,
+'$1' AS date,
 os_family,
 os_major,
 SUM(view_count) as view_count
 FROM wmf.browser_general
 WHERE
 access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= 
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < 
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1' 
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
 GROUP BY
-'{start_date}',
+'$1',
 os_family,
 os_major
 ORDER BY view_count DESC
 LIMIT 1000
 ;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/desktop_and_mobile_web_by_os_and_browser 
b/browser/desktop_and_mobile_web_by_os_and_browser
index 7cdd7b3..dcf0457 100755
--- a/browser/desktop_and_mobile_web_by_os_and_browser
+++ b/browser/desktop_and_mobile_web_by_os_and_browser
@@ -1,13 +1,7 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric 
--silent=true --outputformat=tsv2 -e "
 SELECT
-'{start_date}' AS date,
+'$1' AS date,
 os_family,
 os_major,
 browser_family,
@@ -16,10 +10,10 @@
 FROM wmf.browser_general
 WHERE
 access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= 
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < 
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1' 
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
 GROUP BY
-'{start_date}',
+'$1',
 os_family,
 os_major,
 browser_family,
@@ -27,10 +21,4 @@
 ORDER BY view_count DESC
 LIMIT 1000
 ;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/mobile_web_by_browser b/browser/mobile_web_by_browser
index c3afe60..4ac5083 100755
--- a/browser/mobile_web_by_browser
+++

[MediaWiki-commits] [Gerrit] Hack to give stats user access to hive on stat1002 - change (analytics/reportupdater-queries)

2016-03-04 Thread Milimetric (Code Review)

Milimetric has uploaded a new change for review.

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

Change subject: Hack to give stats user access to hive on stat1002
..

Hack to give stats user access to hive on stat1002

Change-Id: I6ab6cea58d56a6a61bd1e819d8c185b3c8be689a
---
M browser/desktop_and_mobile_web_by_browser
M browser/desktop_and_mobile_web_by_os
M browser/desktop_and_mobile_web_by_os_and_browser
M browser/mobile_web_by_browser
M browser/mobile_web_by_os
5 files changed, 35 insertions(+), 95 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/reportupdater-queries 
refs/changes/32/275132/1

diff --git a/browser/desktop_and_mobile_web_by_browser 
b/browser/desktop_and_mobile_web_by_browser
index 499899b..71200ae 100755
--- a/browser/desktop_and_mobile_web_by_browser
+++ b/browser/desktop_and_mobile_web_by_browser
@@ -1,32 +1,20 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric 
--silent=true --outputformat=tsv2 -e "
 SELECT
-'{start_date}' AS date,
+'$1' AS date,
 browser_family,
 browser_major,
 SUM(view_count) as view_count
 FROM wmf.browser_general
 WHERE
 access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= 
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < 
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1' 
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
 GROUP BY
-'{start_date}',
+'$1',
 browser_family,
 browser_major
 ORDER BY view_count DESC
 LIMIT 1000
 ;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/desktop_and_mobile_web_by_os 
b/browser/desktop_and_mobile_web_by_os
index c713fae..4b8a0e4 100755
--- a/browser/desktop_and_mobile_web_by_os
+++ b/browser/desktop_and_mobile_web_by_os
@@ -1,32 +1,20 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric 
--silent=true --outputformat=tsv2 -e "
 SELECT
-'{start_date}' AS date,
+'$1' AS date,
 os_family,
 os_major,
 SUM(view_count) as view_count
 FROM wmf.browser_general
 WHERE
 access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= 
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < 
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1' 
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
 GROUP BY
-'{start_date}',
+'$1',
 os_family,
 os_major
 ORDER BY view_count DESC
 LIMIT 1000
 ;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/desktop_and_mobile_web_by_os_and_browser 
b/browser/desktop_and_mobile_web_by_os_and_browser
index 7cdd7b3..dcf0457 100755
--- a/browser/desktop_and_mobile_web_by_os_and_browser
+++ b/browser/desktop_and_mobile_web_by_os_and_browser
@@ -1,13 +1,7 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-import subprocess
-import sys
-import os
-
-query = """
+#!/bin/bash
+beeline -u jdbc:hive2://analytics1015.eqiad.wmnet:1 -n milimetric 
--silent=true --outputformat=tsv2 -e "
 SELECT
-'{start_date}' AS date,
+'$1' AS date,
 os_family,
 os_major,
 browser_family,
@@ -16,10 +10,10 @@
 FROM wmf.browser_general
 WHERE
 access_method IN ('desktop', 'mobile web') AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= 
'{start_date}' AND
-CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < 
'{end_date}'
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) >= '$1' 
AND
+CONCAT(year, '-', LPAD(month, 2, '0'), '-', LPAD(day, 2, '0')) < '$2'
 GROUP BY
-'{start_date}',
+'$1',
 os_family,
 os_major,
 browser_family,
@@ -27,10 +21,4 @@
 ORDER BY view_count DESC
 LIMIT 1000
 ;
-""".format(
-start_date=sys.argv[1],
-end_date=sys.argv[2]
-)
-
-with open(os.devnull, 'w') as devnull:
-subprocess.call(['hive', '-e', query], stderr=devnull)
+"
diff --git a/browser/mobile_web_by_browser b/browser/mobile_web_by_browser

[MediaWiki-commits] [Gerrit] Adding Pageviews Assessment project to translatewiki.net - change (translatewiki)

2016-03-04 Thread Kaldari (Code Review)

Kaldari has uploaded a new change for review.

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

Change subject: Adding Pageviews Assessment project to translatewiki.net
..

Adding Pageviews Assessment project to translatewiki.net

Obviously there is more needed than this, but I'm not sure how the
configuration actually works. Any help would be appreciated.

Bug: T128768
Change-Id: Id26b77ea2fe422b3683a995042989b5224d23814
---
A groups/Pageviews/Pageviews.yaml
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/translatewiki 
refs/changes/31/275131/1

diff --git a/groups/Pageviews/Pageviews.yaml b/groups/Pageviews/Pageviews.yaml
new file mode 100644
index 000..1ccdd65
--- /dev/null
+++ b/groups/Pageviews/Pageviews.yaml
@@ -0,0 +1,5 @@
+BASIC:
+  label: Pageviews Analysis
+  icon: wiki://Pageviews Analysis.svg
+  description: "Pageviews Analysis provides visualization of pageview 
statistics for Wikimedia project pages."
+

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id26b77ea2fe422b3683a995042989b5224d23814
Gerrit-PatchSet: 1
Gerrit-Project: translatewiki
Gerrit-Branch: master
Gerrit-Owner: Kaldari 

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

[MediaWiki-commits] [Gerrit] ganglia: set site in labs to eqiad to avoid error with ulsfo - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: ganglia: set site in labs to eqiad to avoid error with ulsfo
..


ganglia: set site in labs to eqiad to avoid error with ulsfo

Looks like "labsdnsconfig" is missing for ulsfo, causing:

$dnsconfig = hiera_hash('labsdnsconfig', {})
->
TypeError: Data retrieved from Ganglia is String not Hash

trying with eqiad

Change-Id: I9d1fdd90dea1f3f8d97280adeb8bb6d869fe5a4f
---
M hieradata/labs/ganglia/common.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/labs/ganglia/common.yaml 
b/hieradata/labs/ganglia/common.yaml
index 43585f2..98be963 100644
--- a/hieradata/labs/ganglia/common.yaml
+++ b/hieradata/labs/ganglia/common.yaml
@@ -1,2 +1,2 @@
 sites:
-  - ulsfo
+  - eqiad

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9d1fdd90dea1f3f8d97280adeb8bb6d869fe5a4f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 

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

[MediaWiki-commits] [Gerrit] ganglia: set site in labs to eqiad to avoid error with ulsfo - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: ganglia: set site in labs to eqiad to avoid error with ulsfo
..

ganglia: set site in labs to eqiad to avoid error with ulsfo

Looks like "labsdnsconfig" is missing for ulsfo, causing:

$dnsconfig = hiera_hash('labsdnsconfig', {})
->
TypeError: Data retrieved from Ganglia is String not Hash

trying with eqiad

Change-Id: I9d1fdd90dea1f3f8d97280adeb8bb6d869fe5a4f
---
M hieradata/labs/ganglia/common.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/hieradata/labs/ganglia/common.yaml 
b/hieradata/labs/ganglia/common.yaml
index 43585f2..98be963 100644
--- a/hieradata/labs/ganglia/common.yaml
+++ b/hieradata/labs/ganglia/common.yaml
@@ -1,2 +1,2 @@
 sites:
-  - ulsfo
+  - eqiad

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

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

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

[MediaWiki-commits] [Gerrit] Update config.default_edit_summary - change (pywikibot/core)

2016-03-04 Thread John Vandenberg (Code Review)

John Vandenberg has uploaded a new change for review.

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

Change subject: Update config.default_edit_summary
..

Update config.default_edit_summary

Pywikibot master is now 3.0, but config.default_edit_summary
is reporting 'Pywikibot v.2'.  Set the config variable to

'Pywikibot ' + __release__

Change-Id: I189220154db22abe608e2d683eb0d395066f928c
---
M pywikibot/config2.py
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/29/275129/1

diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 7fc9d7a..23bdcd8 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -52,6 +52,7 @@
 
 from warnings import warn
 
+from pywikibot import __release__
 from pywikibot.logging import error, output, warning
 from pywikibot.tools import PY2
 
@@ -218,7 +219,7 @@
 # edit summary to use if not supplied by bot script
 # WARNING: this should NEVER be used in practice, ALWAYS supply a more
 #  relevant summary for bot edits
-default_edit_summary = u'Pywikibot v.2'
+default_edit_summary = 'Pywikibot ' + __release__
 
 # What permissions to use to set private files to it
 # such as password file.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I189220154db22abe608e2d683eb0d395066f928c
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg 

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

[MediaWiki-commits] [Gerrit] Check for "albums" keyword when matching Flickr URL - change (mediawiki...UploadWizard)

2016-03-04 Thread Ferveo (Code Review)

Ferveo has uploaded a new change for review.

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

Change subject: Check for "albums" keyword when matching Flickr URL
..

Check for "albums" keyword when matching Flickr URL

Flickr treats albums as an alias to sets and redirects any requests from:
/photos/.../albums/... to /photos/.../sets/...
Updating Regex matching pattern to account for this will allow to use
both URL formats instead of ignoring "albums" and falling back to the
default behaviour pulling all user's public pictures (instead of using
the provided set).

Bug: T128767
Change-Id: I588eea01c5334fa4554cb7a8b173a89f0e792d8a
---
M resources/mw.FlickrChecker.js
1 file changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UploadWizard 
refs/changes/28/275128/1

diff --git a/resources/mw.FlickrChecker.js b/resources/mw.FlickrChecker.js
index 851381b..ce5c5fb 100644
--- a/resources/mw.FlickrChecker.js
+++ b/resources/mw.FlickrChecker.js
@@ -77,7 +77,7 @@
var photoIdMatches, albumIdMatches, 
userCollectionMatches, userPhotostreamMatches, groupPoolMatches, 
userGalleryMatches, userFavoritesMatches;
 
photoIdMatches = flickrInputUrl.match( 
/flickr\.com\/(?:x\/t\/[^\/]+\/)?photos\/[^\/]+\/([0-9]+)/ );
-   albumIdMatches = flickrInputUrl.match( 
/flickr\.com\/photos\/[^\/]+\/sets\/([0-9]+)/ );
+   albumIdMatches = flickrInputUrl.match( 
/flickr\.com\/photos\/[^\/]+\/(sets|albums)\/([0-9]+)/ );
userCollectionMatches = flickrInputUrl.match( 
/flickr\.com\/(?:x\/t\/[^\/]+\/)?photos\/[^\/]+\/collections\/?([0-9]+)?/ );
userPhotostreamMatches = flickrInputUrl.match( 
/flickr\.com\/(?:x\/t\/[^\/]+\/)?photos\/([^\/]+)/ );
groupPoolMatches = flickrInputUrl.match( 
/flickr\.com\/groups\/[^\/]+(?:\/pool\/([^\/]+))?/ );
@@ -92,7 +92,7 @@
groupPoolMatches || userGalleryMatches || 
userFavoritesMatches ) {
$( '#mwe-upwiz-upload-add-flickr-container' 
).hide();
this.imageUploads = [];
-   if ( albumIdMatches && albumIdMatches[ 1 ] > 0 
) {
+   if ( albumIdMatches && albumIdMatches[ 2 ] > 0 
) {
this.getPhotoset( albumIdMatches, 
flickrInputUrl );
} else if ( photoIdMatches && photoIdMatches[ 1 
] > 0 ) {
this.getPhoto( photoIdMatches, 
flickrInputUrl );
@@ -329,7 +329,7 @@
getPhotoset: function ( albumIdMatches ) {
return this.getPhotos( 'photoset', {
method: 'flickr.photosets.getPhotos',
-   photoset_id: albumIdMatches[ 1 ]
+   photoset_id: albumIdMatches[ 2 ]
} );
},
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I588eea01c5334fa4554cb7a8b173a89f0e792d8a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Ferveo 

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

[MediaWiki-commits] [Gerrit] Adds Commons prefix and puts icons in front - change (wikidata...gui)

2016-03-04 Thread Jonas Kress (WMDE) (Code Review)

Jonas Kress (WMDE) has uploaded a new change for review.

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

Change subject: Adds Commons prefix and puts icons in front
..

Adds Commons prefix and puts icons in front

Change-Id: Ibe17abbec8c79d2cf23d97c1f3563f29fc49edd9
---
M wikibase/queryService/ui/resultBrowser/TableResultBrowser.js
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/26/275126/1

diff --git a/wikibase/queryService/ui/resultBrowser/TableResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/TableResultBrowser.js
index b0324d7..442d477 100644
--- a/wikibase/queryService/ui/resultBrowser/TableResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/TableResultBrowser.js
@@ -97,13 +97,13 @@
$( '' ).attr( 'href', href ).append( 
$linkText ).appendTo( $td );
 
if ( this.isExploreUrl( href ) ) {
-   $td.append( ' ' );
-   $td.append( this.createExploreButton() 
);
+   $td.prepend( ' ' );
+   $td.prepend( this.createExploreButton() 
);
}
 
if ( this.isCommonsResource( href ) ) {
-   $td.append( ' ' );
-   $td.append( this.createGalleryButton( 
href, column ) );
+   $td.prepend( ' ' );
+   $td.prepend( this.createGalleryButton( 
href, column ) );
}
 
break;
@@ -124,7 +124,7 @@
 
if ( data.type === 'uri' ) {
if ( this.isCommonsResource( label ) ) {
-   label = decodeURIComponent( 
this.getCommonsResourceFileName( label ) );
+   label = 'commons:' + decodeURIComponent( 
this.getCommonsResourceFileName( label ) );
} else {
label = this.abbreviateUri( label );
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibe17abbec8c79d2cf23d97c1f3563f29fc49edd9
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) 

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

[MediaWiki-commits] [Gerrit] LinkAnnotationWidget: Implement createInputWidget's document... - change (VisualEditor/VisualEditor)

2016-03-04 Thread Alex Monk (Code Review)

Alex Monk has uploaded a new change for review.

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

Change subject: LinkAnnotationWidget: Implement createInputWidget's documented 
config parameter
..

LinkAnnotationWidget: Implement createInputWidget's documented config parameter

Change-Id: I3c9996a2e0695f4b03de0a5fa27702ca7b967f3f
---
M src/ui/widgets/ve.ui.LinkAnnotationWidget.js
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/27/275127/1

diff --git a/src/ui/widgets/ve.ui.LinkAnnotationWidget.js 
b/src/ui/widgets/ve.ui.LinkAnnotationWidget.js
index 3fcaefe..42b8271 100644
--- a/src/ui/widgets/ve.ui.LinkAnnotationWidget.js
+++ b/src/ui/widgets/ve.ui.LinkAnnotationWidget.js
@@ -88,8 +88,8 @@
  * @param {Object} [config] Configuration options
  * @return {OO.ui.Widget} Text input widget
  */
-ve.ui.LinkAnnotationWidget.prototype.createInputWidget = function () {
-   return new OO.ui.TextInputWidget( { validate: 'non-empty' } );
+ve.ui.LinkAnnotationWidget.prototype.createInputWidget = function ( config ) {
+   return new OO.ui.TextInputWidget( $.extend( { validate: 'non-empty' }, 
config ) );
 };
 
 /**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3c9996a2e0695f4b03de0a5fa27702ca7b967f3f
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Alex Monk 

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

[MediaWiki-commits] [Gerrit] ganglia: fix format for $sites in labs hiera - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: ganglia: fix format for $sites in labs hiera
..


ganglia: fix format for $sites in labs hiera

Change-Id: I96ffdb626663714e47f282b2314ad6cbc4b833b3
---
M hieradata/labs/ganglia/common.yaml
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/labs/ganglia/common.yaml 
b/hieradata/labs/ganglia/common.yaml
index 08d916b..43585f2 100644
--- a/hieradata/labs/ganglia/common.yaml
+++ b/hieradata/labs/ganglia/common.yaml
@@ -1 +1,2 @@
-sites: ulsfo
+sites:
+  - ulsfo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I96ffdb626663714e47f282b2314ad6cbc4b833b3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 

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

[MediaWiki-commits] [Gerrit] Float VE UI toolbar below a fixed or sticky navbar; more z-i... - change (mediawiki...chameleon)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Float VE UI toolbar below a fixed or sticky navbar; more 
z-index fixes
..


Float VE UI toolbar below a fixed or sticky navbar; more z-index fixes

Change-Id: I1773833df203b102526026143915695346bcd7df
---
M docs/release-notes.md
M resources/styles/extensionfixes.less
2 files changed, 10 insertions(+), 3 deletions(-)

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



diff --git a/docs/release-notes.md b/docs/release-notes.md
index 3c2d304..9d646f1 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -15,6 +15,7 @@
 * Correctly follow symlinks
   ([Bug: T124714](https://phabricator.wikimedia.org/T124714))
 * Provide correct box-sizing model and z-index for VisualEditor components
+* Float the VisualEditor UI toolbar below a fixed or sticky navbar
 
 ### Chameleon 1.2
 
diff --git a/resources/styles/extensionfixes.less 
b/resources/styles/extensionfixes.less
index 85ad3ef..dd20ab1 100644
--- a/resources/styles/extensionfixes.less
+++ b/resources/styles/extensionfixes.less
@@ -3,7 +3,7 @@
  *
  * This file is part of the MediaWiki skin Chameleon.
  *
- * @copyright 2013 - 2015, Stephan Gambke
+ * @copyright 2013 - 2016, Stephan Gambke
  * @license   GNU General Public License, version 3 (or any later version)
  *
  * The Chameleon skin is free software: you can redistribute it and/or modify
@@ -30,11 +30,17 @@
.ve-ui-toolbar, .ve-ui-debugBar, .oo-ui-processDialog-navigation {
&, &::before, &::after {
box-sizing: content-box;
-   z-index: @zindex-navbar-fixed + 1;
}
}
 
.ve-ui-overlay-global {
-   z-index: @zindex-navbar-fixed + 2;
+   z-index: @zindex-navbar-fixed + 1;
+   }
+
+   // float the VE UI toolbar below a fixed or sticky navbar
+   .navbar.navbar-fixed-top, .navbar + .sticky-wrapper {
+   ~ * .ve-ui-toolbar-floating>.oo-ui-toolbar-bar {
+   transform: translateY(@navbar-height);
+   }
}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1773833df203b102526026143915695346bcd7df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/chameleon
Gerrit-Branch: master
Gerrit-Owner: Foxtrott 
Gerrit-Reviewer: Foxtrott 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] r::c::config: remove parsoid (unused) - change (operations/puppet)

2016-03-04 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: r::c::config: remove parsoid (unused)
..

r::c::config: remove parsoid (unused)

Bug: T127484
Change-Id: I20fcfa515fa92a927650c8cd44995955a59be798
---
M modules/role/manifests/cache/configuration.pp
1 file changed, 0 insertions(+), 6 deletions(-)


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

diff --git a/modules/role/manifests/cache/configuration.pp 
b/modules/role/manifests/cache/configuration.pp
index 1940016..25c9161 100644
--- a/modules/role/manifests/cache/configuration.pp
+++ b/modules/role/manifests/cache/configuration.pp
@@ -16,9 +16,6 @@
 'appservers_debug' => {
 'eqiad' => ['appservers-debug.svc.eqiad.wmnet'],
 },
-'parsoid' => {
-'eqiad' => ['parsoid.svc.eqiad.wmnet'],
-},
 'cxserver' => {
 'eqiad' => ['cxserver.svc.eqiad.wmnet'],
 },
@@ -61,9 +58,6 @@
 },
 'appservers_debug' => {
 'eqiad' => [ '10.68.17.170' ],  # deployment-mediawiki01
-},
-'parsoid' => {
-'eqiad' => [ '10.68.16.120' ],  # deployment-parsoid05
 },
 'cxserver' => {
 'eqiad' => ['cxserver-beta.wmflabs.org'],

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

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

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

[MediaWiki-commits] [Gerrit] varnishes: control applayer DC routing from hieradata - change (operations/puppet)

2016-03-04 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: varnishes: control applayer DC routing from hieradata
..

varnishes: control applayer DC routing from hieradata

This is the commit that rids Traffic infrastructure of all
remaining references to $::mw_primary.

Note: this seems more-complicated than it has to be (i.e. why not
make the backend selection explicit in hieradata instead of
double-referencing with a 'route' attribute), but this direction
gets closer to support for a magical 'route: split', which uses
cache::route_table data to do active:active properly, even for
future cache-only-DC pass-traffic directly to the applayer (once
TLS is working!).

Bug: T127484
Change-Id: Ia5f1d56a584a6c4ca89f0532c7fd2225a7b7a9f8
---
M hieradata/common/cache/maps.yaml
M hieradata/common/cache/text.yaml
M hieradata/common/cache/upload.yaml
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
6 files changed, 20 insertions(+), 13 deletions(-)


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

diff --git a/hieradata/common/cache/maps.yaml b/hieradata/common/cache/maps.yaml
index f1efe0e..fe335b5 100644
--- a/hieradata/common/cache/maps.yaml
+++ b/hieradata/common/cache/maps.yaml
@@ -4,5 +4,6 @@
 - 'cp1044.eqiad.wmnet'
 apps:
   kartotherian:
+route: 'codfw'
 backends:
   codfw: 'kartotherian.svc.codfw.wmnet'
diff --git a/hieradata/common/cache/text.yaml b/hieradata/common/cache/text.yaml
index 88d23ea..5530894 100644
--- a/hieradata/common/cache/text.yaml
+++ b/hieradata/common/cache/text.yaml
@@ -43,30 +43,38 @@
 - 'cp4018.ulsfo.wmnet'
 apps:
   appservers:
+route: 'eqiad'
 backends:
   eqiad: 'appservers.svc.eqiad.wmnet'
   codfw: 'appservers.svc.codfw.wmnet'
   appservers_debug:
+route: 'eqiad'
 backends:
   eqiad: 'appservers-debug.svc.eqiad.wmnet'
   api:
+route: 'eqiad'
 backends:
   eqiad: 'api.svc.eqiad.wmnet'
   codfw: 'api.svc.codfw.wmnet'
   rendering:
+route: 'eqiad'
 backends:
   eqiad: 'rendering.svc.eqiad.wmnet'
   codfw: 'rendering.svc.codfw.wmnet'
   restbase:
+route: 'eqiad'
 backends:
   eqiad: 'restbase.svc.eqiad.wmnet'
   codfw: 'restbase.svc.codfw.wmnet'
   cxserver:
+route: 'eqiad'
 backends:
   eqiad: 'cxserver.svc.eqiad.wmnet'
   citoid:
+route: 'eqiad'
 backends:
   eqiad: 'citoid.svc.eqiad.wmnet'
   security_audit:
+route: 'eqiad'
 backends:
   eqiad: []
diff --git a/hieradata/common/cache/upload.yaml 
b/hieradata/common/cache/upload.yaml
index d6d6a06..cb38cbe 100644
--- a/hieradata/common/cache/upload.yaml
+++ b/hieradata/common/cache/upload.yaml
@@ -48,6 +48,7 @@
 - 'cp4015.ulsfo.wmnet'
 apps:
   swift:
+route: 'eqiad'
 backends:
   eqiad: 'ms-fe.svc.eqiad.wmnet'
   codfw: 'ms-fe.svc.codfw.wmnet'
diff --git a/modules/role/manifests/cache/maps.pp 
b/modules/role/manifests/cache/maps.pp
index 5b0b6cd..81f2752 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -40,10 +40,7 @@
 'kartotherian'   => {
 'dynamic'  => 'no',
 'type' => 'random',
-# XXX note explicit abnormal hack: service only exists in codfw, 
but eqiad is Tier-1 in general
-# XXX this means traffic is moving x-dc without crypto!
-# XXX this also means users mapped to codfw frontends bounce 
traffic [codfw->eqiad->codfw] on their way in!
-'backends' => $apps['kartotherian']['backends']['codfw'],
+'backends' => 
$apps['kartotherian']['backends'][$apps['kartotherian']['route']],
 'be_opts' => {
 'port'  => 6533,
 'connect_timeout'   => '5s',
diff --git a/modules/role/manifests/cache/text.pp 
b/modules/role/manifests/cache/text.pp
index 6bd44de..46f4e45 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -50,49 +50,49 @@
 'appservers'   => {
 'dynamic'  => 'no',
 'type' => 'random',
-'backends' => $apps['appservers']['backends'][$::mw_primary],
+'backends' => 
$apps['appservers']['backends'][$apps['appservers']['route']],
 'be_opts'  => $app_def_be_opts,
 },
 'api'  => {
 'dynamic'  => 'no',
 'type' => 'random',
-'backends' => $apps['api']['backends'][$::mw_primary],
+'backends' => $apps['api']['backends'][$apps['api']['route']],
 'be_opts'  => $app_def_be_opts,
 },
 'rendering'=> {
 'dynamic'  => 'no',
 'type' => 'random',
-'backends' => $apps['rendering']['backends'][$::mw_primary],
+

[MediaWiki-commits] [Gerrit] Remove resolved TODO about adding wiki field to Schema:EditI... - change (mediawiki...Echo)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Remove resolved TODO about adding wiki field to 
Schema:EditInteraction
..


Remove resolved TODO about adding wiki field to Schema:EditInteraction

Change-Id: I80cc41b31b6d49182f7ea11e5cd07192f1710663
---
M modules/ooui/mw.echo.ui.NotificationItemWidget.js
1 file changed, 0 insertions(+), 5 deletions(-)

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



diff --git a/modules/ooui/mw.echo.ui.NotificationItemWidget.js 
b/modules/ooui/mw.echo.ui.NotificationItemWidget.js
index 8dcc46e..0b40a6b 100644
--- a/modules/ooui/mw.echo.ui.NotificationItemWidget.js
+++ b/modules/ooui/mw.echo.ui.NotificationItemWidget.js
@@ -180,11 +180,6 @@
.on( 'click', function () {
// Log notification 
click
 
-   // TODO: In order to 
properly log a click of an item that
-   // is part of a bundled 
cross-wiki notification, we will
-   // need to add 'source' 
to the logging schema. Otherwise,
-   // the logger will log 
item ID as if it is local, which
-   // is wrong.

mw.echo.logger.logInteraction(

mw.echo.Logger.static.actions.notificationClick,

mw.echo.Logger.static.context.popup,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80cc41b31b6d49182f7ea11e5cd07192f1710663
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] r::c::config: remove has_ganglia - change (operations/puppet)

2016-03-04 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: r::c::config: remove has_ganglia
..

r::c::config: remove has_ganglia

This just mirrors standard::has_ganglia (even in labs!), so switch
all references to that and delete it.

Bug: T127484
Change-Id: Ic063d5dbc95be8df92fc7bdd38774b16b055040d
---
M modules/role/manifests/cache/2layer.pp
M modules/role/manifests/cache/configuration.pp
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
5 files changed, 4 insertions(+), 6 deletions(-)


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

diff --git a/modules/role/manifests/cache/2layer.pp 
b/modules/role/manifests/cache/2layer.pp
index 1933f4f..8934b37 100644
--- a/modules/role/manifests/cache/2layer.pp
+++ b/modules/role/manifests/cache/2layer.pp
@@ -7,7 +7,7 @@
 include role::cache::statsd::frontend
 
 # Ganglia monitoring
-if $::role::cache::configuration::has_ganglia {
+if $::standard::has_ganglia {
 class { 'varnish::monitoring::ganglia':
 varnish_instances => [ '', 'frontend' ],
 }
diff --git a/modules/role/manifests/cache/configuration.pp 
b/modules/role/manifests/cache/configuration.pp
index 338e4c3..fce987f 100644
--- a/modules/role/manifests/cache/configuration.pp
+++ b/modules/role/manifests/cache/configuration.pp
@@ -1,8 +1,6 @@
 class role::cache::configuration {
 include lvs::configuration
 
-$has_ganglia = $::standard::has_ganglia
-
 $backends = {
 'production' => {
 'appservers'=> {
diff --git a/modules/role/manifests/cache/maps.pp 
b/modules/role/manifests/cache/maps.pp
index 6a5ad15..22cb01b 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -5,7 +5,7 @@
 
 include role::cache::2layer
 include role::cache::ssl::unified
-if $::role::cache::configuration::has_ganglia {
+if $::standard::has_ganglia {
 include varnish::monitoring::ganglia::vhtcpd
 }
 
diff --git a/modules/role/manifests/cache/text.pp 
b/modules/role/manifests/cache/text.pp
index ab0ba97..cb103e1 100644
--- a/modules/role/manifests/cache/text.pp
+++ b/modules/role/manifests/cache/text.pp
@@ -7,7 +7,7 @@
 require geoip::dev # for VCL compilation using libGeoIP
 include role::cache::2layer
 include role::cache::ssl::unified
-if $::role::cache::configuration::has_ganglia {
+if $::standard::has_ganglia {
 include varnish::monitoring::ganglia::vhtcpd
 }
 
diff --git a/modules/role/manifests/cache/upload.pp 
b/modules/role/manifests/cache/upload.pp
index d595809..581e9b8 100644
--- a/modules/role/manifests/cache/upload.pp
+++ b/modules/role/manifests/cache/upload.pp
@@ -5,7 +5,7 @@
 
 include role::cache::2layer
 include role::cache::ssl::unified
-if $::role::cache::configuration::has_ganglia {
+if $::standard::has_ganglia {
 include varnish::monitoring::ganglia::vhtcpd
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] r::c::config: move to hieradata - change (operations/puppet)

2016-03-04 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: r::c::config: move to hieradata
..

r::c::config: move to hieradata

This also changes the structure a little bit to accommodate future
things.  Note that 'misc' cluster never had r::c::configuration
data; it hardcodes all of its (eqiad-only) backends in misc.pp.
Will update it to match when we start going after misc-cluster
backends for codfw support.

Bug: T127484
Change-Id: I278c87cc6f7f76d7e98490454762a224e531bff4
---
M hieradata/common/cache/maps.yaml
M hieradata/common/cache/text.yaml
M hieradata/common/cache/upload.yaml
M hieradata/labs.yaml
D modules/role/manifests/cache/configuration.pp
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
8 files changed, 91 insertions(+), 89 deletions(-)


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

diff --git a/hieradata/common/cache/maps.yaml b/hieradata/common/cache/maps.yaml
index deafd12..f1efe0e 100644
--- a/hieradata/common/cache/maps.yaml
+++ b/hieradata/common/cache/maps.yaml
@@ -2,3 +2,7 @@
   eqiad:
 - 'cp1043.eqiad.wmnet'
 - 'cp1044.eqiad.wmnet'
+apps:
+  kartotherian:
+backends:
+  codfw: 'kartotherian.svc.codfw.wmnet'
diff --git a/hieradata/common/cache/text.yaml b/hieradata/common/cache/text.yaml
index 3455f27..88d23ea 100644
--- a/hieradata/common/cache/text.yaml
+++ b/hieradata/common/cache/text.yaml
@@ -41,3 +41,32 @@
 - 'cp4016.ulsfo.wmnet'
 - 'cp4017.ulsfo.wmnet'
 - 'cp4018.ulsfo.wmnet'
+apps:
+  appservers:
+backends:
+  eqiad: 'appservers.svc.eqiad.wmnet'
+  codfw: 'appservers.svc.codfw.wmnet'
+  appservers_debug:
+backends:
+  eqiad: 'appservers-debug.svc.eqiad.wmnet'
+  api:
+backends:
+  eqiad: 'api.svc.eqiad.wmnet'
+  codfw: 'api.svc.codfw.wmnet'
+  rendering:
+backends:
+  eqiad: 'rendering.svc.eqiad.wmnet'
+  codfw: 'rendering.svc.codfw.wmnet'
+  restbase:
+backends:
+  eqiad: 'restbase.svc.eqiad.wmnet'
+  codfw: 'restbase.svc.codfw.wmnet'
+  cxserver:
+backends:
+  eqiad: 'cxserver.svc.eqiad.wmnet'
+  citoid:
+backends:
+  eqiad: 'citoid.svc.eqiad.wmnet'
+  security_audit:
+backends:
+  eqiad: []
diff --git a/hieradata/common/cache/upload.yaml 
b/hieradata/common/cache/upload.yaml
index a1d75c2..d6d6a06 100644
--- a/hieradata/common/cache/upload.yaml
+++ b/hieradata/common/cache/upload.yaml
@@ -46,3 +46,8 @@
 - 'cp4013.ulsfo.wmnet'
 - 'cp4014.ulsfo.wmnet'
 - 'cp4015.ulsfo.wmnet'
+apps:
+  swift:
+backends:
+  eqiad: 'ms-fe.svc.eqiad.wmnet'
+  codfw: 'ms-fe.svc.codfw.wmnet'
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 2294065..f488368 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -26,6 +26,8 @@
 archiva::proxy::ssl_enabled: false
 archiva::proxy::certificate_name: ssl-cert-snakeoil
 statsite::instance::graphite_host: 'labmon1001.eqiad.wmnet'
+
+# Cache-layer stuff
 cache::route_table:
 eqiad: 'direct'
 cache::text::nodes:
@@ -37,6 +39,43 @@
 cache::maps::nodes:
 eqiad:
   - '127.0.0.1'
+cache::text::apps:
+  appservers:
+backends:
+  eqiad:
+- '10.68.17.170' # deployment-mediawiki01
+- '10.68.16.127' # deployment-mediawiki02
+  api:
+backends:
+  eqiad:
+- '10.68.17.170' # deployment-mediawiki01
+- '10.68.16.127' # deployment-mediawiki02
+  rendering:
+backends:
+  eqiad:
+- '10.68.17.170' # deployment-mediawiki01
+- '10.68.16.127' # deployment-mediawiki02
+  security_audit:
+backends:
+  eqiad: '10.68.17.55' # deployment-mediawiki03
+  appservers_debug:
+backends:
+  eqiad: '10.68.17.170' # deployment-mediawiki01
+  cxserver:
+backends:
+  eqiad: 'cxserver-beta.wmflabs.org'
+  citoid:
+backends:
+  eqiad: 'citoid.wmflabs.org'
+  restbase:
+backends:
+  eqiad: 'deployment-restbase01.eqiad.wmflabs'
+cache::upload::apps:
+  swift:
+backends:
+  # ms emulator set in July 2013. Beta does not have Swift yet.
+  # instance is an unpuppetized hack with nginx proxy.
+  eqiad: '10.68.16.189' # deployment-upload.eqiad.wmflabs
 role::cache::base::zero_site: 'http://zero.wikimedia.beta.wmflabs.org'
 role::cache::base::purge_host_only_upload_re: '^upload\.beta\.wmflabs\.org$'
 role::cache::base::purge_host_not_upload_re: '^(?!upload\.beta\.wmflabs\.org)'
@@ -48,6 +87,7 @@
   - vdb
   - vdb
 varnish::dynamic_directors: false
+
 zookeeper_hosts:
   "${::fqdn}": 1
 nrpe::allowed_hosts: '10.68.16.195'
diff --git a/modules/role/manifests/cache/configuration.pp 
b/modules/role/manifests/cache/configuration.pp
deleted file mode 100644
index 6a814e8..000
--- a/modules/role/manifests/cache/configuration.pp
+++ /dev/null
@@ -1,79 +0,0 @@
-class role::cache::configuration {
-

[MediaWiki-commits] [Gerrit] wikimedia-common VCL: remove static backend weighting - change (operations/puppet)

2016-03-04 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: wikimedia-common VCL: remove static backend weighting
..

wikimedia-common VCL: remove static backend weighting

This simplifies further refactoring.

The only use-case for the weight backend_options attribute was the
cache backend_scaled_weights removed in the previous commit, which
weren't being templated here anyways because they're dynamic now.

In the future, I don't expect us to need this capability again.
For cache->cache backends, we already manage weighting via confd
as dynamic directors.  Any actual applayer backend complicated
enough that it wants differential weighting of multiple backends
should be going through a singular service hostname managed by
pybal with the weighting placed there (as is the case with the
current foo.svc.(eqiad|codfw).wmnet services).

Bug: T127484
Change-Id: I2e589a22c459044c1844220292e9d66f154ccad2
---
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/275116/1

diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
index af2be22..31fc958 100644
--- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
@@ -141,7 +141,6 @@
 -%>
{
.backend = <%= name %>;
-   .weight = <%= backend_option(backend, "weight", 10) %>;
}
 <% end -%>
 }

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

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

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

[MediaWiki-commits] [Gerrit] r::c::config: add restbase @ codfw - change (operations/puppet)

2016-03-04 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: r::c::config: add restbase @ codfw
..

r::c::config: add restbase @ codfw

Bug: T127484
Change-Id: Ie2f2577486aa3937d050832d41c100c14369a6e7
---
M modules/role/manifests/cache/configuration.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/275122/1

diff --git a/modules/role/manifests/cache/configuration.pp 
b/modules/role/manifests/cache/configuration.pp
index 25c9161..6a814e8 100644
--- a/modules/role/manifests/cache/configuration.pp
+++ b/modules/role/manifests/cache/configuration.pp
@@ -24,6 +24,7 @@
 },
 'restbase' => {
 'eqiad' => ['restbase.svc.eqiad.wmnet'],
+'codfw' => ['restbase.svc.codfw.wmnet'],
 },
 'swift' => {
 'eqiad' => ['ms-fe.svc.eqiad.wmnet'],

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

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

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

[MediaWiki-commits] [Gerrit] ganglia: fix format for $sites in labs hiera - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: ganglia: fix format for $sites in labs hiera
..

ganglia: fix format for $sites in labs hiera

Change-Id: I96ffdb626663714e47f282b2314ad6cbc4b833b3
---
M hieradata/labs/ganglia/common.yaml
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/hieradata/labs/ganglia/common.yaml 
b/hieradata/labs/ganglia/common.yaml
index 08d916b..43585f2 100644
--- a/hieradata/labs/ganglia/common.yaml
+++ b/hieradata/labs/ganglia/common.yaml
@@ -1 +1,2 @@
-sites: ulsfo
+sites:
+  - ulsfo

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

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

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

[MediaWiki-commits] [Gerrit] r::c::config: remove lvs::configuration include - change (operations/puppet)

2016-03-04 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: r::c::config: remove lvs::configuration include
..

r::c::config: remove lvs::configuration include

The lvs::configuration include here was redundant with the one in
r::c::base. r::c::config is now a data-only class...

Bug: T127484
Change-Id: I2112ca9542e303a0766107d9ec4700bda694afc5
---
M modules/role/manifests/cache/configuration.pp
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/modules/role/manifests/cache/configuration.pp 
b/modules/role/manifests/cache/configuration.pp
index fce987f..1940016 100644
--- a/modules/role/manifests/cache/configuration.pp
+++ b/modules/role/manifests/cache/configuration.pp
@@ -1,6 +1,4 @@
 class role::cache::configuration {
-include lvs::configuration
-
 $backends = {
 'production' => {
 'appservers'=> {

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

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

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

[MediaWiki-commits] [Gerrit] varnish: get rid of backend_options - change (operations/puppet)

2016-03-04 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: varnish: get rid of backend_options
..

varnish: get rid of backend_options

This eliminates the confusing, complex mess of backend_option() in
VCL and the cascading definitions that came from puppet data
defaults at various layers, regex matches on backend hostnames
(which always matched all the hosts of one director), and then
finally defaults for undefined options encoded in erb directly.

Now, from the template or varnish::instance perspective, every
director must define 'be_opts', which lists all options for the
backends in that director (no defaulting).

Further up in the cache roles, simple defaulting is done for
applayer definitions with common attributes using merge().

Bug: T127484
Change-Id: Ibb2fae6bd2a2842ae49cece754bb7e809d0970b8
---
M modules/role/manifests/cache/instances.pp
M modules/role/manifests/cache/maps.pp
M modules/role/manifests/cache/misc.pp
M modules/role/manifests/cache/text.pp
M modules/role/manifests/cache/upload.pp
M modules/varnish/manifests/instance.pp
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
7 files changed, 252 insertions(+), 257 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/275117/1

diff --git a/modules/role/manifests/cache/instances.pp 
b/modules/role/manifests/cache/instances.pp
index 2a42404..e50a5f0 100644
--- a/modules/role/manifests/cache/instances.pp
+++ b/modules/role/manifests/cache/instances.pp
@@ -8,8 +8,8 @@
 $be_vcl_config,
 $fe_extra_vcl,
 $be_extra_vcl,
-$fe_def_beopts,
-$be_def_beopts,
+$fe_cache_be_opts,
+$be_cache_be_opts,
 $be_storage,
 $cluster_nodes
 ) {
@@ -32,6 +32,7 @@
 'dc'   => 'eqiad',
 'service'  => 'varnish-be',
 'backends' => $cluster_nodes['eqiad'],
+'be_opts'  => $be_cache_be_opts,
 },
 'cache_eqiad_random' => {
 'dynamic'  => 'yes',
@@ -39,6 +40,7 @@
 'dc'   => 'eqiad',
 'service'  => 'varnish-be-rand',
 'backends' => $cluster_nodes['eqiad'],
+'be_opts'  => $be_cache_be_opts,
 },
 'cache_codfw' => {
 'dynamic'  => 'yes',
@@ -46,6 +48,7 @@
 'dc'   => 'codfw',
 'service'  => 'varnish-be',
 'backends' => $cluster_nodes['codfw'],
+'be_opts'  => $be_cache_be_opts,
 },
 'cache_codfw_random' => {
 'dynamic'  => 'yes',
@@ -53,6 +56,7 @@
 'dc'   => 'codfw',
 'service'  => 'varnish-be-rand',
 'backends' => $cluster_nodes['codfw'],
+'be_opts'  => $be_cache_be_opts,
 },
 }
 
@@ -77,15 +81,6 @@
 storage=> $be_storage,
 vcl_config => $be_vcl_config,
 directors  => $be_directors,
-backend_options=> array_concat(
-$app_be_opts,
-{
-'backend_match' => '^cp[0-9]+\.',
-'port'  => 3128,
-'probe' => 'varnish',
-},
-$be_def_beopts
-),
 }
 
 varnish::instance { "${title}-frontend":
@@ -104,6 +99,7 @@
 'dc'   => $::site,
 'service'  => 'varnish-be',
 'backends' => $cluster_nodes[$::site],
+'be_opts'  => $fe_cache_be_opts,
 },
 'cache_local_random' => {
 'dynamic'  => 'yes',
@@ -111,9 +107,9 @@
 'dc'   => $::site,
 'service'  => 'varnish-be-rand',
 'backends' => $cluster_nodes[$::site],
+'be_opts'  => $fe_cache_be_opts,
 },
 },
 vcl_config => $fe_vcl_config,
-backend_options=> $fe_def_beopts,
 }
 }
diff --git a/modules/role/manifests/cache/maps.pp 
b/modules/role/manifests/cache/maps.pp
index f5c7a8e..6a5ad15 100644
--- a/modules/role/manifests/cache/maps.pp
+++ b/modules/role/manifests/cache/maps.pp
@@ -17,18 +17,7 @@
 realserver_ips => $lvs::configuration::service_ips['maps'][$::site],
 }
 
-$app_directors = {
-'kartotherian'   => {
-'dynamic'  => 'no',
-'type' => 'random',
-# XXX note explicit abnormal hack: service only exists in codfw, 
but eqiad is Tier-1 in general
-# XXX this means traffic is moving x-dc without crypto!
-# XXX this also means users mapped to codfw frontends bounce 
traffic [codfw->eqiad->codfw] on their way in!
-'backends' => 
$role::cache::configuration::backends[$::realm]['kartotherian']['codfw'],
-},
-}
-
-$fe_def_beopts = {
+$fe_cache_be_opts = {
 'port'  => 3128,
 'connect_timeout'   => '5s',

[MediaWiki-commits] [Gerrit] varnish: allow director backends to be single-value again - change (operations/puppet)

2016-03-04 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: varnish: allow director backends to be single-value again
..

varnish: allow director backends to be single-value again

director=>backends used to allow being a single value or an array.
We switched to requiring an array some time back to simplify some
code.  Now I've learned about the Ruby splat operator, which makes
it easy for cleaner code to support both again.  The single value
form is far more common when we move this data to hieradata/ and
saves lots of lines and line-noise if it doesn't need unecessary
array enclosures.

Bug: T127484
Change-Id: I52d78bc0e8ed15b01d41eb9511e3fbeb8b433680
---
M modules/varnish/templates/vcl/directors.vcl.tpl.erb
M modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/18/275118/1

diff --git a/modules/varnish/templates/vcl/directors.vcl.tpl.erb 
b/modules/varnish/templates/vcl/directors.vcl.tpl.erb
index b5e8ff4..cd895ea 100644
--- a/modules/varnish/templates/vcl/directors.vcl.tpl.erb
+++ b/modules/varnish/templates/vcl/directors.vcl.tpl.erb
@@ -18,7 +18,7 @@
 director <%= director_name %> <%= director['type'] %> {
 <%- keyspace = 
"#{@conftool_namespace}/#{director['dc']}/#{@group}/#{director['service']}" -%>
<%- if director['type'] == 'chash' %>
-   .retries = <%= chash_def_retries(99, director['backends'].size) %>;
+   .retries = <%= chash_def_retries(99, [*director['backends']].size) %>;
<% end -%>
{{range $node := ls "<%= keyspace %>/"}}{{ $key := printf "<%= keyspace 
%>/%s" $node }}{{ $data := json (getv $key) }}{{ if eq $data.pooled "yes"}}
{
diff --git a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb 
b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
index ac0294a..f460336 100644
--- a/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
+++ b/modules/varnish/templates/vcl/wikimedia-common.inc.vcl.erb
@@ -83,7 +83,7 @@
 # 'type' => 'chash', # required
 # 'dc'   => 'eqiad', # required if dynamic==yes
 # 'service'  => 'foo',   # required if dynamic==yes
-# 'backends' => [ "backend1", "backend2" ], # required
+# 'backends' => [ "backend1", "backend2" ], # required: array or 
single value
 # 'be_opts'  => { # every option but 'probe' is required!
 # 'port' = 80,
 # 'connect_timeout' = '2s',
@@ -99,7 +99,7 @@
 @varnish_directors.keys.sort.each do |director_name|
director = @varnish_directors[director_name]
be_opts = director[be_opts]
-   director['backends'].each do |backend|
+   [*director['backends']].each do |backend|
name = /^[0-9\.]+$/.match(backend) ? "ipv4_" + 
backend.gsub(".", "_") : "be_" + backend.split(".")[0].gsub("-", "_")
probe_str = defined? be_opts['probe'] ? ".probe = " + 
be_opts['probe'] + ";" : "";
 -%>
@@ -126,7 +126,7 @@
 <% @varnish_directors.keys.sort.each do |director_name|
 director = @varnish_directors[director_name]
 if (!@dynamic_directors or director['dynamic'] != 'yes')
-   backends = director['backends']
+   backends = [*director['backends']]
if (!backends.empty?)
 -%>
 director <%= director_name %> <%= director['type'] %> {

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

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

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

[MediaWiki-commits] [Gerrit] caches: remove backend_scaled_weights - change (operations/puppet)

2016-03-04 Thread BBlack (Code Review)

BBlack has uploaded a new change for review.

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

Change subject: caches: remove backend_scaled_weights
..

caches: remove backend_scaled_weights

These weightings are currently managed in confd data.  I was
tempted to preserve them as commentary as well, but we're only
using these as true runtime differentials within a cluster in one
case today: esams cache_text.  Even that case will go away once we
do T125485

Bug: T125485
Bug: T127484
Change-Id: I8c04c9a2802e6d0e8f6b1981e3370ba03a1e6662
---
M modules/role/manifests/cache/2layer.pp
M modules/role/manifests/cache/instances.pp
2 files changed, 1 insertion(+), 15 deletions(-)


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

diff --git a/modules/role/manifests/cache/2layer.pp 
b/modules/role/manifests/cache/2layer.pp
index 08faf8b..1933f4f 100644
--- a/modules/role/manifests/cache/2layer.pp
+++ b/modules/role/manifests/cache/2layer.pp
@@ -41,16 +41,6 @@
 default => 6,   # 6 is the bare min, for e.g. virtuals
 }
 
-# This scales backend weights proportional to node storage size,
-# with the default value of 100 corresponding to the most
-# common/current case of 360G storage size on Intel S3700's.
-$backend_scaled_weights = [
-{ backend_match => '^cp10(08|4[34])\.',  weight => 32  },
-{ backend_match => '^cp30(0[3-9]|1[0-4])\.', weight => 128 },
-{ backend_match => '^cp301[5-8]\.',  weight => 63  },
-{ backend_match => '.',  weight => 100 },
-]
-
 $filesystems = unique($storage_parts)
 varnish::setup_filesystem { $filesystems: }
 Varnish::Setup_filesystem <| |> -> Varnish::Instance <| |>
diff --git a/modules/role/manifests/cache/instances.pp 
b/modules/role/manifests/cache/instances.pp
index 275bbf7..2a42404 100644
--- a/modules/role/manifests/cache/instances.pp
+++ b/modules/role/manifests/cache/instances.pp
@@ -78,7 +78,6 @@
 vcl_config => $be_vcl_config,
 directors  => $be_directors,
 backend_options=> array_concat(
-$::role::cache::2layer::backend_scaled_weights,
 $app_be_opts,
 {
 'backend_match' => '^cp[0-9]+\.',
@@ -115,9 +114,6 @@
 },
 },
 vcl_config => $fe_vcl_config,
-backend_options=> array_concat(
-$::role::cache::2layer::backend_scaled_weights,
-$fe_def_beopts
-),
+backend_options=> $fe_def_beopts,
 }
 }

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

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

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

[MediaWiki-commits] [Gerrit] ganglia: set $sites in labs hiera for testing - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has submitted this change and it was merged.

Change subject: ganglia: set $sites in labs hiera for testing
..


ganglia: set $sites in labs hiera for testing

Change-Id: Ic632341e8874d2c40a905796a91afc257ea48a64
---
A hieradata/labs/ganglia/common.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/hieradata/labs/ganglia/common.yaml 
b/hieradata/labs/ganglia/common.yaml
new file mode 100644
index 000..08d916b
--- /dev/null
+++ b/hieradata/labs/ganglia/common.yaml
@@ -0,0 +1 @@
+sites: ulsfo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic632341e8874d2c40a905796a91afc257ea48a64
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 

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

[MediaWiki-commits] [Gerrit] ganglia: set $sites in labs hiera for testing - change (operations/puppet)

2016-03-04 Thread Dzahn (Code Review)

Dzahn has uploaded a new change for review.

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

Change subject: ganglia: set $sites in labs hiera for testing
..

ganglia: set $sites in labs hiera for testing

Change-Id: Ic632341e8874d2c40a905796a91afc257ea48a64
---
A hieradata/labs/ganglia/common.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/hieradata/labs/ganglia/common.yaml 
b/hieradata/labs/ganglia/common.yaml
new file mode 100644
index 000..08d916b
--- /dev/null
+++ b/hieradata/labs/ganglia/common.yaml
@@ -0,0 +1 @@
+sites: ulsfo

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

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

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

[MediaWiki-commits] [Gerrit] Styling adjustments for notifications - change (mediawiki...Echo)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Styling adjustments for notifications
..


Styling adjustments for notifications

Bug: T125969
Bug: T128444
Change-Id: I3dba4fcddf5262450cce4ba384abfdc3518b7cb8
---
M modules/ooui/styles/mw.echo.ui.MenuItemWidget.less
M modules/ooui/styles/mw.echo.ui.NotificationGroupItemWidget.less
M modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less
3 files changed, 13 insertions(+), 11 deletions(-)

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



diff --git a/modules/ooui/styles/mw.echo.ui.MenuItemWidget.less 
b/modules/ooui/styles/mw.echo.ui.MenuItemWidget.less
index dbe31c3..52457d7 100644
--- a/modules/ooui/styles/mw.echo.ui.MenuItemWidget.less
+++ b/modules/ooui/styles/mw.echo.ui.MenuItemWidget.less
@@ -30,7 +30,9 @@
}
 
&-prioritized {
+   .mw-echo-ui-mixin-hover-opacity();
display: inline-block;
+   padding: 0;
}
 
// Correct for when inside the popup menu
diff --git a/modules/ooui/styles/mw.echo.ui.NotificationGroupItemWidget.less 
b/modules/ooui/styles/mw.echo.ui.NotificationGroupItemWidget.less
index 71d65c1..b677da8 100644
--- a/modules/ooui/styles/mw.echo.ui.NotificationGroupItemWidget.less
+++ b/modules/ooui/styles/mw.echo.ui.NotificationGroupItemWidget.less
@@ -13,7 +13,7 @@
}
 
&-content {
-   margin-bottom: 0.5em;
+   margin-bottom: 1em;
padding-right: 0.8em;
padding-left: ~"calc(30px + 1.6em)"; // 30px+0.8em from 
ItemWidget, plus 0.8em
}
diff --git a/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less 
b/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less
index 1a9a070..d9be2c9 100644
--- a/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less
+++ b/modules/ooui/styles/mw.echo.ui.NotificationItemWidget.less
@@ -6,7 +6,6 @@
background-color: #F1F1F1;
border-bottom: 1px solid #DD;
white-space: normal;
-   line-height: 16px;
 
&:hover > a {
text-decoration: none;
@@ -33,6 +32,7 @@
width: 100%;
 
&-message {
+   line-height: 16px;
&-header {
color: @notification-text-color;
}
@@ -55,20 +55,18 @@
 
& > &-buttons.oo-ui-buttonSelectWidget {
display: table-cell;
-   vertical-align: top;
-   width: 100%;
+   vertical-align: middle;
}
 
.mw-echo-ui-menuItemWidget {
-   &:not(:last-child) {
-   margin-right: 1em;
-   }
+   margin-right: 1.2em;
}
 
&-menu {
+   .mw-echo-ui-mixin-hover-opacity();
display: table-cell;
-   vertical-align: top;
-   padding: 0 0.5em;
+   vertical-align: middle;
+   padding: 0;
 
.oo-ui-popupWidget-popup {
font-size: 1 / 0.8em;
@@ -78,10 +76,12 @@
 
&-timestamp {
display: table-cell;
-   vertical-align: top;
+   vertical-align: middle;
+   text-align: right;
color: black;
opacity: @opacity-low;
white-space: nowrap;
+   width: 100%;
}
 
}
@@ -155,7 +155,7 @@
float: right;
font-size: 1em;
margin-top: -0.5em;
-   margin-right: -0.5em;
+   margin-right: -0.4em;
padding: 0;
 
.mw-echo-ui-notificationItemWidget-bundle & {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3dba4fcddf5262450cce4ba384abfdc3518b7cb8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: Sbisson 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list

[MediaWiki-commits] [Gerrit] Float VE UI toolbar below a fixed or sticky navbar; more z-i... - change (mediawiki...chameleon)

2016-03-04 Thread Foxtrott (Code Review)

Foxtrott has uploaded a new change for review.

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

Change subject: Float VE UI toolbar below a fixed or sticky navbar; more 
z-index fixes
..

Float VE UI toolbar below a fixed or sticky navbar; more z-index fixes

Change-Id: I1773833df203b102526026143915695346bcd7df
---
M docs/release-notes.md
M resources/styles/extensionfixes.less
2 files changed, 10 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/chameleon 
refs/changes/13/275113/1

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 3c2d304..9d646f1 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -15,6 +15,7 @@
 * Correctly follow symlinks
   ([Bug: T124714](https://phabricator.wikimedia.org/T124714))
 * Provide correct box-sizing model and z-index for VisualEditor components
+* Float the VisualEditor UI toolbar below a fixed or sticky navbar
 
 ### Chameleon 1.2
 
diff --git a/resources/styles/extensionfixes.less 
b/resources/styles/extensionfixes.less
index 85ad3ef..dd20ab1 100644
--- a/resources/styles/extensionfixes.less
+++ b/resources/styles/extensionfixes.less
@@ -3,7 +3,7 @@
  *
  * This file is part of the MediaWiki skin Chameleon.
  *
- * @copyright 2013 - 2015, Stephan Gambke
+ * @copyright 2013 - 2016, Stephan Gambke
  * @license   GNU General Public License, version 3 (or any later version)
  *
  * The Chameleon skin is free software: you can redistribute it and/or modify
@@ -30,11 +30,17 @@
.ve-ui-toolbar, .ve-ui-debugBar, .oo-ui-processDialog-navigation {
&, &::before, &::after {
box-sizing: content-box;
-   z-index: @zindex-navbar-fixed + 1;
}
}
 
.ve-ui-overlay-global {
-   z-index: @zindex-navbar-fixed + 2;
+   z-index: @zindex-navbar-fixed + 1;
+   }
+
+   // float the VE UI toolbar below a fixed or sticky navbar
+   .navbar.navbar-fixed-top, .navbar + .sticky-wrapper {
+   ~ * .ve-ui-toolbar-floating>.oo-ui-toolbar-bar {
+   transform: translateY(@navbar-height);
+   }
}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1773833df203b102526026143915695346bcd7df
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/chameleon
Gerrit-Branch: master
Gerrit-Owner: Foxtrott 

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

[MediaWiki-commits] [Gerrit] Change: Implement Coordinate.precisionToDim - change (pywikibot/core)

2016-03-04 Thread Darthbhyrava (Code Review)

Darthbhyrava has uploaded a new change for review.

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

Change subject: Change: Implement Coordinate.precisionToDim
..

Change: Implement Coordinate.precisionToDim

Allow for precision to dimension conversion by implementing 
Coordinate.precisionToDim

Bug: T89670
Change-Id: I2f1432603218f0ede2b0f703ef3c5046928440b3
---
M pywikibot/__init__.py
1 file changed, 21 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core 
refs/changes/12/275112/1

diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 4fe6801..efe5903 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -364,9 +364,28 @@
 def precision(self, value):
 self._precision = value
 
+@property
 def precisionToDim(self):
-"""Convert precision from Wikibase to GeoData's dim."""
-raise NotImplementedError
+u"""Converts precision from Wikibase to GeoData's dim and returns the 
latter.
+
+The dimension is calculated if the Coordinate doesn't have a 
dimension, and self._precision is set.
+When neither dim nor precision are set, None is returned. 
+
+Carrying on from the earlier derivation of precision, since 
+precision = 
math.degrees(self._dim/(radius*math.cos(math.radians(self.lat, we get
+self._dim = 
math.radians(precision)*radius*math.cos(math.radians(self.lat))
+But this is not valid, since it returns a float value for self._dim 
which is an integer. We must round it off
+to the nearest integer.
+
+Therefore::
+self._dim = 
int(round(math.radians(precision)*radius*math.cos(math.radians(self.lat
+
+@rtype: int or None
+"""
+if self._dim is None and self._precision is not None:
+radius = 6378137
+self._dim = 
int(round(math.radians(self._precision)*radius*math.cos(math.radians(self.lat
+return self._dim
 
 
 class WbTime(_WbRepresentation):

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2f1432603218f0ede2b0f703ef3c5046928440b3
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Darthbhyrava 

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

[MediaWiki-commits] [Gerrit] Instrument diff timing - change (mediawiki/core)

2016-03-04 Thread MaxSem (Code Review)

MaxSem has uploaded a new change for review.

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

Change subject: Instrument diff timing
..

Instrument diff timing

Bug: T128697
Change-Id: I748286abac025092abc33b3b7b8a0d3dabafdd25
---
M includes/diff/DifferenceEngine.php
1 file changed, 18 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/11/275111/1

diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index 031fe53..70ea8bd 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -842,6 +842,24 @@
 * @return bool|string
 */
public function generateTextDiffBody( $otext, $ntext ) {
+   $time = microtime( true );
+
+   $result = $this->textDiff( $otext, $ntext );
+
+   $time = microtime( true ) - $time;
+   $this->getStats()->timing( 'diff_time', $time );
+
+   return $result;
+   }
+
+   /**
+* Generates diff, to be wrapped internally in a logging/instrumentation
+*
+* @param string $otext Old text, must be already segmented
+* @param string $ntext New text, must be already segmented
+* @return bool|string
+*/
+   protected function textDiff( $otext, $ntext ) {
global $wgExternalDiffEngine, $wgContLang;
 
$otext = str_replace( "\r\n", "\n", $otext );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I748286abac025092abc33b3b7b8a0d3dabafdd25
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: MaxSem 

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

[MediaWiki-commits] [Gerrit] Store mobileformatted text on OutputPage rather than ParserO... - change (mediawiki...MobileFrontend)

2016-03-04 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Store mobileformatted text on OutputPage rather than 
ParserOutput
..

Store mobileformatted text on OutputPage rather than ParserOutput

Still seems to be causing issues so let's not store on the ParserOutput
for the time being.

Bug: T124356
Change-Id: I07e86f130d833710c5019751de88307c218d9c91
---
M includes/MobileFrontend.hooks.php
M includes/skins/SkinMinerva.php
2 files changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/10/275110/1

diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index 61d8ef9..eabb118 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -1245,7 +1245,7 @@
}
}
// Enable wrapped sections
-   $po->setText( ExtMobileFrontend::DOMParse( $outputPage, 
$po->getRawText(), $isBeta ) );
+   $outputPage->setProperty( 'bodyhtml', 
ExtMobileFrontend::DOMParse( $outputPage, $po->getRawText(), $isBeta ) );
}
return true;
}
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 715c8f7..c5bb7d6 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -73,6 +73,11 @@
$this->prepareUserButton( $tpl );
$this->prepareLanguages( $tpl );
 
+   $html = $out->getProperty( 'bodyhtml' );
+   if ( $html ) {
+   $tpl->set( 'bodytext', $html );
+   }
+
return $tpl;
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07e86f130d833710c5019751de88307c218d9c91
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

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

[MediaWiki-commits] [Gerrit] Rename to Relevance Forge - change (wikimedia...relevancylab)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Rename to Relevance Forge
..


Rename to Relevance Forge

Change-Id: I99eb5d16a6de15e13d1b0e35e943b661b2ea6746
---
M README.md
1 file changed, 3 insertions(+), 166 deletions(-)

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



diff --git a/README.md b/README.md
index b193662..ab6c019 100644
--- a/README.md
+++ b/README.md
@@ -1,168 +1,5 @@
-# Relevanc(e|y) Lab*
+# Renamed!
 
-The primary purpose of the Relevance Lab is to allow us† to 
experiment with proposed modifications to our search process and gauge their 
effectiveness‡ and impact§ before releasing them into 
production, and even before doing any kind of user acceptance or A/B testing. 
Also, testing in the relevance lab gives an additional benefit over A/B tests 
(esp. in the case of very targeted changes): with A/B tests we aren't 
necessarily able to test the behavior of the *same query* with two different 
configurations.
-
-
-\* Both *relevance* and *relevancy* are attested. They mean [the same 
thing](https://en.wiktionary.org/wiki/relevance#Alternative_forms "See 
Wiktionary"). We want to be inclusive, so either is allowed. Note that *Rel 
Lab* saves several keystrokes and avoids having to choose.
-
-† Appropriate values of "us" include the Discovery team, other WMF teams, and 
potentially the wider community of Wiki users and developers.
-
-‡ "Does it do anything good?"
-
-§ "How many searches does it affect?"
-
-
-## Prerequisites
-
-* Python: There's nothing too fancy here, and it works with Python 2.7, though 
a few packages are required:
- * The package `jsonpath-rw` is required by the main Rel Lab.
- * The package `termcolor` is required by the Cirrus Query Debugger.
- * If you don't have one of these packages, you can get it with `pip install 
` (`sudo` may be required to install packages).
-* SSH access to the host you intend to connect to.
-
-## Invocation
-
-The main Rel Lab process is `relevancyRunner.py`, which takes a `.ini` config 
file (see below):
-
-relevancyRunner.py -c relevance.ini
-
-### Processes
-
-`relevancyRunner.py` parses the `.ini` file (see below), manages 
configuration, runs the queries against the Elasticsearch cluster and outputs 
the results, and then delegates diffing the results to the `jsonDiffTool` 
specified in the `.ini` file, and delegated the final report to the 
`metricTool` specified in the `.ini` file. It also archives the original 
queries and configuration (`.ini` and JSON `config` files) with the Rel Lab run 
output.
-
-The `jsonDiffTool` is implemented as `jsondiff.py`, "an almost smart enough 
JSON diff tool". It's actually not that smart: it munges the search results 
JSON a bit, pretty-prints it, and then uses Python's HtmlDiff to make 
reasonably pretty output.
-
-The `metricTool` is implemented as `relcomp.py`, which generates an HTML 
report comparing two relevance lab query runs. A number of metrics are defined, 
including zero results rate and a generic top-N diffs (sorted or not). Adding 
and configuring these metrics can be done in `main`, in the array `myMetrics`. 
Examples of queries that change from one run to the next for each metric are 
provided, with links into the diffs created by `jsondiff.py`.
-
-Running the queries is typically the most time-consuming part of the process. 
If you ask for a very large number of results for each query (≫100), the diff 
step can be very slow. The report processing is generally very quick.
-
-### Configuration
-
-The Rel Lab is configured by way of an .ini file. A sample, `relevance.ini`, 
is provided. Global settings are provided in `[settings]`, and config for the 
two test runs are in `[test1]` and `[test2]`.
-
-Additional command line arguments can be added to `searchCommand` to affect 
the way the queries are run (such as what wiki to run against, changing the 
number of results returned, and including detailed scoring information.
-
-The number of examples provided by `jsondiff.py` is configurable in the 
`metricTool` command line.
-
-See `relevance.ini` for more details on the command line arguments.
-
-Each `[test#]` contains the `name` of the query set, and the file containing 
the `queries` (see Input below). Optionally, a JSON `config` file can be 
provided, which is passed to `runSearch.php` on the command line. These JSON 
configurations should be formatted as a single line.
-
-The settings `queries`, `labHost`, `config`, and `searchCommand` can be 
specified globally under `[settings]` or per-run under `[test#]`. If both 
exist, `[test#]` will override `[settings]`.
-
- Example JSON configs:
-
-* `{"wgCirrusSearchFunctionRescoreWindowSize": 1, 
"wgCirrusSearchPhraseRescoreWindowSize" : 1}`
-   * Set the Function Rescore Window Size to 1, and set the Phrase Rescore 
Window Size to 1.
-
-* `{"wgCirrusSearchAllFields": {"use": false}}`
-   *

[MediaWiki-commits] [Gerrit] Rename to Relevance Forge - change (wikimedia...relevancylab)

2016-03-04 Thread EBernhardson (Code Review)

EBernhardson has uploaded a new change for review.

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

Change subject: Rename to Relevance Forge
..

Rename to Relevance Forge

Change-Id: I99eb5d16a6de15e13d1b0e35e943b661b2ea6746
---
M README.md
1 file changed, 3 insertions(+), 166 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/relevancylab 
refs/changes/09/275109/1

diff --git a/README.md b/README.md
index b193662..ab6c019 100644
--- a/README.md
+++ b/README.md
@@ -1,168 +1,5 @@
-# Relevanc(e|y) Lab*
+# Renamed!
 
-The primary purpose of the Relevance Lab is to allow us† to 
experiment with proposed modifications to our search process and gauge their 
effectiveness‡ and impact§ before releasing them into 
production, and even before doing any kind of user acceptance or A/B testing. 
Also, testing in the relevance lab gives an additional benefit over A/B tests 
(esp. in the case of very targeted changes): with A/B tests we aren't 
necessarily able to test the behavior of the *same query* with two different 
configurations.
-
-
-\* Both *relevance* and *relevancy* are attested. They mean [the same 
thing](https://en.wiktionary.org/wiki/relevance#Alternative_forms "See 
Wiktionary"). We want to be inclusive, so either is allowed. Note that *Rel 
Lab* saves several keystrokes and avoids having to choose.
-
-† Appropriate values of "us" include the Discovery team, other WMF teams, and 
potentially the wider community of Wiki users and developers.
-
-‡ "Does it do anything good?"
-
-§ "How many searches does it affect?"
-
-
-## Prerequisites
-
-* Python: There's nothing too fancy here, and it works with Python 2.7, though 
a few packages are required:
- * The package `jsonpath-rw` is required by the main Rel Lab.
- * The package `termcolor` is required by the Cirrus Query Debugger.
- * If you don't have one of these packages, you can get it with `pip install 
` (`sudo` may be required to install packages).
-* SSH access to the host you intend to connect to.
-
-## Invocation
-
-The main Rel Lab process is `relevancyRunner.py`, which takes a `.ini` config 
file (see below):
-
-relevancyRunner.py -c relevance.ini
-
-### Processes
-
-`relevancyRunner.py` parses the `.ini` file (see below), manages 
configuration, runs the queries against the Elasticsearch cluster and outputs 
the results, and then delegates diffing the results to the `jsonDiffTool` 
specified in the `.ini` file, and delegated the final report to the 
`metricTool` specified in the `.ini` file. It also archives the original 
queries and configuration (`.ini` and JSON `config` files) with the Rel Lab run 
output.
-
-The `jsonDiffTool` is implemented as `jsondiff.py`, "an almost smart enough 
JSON diff tool". It's actually not that smart: it munges the search results 
JSON a bit, pretty-prints it, and then uses Python's HtmlDiff to make 
reasonably pretty output.
-
-The `metricTool` is implemented as `relcomp.py`, which generates an HTML 
report comparing two relevance lab query runs. A number of metrics are defined, 
including zero results rate and a generic top-N diffs (sorted or not). Adding 
and configuring these metrics can be done in `main`, in the array `myMetrics`. 
Examples of queries that change from one run to the next for each metric are 
provided, with links into the diffs created by `jsondiff.py`.
-
-Running the queries is typically the most time-consuming part of the process. 
If you ask for a very large number of results for each query (≫100), the diff 
step can be very slow. The report processing is generally very quick.
-
-### Configuration
-
-The Rel Lab is configured by way of an .ini file. A sample, `relevance.ini`, 
is provided. Global settings are provided in `[settings]`, and config for the 
two test runs are in `[test1]` and `[test2]`.
-
-Additional command line arguments can be added to `searchCommand` to affect 
the way the queries are run (such as what wiki to run against, changing the 
number of results returned, and including detailed scoring information.
-
-The number of examples provided by `jsondiff.py` is configurable in the 
`metricTool` command line.
-
-See `relevance.ini` for more details on the command line arguments.
-
-Each `[test#]` contains the `name` of the query set, and the file containing 
the `queries` (see Input below). Optionally, a JSON `config` file can be 
provided, which is passed to `runSearch.php` on the command line. These JSON 
configurations should be formatted as a single line.
-
-The settings `queries`, `labHost`, `config`, and `searchCommand` can be 
specified globally under `[settings]` or per-run under `[test#]`. If both 
exist, `[test#]` will override `[settings]`.
-
- Example JSON configs:
-
-* `{"wgCirrusSearchFunctionRescoreWindowSize": 1, 
"wgCirrusSearchPhraseRescoreWindowSize" : 1}`
-   * Set the Function Rescore Window Size to 1, and set the Phrase Rescore 
Window Size to 1.
-

[MediaWiki-commits] [Gerrit] Increase deliverability guarantee of unload events in search... - change (mediawiki...WikimediaEvents)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Increase deliverability guarantee of unload events in search 
satisfaction schema
..


Increase deliverability guarantee of unload events in search satisfaction schema

The schema currently isn't able to track outbound clicks to other
domains, such as when we do backend interwiki searches. We decided not
to do it previously because sendBeacon isn't available in IE which means
we get a distorted view of reality.

This extends core event logging to utilize local storage to improve
deliverability guarantees of browsers that are not using sendBeacon,
mostly IE. This should help with tracking autocomplete events that fire
close to page unload, along with cross-domain search result clicks which
currently do not record any information about click through or dwell
time. This still doesn't help with dwell time, but would allow recording
click through position.

This starts off by adding new 'click' events. We can compare delivered
click events to visitPage events and figure out if the deliverability
increase was enough that we can reliably collect these click events.

Change-Id: I32c69a6e7a6144a3221e2059b855a0c2516e4548
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 125 insertions(+), 3 deletions(-)

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



diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index cc8575c..7d7484f 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -25,7 +25,7 @@
return;
}
 
-   var search, autoComplete, session,
+   var search, autoComplete, session, eventLog,
isSearchResultPage = mw.config.get( 'wgIsSearchResultPage' ),
uri = new mw.Uri( location.href ),
checkinTimes = [ 10, 20, 30, 40, 50, 60, 90, 120, 150, 180, 
210, 240, 300, 360, 420 ],
@@ -226,6 +226,113 @@
setTimeout( action, 1000 * timeout );
}
 
+   /**
+* Increase deliverability of events fired close to unload, such as
+* autocomplete results that the user selects. Uses a bit of optimism 
that
+* multiple tabs are not working on the same localStorage queue at the 
same
+* time. Could perhaps be improved with locking, but not sure the
+* code+overhead is worth it.
+*
+* @return {Object}
+*/
+   function extendMwEventLog() {
+   var self,
+   localQueue = {},
+   queueKey = 'wmE-Ss-queue';
+
+   // if we have send beacon or do not track is enabled do nothing
+   if ( navigator.sendBeacon || mw.eventLog.sendBeacon === $.noop 
) {
+   return mw.eventLog;
+   }
+
+   self = $.extend( {}, mw.eventLog, {
+   /**
+* Transfer data to a remote server by making a 
lightweight
+* HTTP request to the specified URL.
+*
+* @param {string} url URL to request from the server.
+*/
+   sendBeacon: function ( url ) {
+   // increase deliverability guarantee of events 
fired
+   // close to page unload, while adding some 
latency
+   // and chance of duplicate events
+   var img = document.createElement( 'img' ),
+   handler = function () {
+   delete localQueue[ url ];
+   };
+
+   localQueue[ url ] = true;
+   img.addEventListener( 'load', handler );
+   img.addEventListener( 'error', handler );
+   img.setAttribute( 'src', url );
+   },
+
+   /**
+* Construct and transmit to a remote server a record 
of some event
+* having occurred.
+*
+* This is a direct copy of mw.eventLog.logEvent. It is 
necessary
+* to override the call to sendBeacon.
+*
+* @param {string} schemaName
+* @param {Object} eventData
+* @return {jQuery.Promise}
+*/
+   logEvent: function ( schemaName, eventData ) {
+   var event = self.prepare( schemaName, eventData 
),
+

[MediaWiki-commits] [Gerrit] WIP Add links to test more payment methods - change (mediawiki/vagrant)

2016-03-04 Thread Ejegg (Code Review)

Ejegg has uploaded a new change for review.

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

Change subject: WIP Add links to test more payment methods
..

WIP Add links to test more payment methods

Covers most of our options for LATAM, random others

Change-Id: Ib58c07e6c88868c3ce8869e1716dc1768a460bb6
---
M puppet/modules/payments/files/Main_Page.wiki
1 file changed, 49 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant 
refs/changes/08/275108/1

diff --git a/puppet/modules/payments/files/Main_Page.wiki 
b/puppet/modules/payments/files/Main_Page.wiki
index 2da505e..62e6e5d 100644
--- a/puppet/modules/payments/files/Main_Page.wiki
+++ b/puppet/modules/payments/files/Main_Page.wiki
@@ -26,19 +26,62 @@
 );
 
 = Some donation forms =
+Donate links:
 
-* 
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuote=cc-vmad==en=en=EUR=US=2.01}}
 GlobalCollect in the US, English, EUR]
-* 
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuote=cc-vmad=1=en=en=EUR=US=2.01}}
 GlobalCollect recurring in the US, English, EUR]
-* 
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuote=cc-vmad==en=en=ILS=IL=20.01}}
 GlobalCollect in IL, English]
-* 
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuote=cc-vmad==he=he=ILS=IL=20.01}}
 GlobalCollect in IL, Hebrew]
+* Adyen
+** 
[{{fullurl:Special:AdyenGateway|appeal=JimmyQuote_method=cc==en=en_code=USD=10=US}}
 Credit card in US, English, USD]
+** 
[{{fullurl:Special:AdyenGateway|appeal=JimmyQuote_method=cc==en=en_code=GBP=10=GB}}
 Credit card in GB, English, GBP]
 
-* 
[{{fullurl:Special:GatewayFormChooser|uselang=en=en_code=EUR=NL=cc=3==US_code=USD=onetime=en_method=cc_campaign=none_key=27_medium=sitenotice_source=B14_120723_5C_tp_tw1.no-LP.cc}}
 Form chooser, credit card in NL]
+* Amazon
+** 
[{{fullurl:Special:AmazonGateway|currency=USD=US=1=amazon}}
 In US, no language specified, USD]
+
+* AstroPay
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=cc==en=en_code=BRL=100=BR=astropay}}
 Credit card in BR, English, BRL]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=cash==en=en_code=BRL=100=BR=astropay}}
 Cash (Boletos) in BR, English, BRL]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=bt==en=en_code=BRL=100=BR=astropay}}
 Bank transfer in BR, English, BRL]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=cc==es=es_code=MXN=100=MX=astropay}}
 Credit card in MX, English, MXN]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=cash==es=es_code=MXN=100=MX=astropay}}
 Cash in MX, English, MXN]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=cc==es=es_code=ARS=100=AR=astropay}}
 Credit card in AR, English, ARS]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=bt==es=es_code=ARS=100=AR=astropay}}
 Bank Transfer in AR, English, ARS]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=cash==es=es_code=ARS=100=AR=astropay}}
 Cash in AR, English, ARS]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=cc==es=es_code=CLP=100=CL=astropay}}
 Credit card in CL, English, CLP]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=bt==es=es_code=CLP=100=CL=astropay}}
 Bank Transfer in CL, English, CLP]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=cc==es=es_code=COP=100=CO=astropay}}
 Credit card in CO, English, COP]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=bt==es=es_code=COP=100=CO=astropay}}
 Bank transfer in CO, English, COP]
+** 
[{{fullurl:Special:AstropayGateway|appeal=JimmyQuote_method=cash==es=es_code=COP=100=CO=astropay}}
 Cash in CO, English, COP]
+
+* GlobalCollect
+** 
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuote=cc-vmad_method=cc==en=en_code=USD=10=US}}
 Credit card in US, English, USD]
+** 
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuote=cc-vmad_method=cc==en=en=GBP=GB=2.01}}
 Credit card in GB, English, GBP]
+** 
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuote=rcc-vmad_method=cc=1=en=en=EUR=US=2.01}}
 Recurring credit card in US, English, EUR]
+** 
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuote=cc-vmad_method=cc==en=en=ILS=IL=20.01}}
 Credit card in IL, English, ILS]
+** 
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuote=cc-vmad_method=cc==he=he=ILS=IL=20.01}}
 Credit card in IL, Hebrew, ILS]
+** 
[{{fullurl:Special:GlobalCollectGateway|appeal=JimmyQuote=_method=obt_medium=Waystogive_campaign=C11_Waystogive_key==en=AU=Thank_You%2Fen=_code=AUD=onetime=3=en}}
 Online bank transfer in AU, English, AUD]
+** 
[{{fullurl:Special:GlobalCollectGateway|country=CN=30_code=CNY=ew-alipay}}
 Alipay e-wallet in CN, English, CNY]
+**

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 67c207a..0d94d83 - change (mediawiki/extensions)

2016-03-04 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has uploaded a new change for review.

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

Change subject: Syncronize VisualEditor: 67c207a..0d94d83
..

Syncronize VisualEditor: 67c207a..0d94d83

Change-Id: I4044640856ddcf5cf9393279e28056493b02d329
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions 
refs/changes/07/275107/1

diff --git a/VisualEditor b/VisualEditor
index 67c207a..0d94d83 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 67c207a6f5f12b95e530d2d6425a417c49dbf004
+Subproject commit 0d94d8312dd916d5142960dc563805673f3425e5

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4044640856ddcf5cf9393279e28056493b02d329
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 67c207a..0d94d83 - change (mediawiki/extensions)

2016-03-04 Thread Jenkins-mwext-sync (Code Review)

Jenkins-mwext-sync has submitted this change and it was merged.

Change subject: Syncronize VisualEditor: 67c207a..0d94d83
..


Syncronize VisualEditor: 67c207a..0d94d83

Change-Id: I4044640856ddcf5cf9393279e28056493b02d329
---
M VisualEditor
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Jenkins-mwext-sync: Verified; Looks good to me, approved



diff --git a/VisualEditor b/VisualEditor
index 67c207a..0d94d83 16
--- a/VisualEditor
+++ b/VisualEditor
-Subproject commit 67c207a6f5f12b95e530d2d6425a417c49dbf004
+Subproject commit 0d94d8312dd916d5142960dc563805673f3425e5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4044640856ddcf5cf9393279e28056493b02d329
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions
Gerrit-Branch: master
Gerrit-Owner: Jenkins-mwext-sync 
Gerrit-Reviewer: Jenkins-mwext-sync 

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

[MediaWiki-commits] [Gerrit] Remove superflous pseudo-class and unitize comments - change (oojs/ui)

2016-03-04 Thread VolkerE (Code Review)

VolkerE has uploaded a new change for review.

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

Change subject: Remove superflous pseudo-class and unitize comments
..

Remove superflous pseudo-class and unitize comments

IE proprietary pseudo-class `::-ms-reveal` only applies to
`` and therefore is removed from `type=search`.
Also replacing `-webkit-appearance` value from `none` to `textfield`
to better address normalization. See https://phabricator.wikimedia.org/F3522603
and https://codepen.io/Volker_E/pen/bpVavq .
Also unitizing comments, like always whitespace between browser and version
number.

Change-Id: I7212e071a7fece8e05305155130e0b818b467671
---
M src/styles/common.less
M src/styles/widgets/TextInputWidget.less
M src/themes/mediawiki/widgets.less
M src/widgets/ButtonInputWidget.js
4 files changed, 11 insertions(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/83/275083/1

diff --git a/src/styles/common.less b/src/styles/common.less
index f29a879..537fb7a 100644
--- a/src/styles/common.less
+++ b/src/styles/common.less
@@ -55,7 +55,7 @@
 .oo-ui-transform( @string ) {
-webkit-transform: @string;
-moz-transform: @string;
-   -ms-transform: @string; // IE9 only
+   -ms-transform: @string; // IE 9 only
transform: @string;
 }
 
diff --git a/src/styles/widgets/TextInputWidget.less 
b/src/styles/widgets/TextInputWidget.less
index fd2d472..c9c5c3a 100644
--- a/src/styles/widgets/TextInputWidget.less
+++ b/src/styles/widgets/TextInputWidget.less
@@ -2,7 +2,7 @@
 
 .oo-ui-textInputWidget {
position: relative;
-   // Necessary for proper alignment when used with display: inline-block
+   // Necessary for proper alignment when used with `display: inline-block`
vertical-align: middle;
.oo-ui-box-sizing( border-box );
 
@@ -14,25 +14,23 @@
.oo-ui-box-sizing( border-box );
}
 
-   // IE8-11 defaults overflow to 'scroll'. Modern browsers use 'auto'
+   // IE 8-11 defaults `overflow` to `scroll`. Modern browsers use `auto`
textarea {
overflow: auto;
}
 
-   // Remove default styling for , especially the 
built-in "clear" button
+   // Normalize styling for `` and
+   // remove proprietary vendor UI extensions
input[type="search"] {
-   // Safari
-   -webkit-appearance: none;
+   // Safari 5, Chrome
+   -webkit-appearance: texfield;
 
-   // Internet Explorer
+   // IE 10-11
&::-ms-clear {
display: none;
}
-   &::-ms-reveal {
-   display: none;
-   }
 
-   // Chrome
+   // Chrome, `::-webkit-search-results-*` only when `results` 
attr set
&::-webkit-search-decoration,
&::-webkit-search-cancel-button,
&::-webkit-search-results-button,
diff --git a/src/themes/mediawiki/widgets.less 
b/src/themes/mediawiki/widgets.less
index 24c8a2f..4b72e39 100644
--- a/src/themes/mediawiki/widgets.less
+++ b/src/themes/mediawiki/widgets.less
@@ -731,7 +731,7 @@
}
 
> .oo-ui-capsuleMultiSelectWidget-content > input:focus {
-   // For Chrome
+   // Chrome
outline: none;
}
}
diff --git a/src/widgets/ButtonInputWidget.js b/src/widgets/ButtonInputWidget.js
index f7be83b..a1228f1 100644
--- a/src/widgets/ButtonInputWidget.js
+++ b/src/widgets/ButtonInputWidget.js
@@ -30,7 +30,7 @@
  * @cfg {boolean} [useInputTag=false] Use an `` tag instead of a 
`` tag, the default.
  *  Widgets configured to be an `` do not support {@link #icon icons} 
and {@link #indicator indicators},
  *  non-plaintext {@link #label labels}, or {@link #value values}. In general, 
useInputTag should only
- *  be set to `true` when there’s need to support IE6 in a form with multiple 
buttons.
+ *  be set to `true` when there’s need to support IE 6 in a form with multiple 
buttons.
  */
 OO.ui.ButtonInputWidget = function OoUiButtonInputWidget( config ) {
// Configuration initialization

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7212e071a7fece8e05305155130e0b818b467671
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE 

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

[MediaWiki-commits] [Gerrit] Fix optional map handling - change (mediawiki...Kartographer)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Fix optional map handling
..


Fix optional map handling

Change-Id: I81c080150f311f760ea725dfc53d2a873bc85033
---
M modules/kartographer.js
1 file changed, 3 insertions(+), 1 deletion(-)

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



diff --git a/modules/kartographer.js b/modules/kartographer.js
index 1d3f6eb..82405af 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -183,7 +183,9 @@
.openWindow( mapDialog, data )
.then( function ( opened ) { return opened; } )
.then( function ( closing ) {
-   map.setView( mapDialog.map.getCenter(), 
mapDialog.map.getZoom() );
+   if ( map ) {
+   map.setView( 
mapDialog.map.getCenter(), mapDialog.map.getZoom() );
+   }
return closing;
} );
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I81c080150f311f760ea725dfc53d2a873bc85033
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik 
Gerrit-Reviewer: MaxSem 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add autocomplete to search satisfaction schema - change (mediawiki...WikimediaEvents)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Add autocomplete to search satisfaction schema
..


Add autocomplete to search satisfaction schema

* Adds a 'source' field distinguishing events as coming from
  autocomplete or full text search.
* Recreate all full text events for autocomplete
* Drop 'searchToken' field from schema, due to sampling
  of top level sessions it did not provide any useful
  information.

Depends-On: Idae51bf73039ed92c868cb5a0632302843313717
Depends-On: Iec7171fcf301f1659d852afa87ce271f468177c1
Bug: T125915
Change-Id: I5438373ed0c53ff524aea4b0548cd850c7e00e92
---
M extension.json
M modules/ext.wikimediaEvents.searchSatisfaction.js
2 files changed, 105 insertions(+), 21 deletions(-)

Approvals:
  Bearloga: Looks good to me, but someone else must approve
  MaxSem: Looks good to me, approved
  JGirault: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 4841f5c..0eb8d3d 100644
--- a/extension.json
+++ b/extension.json
@@ -101,7 +101,7 @@
"schema.TestSearchSatisfaction2": {
"class": "ResourceLoaderSchemaModule",
"schema": "TestSearchSatisfaction2",
-   "revision": 14098806
+   "revision": 15357244
},
"schema.GeoFeatures": {
"class": "ResourceLoaderSchemaModule",
diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index b8575db..cc8575c 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -25,7 +25,7 @@
return;
}
 
-   var search, session,
+   var search, autoComplete, session,
isSearchResultPage = mw.config.get( 'wgIsSearchResultPage' ),
uri = new mw.Uri( location.href ),
checkinTimes = [ 10, 20, 30, 40, 50, 60, 90, 120, 150, 180, 
210, 240, 300, 360, 420 ],
@@ -49,6 +49,10 @@
}
 
search = initFromWprov( 'srpw1_' );
+   autoComplete = initFromWprov( 'acrw1_' );
+   // with no position appended indicates the user submitted the
+   // autocomplete form.
+   autoComplete.cameFromAutocomplete = uri.query.wprov === 'acrw1';
 
// Cleanup the location bar in supported browsers.
if ( uri.query.wprov && window.history.replaceState ) {
@@ -126,14 +130,6 @@
if ( !session.set( 'sessionId', randomToken() ) 
) {
return false;
}
-   }
-
-   if ( session.get( 'token' ) === null ) {
-   if ( !session.set( 'token', randomToken() ) ) {
-   return false;
-   }
-   } else {
-   session.refresh( 'token' );
}
 
// Unique token per page load to know which events 
occured
@@ -230,12 +226,14 @@
setTimeout( action, 1000 * timeout );
}
 
-   function genLogEventFn( session ) {
+   function genLogEventFn( source, session ) {
return function ( action, extraData ) {
var scrollTop = $( window ).scrollTop(),
evt = {
// searchResultPage, visitPage or 
checkin
action: action,
+   // source of the action, either search 
or autocomplete
+   source: source,
// identifies a single user performing 
searches within
// a limited time span.
searchSessionId: session.get( 
'sessionId' ),
@@ -247,9 +245,9 @@
// identifies if a user has scrolled 
the page since the
// last event
scroll: scrollTop !== lastScrollTop,
-   // identifies a single user over a 24 
hour timespan,
-   // allowing to tie together multiple 
search sessions
-   searchToken: session.get( 'token' )
+   // mediawiki session id to correlate 
with other schemas,
+   // such as QuickSurvey
+   mwSessionId: mw.user.sessionId()
};
 
lastScrollTop = scrollTop;
@@ -279,7 +277,7 @@
 * @param

[MediaWiki-commits] [Gerrit] Allow us to recheck gate and submit - change (integration/config)

2016-03-04 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Allow us to recheck gate and submit
..

Allow us to recheck gate and submit

Change-Id: I6c72e6cdc2ad3df0610b6e5affee9f7532d90dc7
---
M zuul/layout.yaml
1 file changed, 7 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/62/275062/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 742556a..09cfcc1 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -517,6 +517,13 @@
- ^(?!l10n-bot@translatewiki\.net).*$
   approval:
 - code-review: 2
+# Let whitelisted users the ability to reenqueue a change in the test
+# pipeline by simply commenting 'recheck' on a change.
+- event: comment-added
+  comment_filter: (?im)^Patch Set \d+:( 
-?Code\-Review(\+)?(2)?)?\n\n\s*recheck gate\.?\s*$
+  email: *email_whitelist
+  approval:
+- code-review: 2
 start:
   gerrit:
 verified: 0

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

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

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

[MediaWiki-commits] [Gerrit] Fix optional map handling - change (mediawiki...Kartographer)

2016-03-04 Thread Yurik (Code Review)

Yurik has uploaded a new change for review.

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

Change subject: Fix optional map handling
..

Fix optional map handling

Change-Id: I81c080150f311f760ea725dfc53d2a873bc85033
---
M modules/kartographer.js
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer 
refs/changes/61/275061/1

diff --git a/modules/kartographer.js b/modules/kartographer.js
index 1d3f6eb..82405af 100644
--- a/modules/kartographer.js
+++ b/modules/kartographer.js
@@ -183,7 +183,9 @@
.openWindow( mapDialog, data )
.then( function ( opened ) { return opened; } )
.then( function ( closing ) {
-   map.setView( mapDialog.map.getCenter(), 
mapDialog.map.getZoom() );
+   if ( map ) {
+   map.setView( 
mapDialog.map.getCenter(), mapDialog.map.getZoom() );
+   }
return closing;
} );
} );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I81c080150f311f760ea725dfc53d2a873bc85033
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Yurik 

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

[MediaWiki-commits] [Gerrit] Add fundraising/REL.* to ^.php53.$ instead - change (integration/config)

2016-03-04 Thread Paladox (Code Review)

Paladox has uploaded a new change for review.

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

Change subject: Add fundraising/REL.* to ^.*php53.*$ instead
..

Add fundraising/REL.* to ^.*php53.*$ instead

This is so all php55 tests wont run on the fundraising REL1_25 branch.

Change-Id: I80491b7aeb47f6456af471c5f3e39949331b5254
---
M zuul/layout.yaml
1 file changed, 1 insertion(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/60/275060/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 742556a..521d65d 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -664,7 +664,7 @@
 branch: (?!REL1_23|REL1_24|fundraising/REL.*)
 
   - name: ^.*php55.*$
-branch: (?!REL1_2[3-6]$)
+branch: (?!REL1_2[3-6]$|fundraising/REL.*)
 
   - name: ^.*php53.*$
 skip-if:
@@ -678,10 +678,6 @@
   # Extensions tested together, since 1.25alpha ...
   - name: ^mediawiki-extensions-(qunit|hhvm|php53)$
 branch: (?!REL1_23|REL1_24|fundraising/REL.*)
-queue-name: mediawiki
-
-  - name: ^mediawiki-extensions-php55$
-branch: (?!REL1_23|REL1_24|REL1_25|REL1_26|fundraising/REL.*)
 queue-name: mediawiki
 
   # ... older branches get the legacy job

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

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

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

[MediaWiki-commits] [Gerrit] Remove DELETE_SOURCE flag from FileRepo store()/storeBatch() - change (mediawiki/core)

2016-03-04 Thread Aaron Schulz (Code Review)

Aaron Schulz has uploaded a new change for review.

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

Change subject: Remove DELETE_SOURCE flag from FileRepo store()/storeBatch()
..

Remove DELETE_SOURCE flag from FileRepo store()/storeBatch()

The flag is unused and adds needless complexity to already complex code.

Change-Id: I82371288730f19d408daddd1251520d34b079205
---
M includes/filerepo/FileRepo.php
1 file changed, 1 insertion(+), 13 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/59/275059/1

diff --git a/includes/filerepo/FileRepo.php b/includes/filerepo/FileRepo.php
index 789803f..6183f80 100644
--- a/includes/filerepo/FileRepo.php
+++ b/includes/filerepo/FileRepo.php
@@ -815,7 +815,6 @@
 * @param string $dstZone Destination zone
 * @param string $dstRel Destination relative path
 * @param int $flags Bitwise combination of the following flags:
-*   self::DELETE_SOURCE Delete the source file after upload
 *   self::OVERWRITE Overwrite an existing destination file 
instead of failing
 *   self::OVERWRITE_SAMEOverwrite the file if the destination 
exists and has the
 *   same contents as the source
@@ -838,7 +837,6 @@
 *
 * @param array $triplets (src, dest zone, dest rel) triplets as per 
store()
 * @param int $flags Bitwise combination of the following flags:
-*   self::DELETE_SOURCE Delete the source file after upload
 *   self::OVERWRITE Overwrite an existing destination file 
instead of failing
 *   self::OVERWRITE_SAMEOverwrite the file if the destination 
exists and has the
 *   same contents as the source
@@ -853,7 +851,6 @@
$backend = $this->backend; // convenience
 
$operations = [];
-   $sourceFSFilesToDelete = []; // cleanup for disk source files
// Validate each triplet and get the store operation...
foreach ( $triplets as $triplet ) {
list( $srcPath, $dstZone, $dstRel ) = $triplet;
@@ -881,12 +878,9 @@
 
// Get the appropriate file operation
if ( FileBackend::isStoragePath( $srcPath ) ) {
-   $opName = ( $flags & self::DELETE_SOURCE ) ? 
'move' : 'copy';
+   $opName = 'copy';
} else {
$opName = 'store';
-   if ( $flags & self::DELETE_SOURCE ) {
-   $sourceFSFilesToDelete[] = $srcPath;
-   }
}
$operations[] = [
'op' => $opName,
@@ -903,12 +897,6 @@
$opts['nonLocking'] = true;
}
$status->merge( $backend->doOperations( $operations, $opts ) );
-   // Cleanup for disk source files...
-   foreach ( $sourceFSFilesToDelete as $file ) {
-   MediaWiki\suppressWarnings();
-   unlink( $file ); // FS cleanup
-   MediaWiki\restoreWarnings();
-   }
 
return $status;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I82371288730f19d408daddd1251520d34b079205
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz 

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

[MediaWiki-commits] [Gerrit] Enable reference storage on beta cluster - change (operations/mediawiki-config)

2016-03-04 Thread Jdlrobson (Code Review)

Jdlrobson has uploaded a new change for review.

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

Change subject: Enable reference storage on beta cluster
..

Enable reference storage on beta cluster

Change-Id: I6b1830bc2f0607a98c269afa0a44a5a260b9925f
---
M wmf-config/InitialiseSettings-labs.php
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/InitialiseSettings-labs.php 
b/wmf-config/InitialiseSettings-labs.php
index 750812a..178f3b1 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -106,6 +106,14 @@
'default' => ''
),
 
+   'wgCiteStoreReferencesData' => array(
+   'default' => true,
+   ),
+
+   'wgCiteCacheRawReferencesOnParse' => array(
+   'default' => true,
+   ),
+
'-wgUploadDirectory' => array(
'default'  => '/data/project/upload7/$site/$lang',
'private'  => '/data/project/upload7/private/$lang',

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

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

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

[MediaWiki-commits] [Gerrit] Run some pre-checks to ensure import won't blow up - change (wikimedia...relevancylab)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Run some pre-checks to ensure import won't blow up
..


Run some pre-checks to ensure import won't blow up

We can end up running out of disk space while downloading the dump,
check ahead of time that there is enough space to complete the
operation.

Additionally if the proper indices havn't been created in elasticsearch
we can also fail, so check that up front too.

Change-Id: Ie775b2c05187ced334092e68a9bc9fc2ec969d91
---
M importindices.py
1 file changed, 55 insertions(+), 7 deletions(-)

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



diff --git a/importindices.py b/importindices.py
index 957c4c5..757e478 100755
--- a/importindices.py
+++ b/importindices.py
@@ -25,6 +25,7 @@
 import argparse
 import datetime
 import os
+import subprocess
 import sys
 import tempfile
 import urllib2
@@ -52,6 +53,31 @@
 urllib2.urlopen(request)
 
 
+def get_content_length(url):
+request = urllib2.Request(url)
+request.get_method = lambda: 'HEAD'
+res = urllib2.urlopen(request)
+return int(res.info().get('Content-Length'))
+
+
+def get_available_disk_space(path):
+df = subprocess.Popen(["df", "-B1", path], stdout=subprocess.PIPE)
+output = df.communicate()[0]
+return int(output.split("\n")[1].split()[3])
+
+
+def check_disk_space(disk_needed, path):
+disk_available = get_available_disk_space(path)
+if disk_needed > disk_available:
+raise RuntimeError("Not enough disk space. %d required but only %d 
available." %
+   (disk_needed, disk_available))
+
+
+def build_dump_url(wiki, date, type):
+return 
'http://dumps.wikimedia.your.org/other/cirrussearch/%s/%s-%s-cirrussearch-%s.json.gz'
 % \
+(date, wiki, date, type)
+
+
 def main():
 parser = argparse.ArgumentParser(description='import wikimedia 
elasticsearch dumps',
  prog=sys.argv[0])
@@ -61,24 +87,46 @@
 help='type of index to import, either content or 
general')
 parser.add_argument('--date', dest='date', default=last_dump(),
 help='date to load dump from')
-parser.add_argument('--temp-dir', dest='temp_dir', default=None,
+parser.add_argument('--temp-dir', dest='temp_dir', default='/tmp',
 help='directory to download index into')
 parser.add_argument('wikis', nargs='+', help='list of wikis to import')
 args = parser.parse_args()
 
+# Run some pre-checks that the import won't fail
 for wiki in args.wikis:
-src_url = \
-
'http://dumps.wikimedia.org/other/cirrussearch/%s/%s-%s-cirrussearch-%s.json.gz'
 % \
-(args.date, wiki, args.date, args.type)
+src_url = build_dump_url(wiki, args.date, args.type)
+dump_size = get_content_length(src_url)
+check_disk_space(dump_size, args.temp_dir)
+check_index_exists(args.dest, wiki, args.type)
+
+completed = []
+failed = []
+for wiki in args.wikis:
+src_url = build_dump_url(wiki, args.date, args.type)
+dump_size = get_content_length(src_url)
+try:
+check_disk_space(dump_size, args.temp_dir)
+except RuntimeError as e:
+# can't do this wiki, but keep trying the rest
+print('Cannot download for %s, skipping: %s' % (wiki, e))
+failed.append(wiki)
+continue
+
 fd, temp_path = tempfile.mkstemp(dir=args.temp_dir)
 print("Downloading ", src_url, " to ", temp_path)
-os.system("curl -o %s %s" % (temp_path, src_url))
-check_index_exists(args.dest, wiki, args.type)
+subprocess.Popen("curl -o %s %s" % (temp_path, src_url), 
shell=True).wait()
 dest_url = "http://%s:9200/%s_%s/_bulk; % (args.dest, wiki, args.type)
 cmd = 'curl -s %s --data-binary @- > /dev/null' % (dest_url)
-os.system("pv %s | zcat | parallel --pipe -L 100 -j3 '%s'" % 
(temp_path, cmd))
+subprocess.Popen("pv %s | zcat | parallel --pipe -L 100 -j3 '%s'" %
+ (temp_path, cmd), shell=True).wait()
 os.close(fd)
 os.remove(temp_path)
+completed.append(wiki)
+
+if len(completed) > 0:
+print("Imported %d wikis: %s" % (len(completed), ', '.join(completed)))
+if len(failed) > 0:
+print("Not enough disk space to import %d wikis: %s" % (len(failed), 
', '.join(failed)))
 
 if __name__ == "__main__":
 main()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie775b2c05187ced334092e68a9bc9fc2ec969d91
Gerrit-PatchSet: 5
Gerrit-Project: wikimedia/discovery/relevancylab
Gerrit-Branch: master
Gerrit-Owner: EBernhardson 
Gerrit-Reviewer: EBernhardson

[MediaWiki-commits] [Gerrit] SpecialUserlogin: Update main RequestContext in addition to ... - change (mediawiki/core)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: SpecialUserlogin: Update main RequestContext in addition to 
globals
..


SpecialUserlogin: Update main RequestContext in addition to globals

Change-Id: I835bb77938f7e02c862563ea38341cf5840aa367
---
M includes/specials/SpecialUserlogin.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/includes/specials/SpecialUserlogin.php 
b/includes/specials/SpecialUserlogin.php
index 90a6314..6b61ef9 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1089,6 +1089,7 @@
$code = $request->getVal( 'uselang', 
$user->getOption( 'language' ) );
$userLang = Language::factory( $code );
$wgLang = $userLang;
+   RequestContext::getMain()->setLanguage( 
$userLang );
$this->getContext()->setLanguage( 
$userLang );
// Reset SessionID on Successful login 
(bug 40995)
$this->renewSessionId();

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I835bb77938f7e02c862563ea38341cf5840aa367
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Florianschmidtwelzow 
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] Drop NetSpeed cookie and associated preference - change (mediawiki...MobileFrontend)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Drop NetSpeed cookie and associated preference
..


Drop NetSpeed cookie and associated preference

Since we decided to strip 'srcset' unconditionally, the NetSpeed cookie and its
associated preference are now redundant. So, remove them.

Change-Id: I7f74cb014a9d4587badddfc715ce906f4518a9a2
---
M i18n/en.json
M i18n/qqq.json
M includes/MobileContext.php
M includes/MobileFrontend.hooks.php
M includes/specials/SpecialMobileOptions.php
M tests/phpunit/MobileContextTest.php
6 files changed, 2 insertions(+), 92 deletions(-)

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



diff --git a/i18n/en.json b/i18n/en.json
index 28eb382..07a06ae 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -284,7 +284,6 @@
"mobile-frontend-search-submit": "Go",
"mobile-frontend-settings-images-explain": "Load all image content that 
appears in a page.",
"mobile-frontend-settings-beta": "Beta",
-   "mobile-frontend-settings-lowres": "Data saving",
"mobile-frontend-settings-site-description": "{{SITENAME}} is available 
in $1 {{PLURAL:$1|language|languages}}. All available versions are listed 
below",
"mobile-frontend-settings-site-header": "{{SITENAME}} Languages",
"mobile-frontend-sign-in-error-heading": "Whoops",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index c372ecc..46480b0 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -282,7 +282,6 @@
"mobile-frontend-search-submit": "Label for the button near the search 
box.\n{{Identical|Go}}",
"mobile-frontend-settings-images-explain": "Short description on 
[[Special:MobileOptions]], that the user can enable or disable images with this 
option.",
"mobile-frontend-settings-beta": "Text for beta on settings 
page.\n{{Identical|Beta}}",
-   "mobile-frontend-settings-lowres": "Text for data saving option on 
settings page. \"Saving\" means \"economy\", as in \"saving money (on data 
connection)\", not \"saving files\".",
"mobile-frontend-settings-site-description": "Shown on 
[[Special:MobileOptions]]. Parameters:\n* $1 - the number of other language 
versions for this wiki",
"mobile-frontend-settings-site-header": "Heading for the 
Special:MobileOptions/Language page - only visible to non JavaScript users",
"mobile-frontend-sign-in-error-heading": "Heading for when an error 
occurred. You can translate \"Error\" instead.",
diff --git a/includes/MobileContext.php b/includes/MobileContext.php
index 8c5a372..d972cd3 100644
--- a/includes/MobileContext.php
+++ b/includes/MobileContext.php
@@ -10,9 +10,6 @@
const USEFORMAT_COOKIE_NAME = 'mf_useformat';
const USER_MODE_PREFERENCE_NAME = 'mfMode';
 
-   const NETSPEED_FAST = 'A';
-   const NETSPEED_SLOW = 'B';
-
/**
 * Saves the testing mode user has opted in: 'beta' or 'stable'
 * @var string $mobileMode
@@ -23,11 +20,6 @@
 * @var boolean $disableImages
 */
protected $disableImages;
-   /**
-* NetSpeed designation
-* @var string $netSpeed
-*/
-   protected $netSpeed;
/**
 * Save explicitly requested format
 * @var string $useFormat
@@ -178,34 +170,6 @@
}
 
return $this->disableImages;
-   }
-
-   /**
-* Get NetSpeed designation.
-* @return string MobileContext::NETSPEED_FAST or 
MobileContext::NETSPEED_SLOW.
-*/
-   public function getNetSpeed() {
-   if ( is_null( $this->netSpeed ) ) {
-   $this->netSpeed = $this->getRequest()->getCookie( 
'NetSpeed', '' );
-   if ( $this->netSpeed !== self::NETSPEED_FAST && 
$this->netSpeed !== self::NETSPEED_SLOW ) {
-   // Since we are currently delivering the 
richest experience
-   // to all users, make the default netSpeed 
'fast'.
-   $this->netSpeed = self::NETSPEED_FAST;
-   }
-   }
-
-   return $this->netSpeed;
-   }
-
-   /**
-* Set NetSpeed designation.
-* @param string $value of net speed. Currently accepts 
self::NETSPEED_FAST
-*  or self::NETSPEED_SLOW
-*/
-   public function setNetSpeed( $value ) {
-   $this->netSpeed = $value;
-   $this->getRequest()->response()
-   ->setCookie( 'NetSpeed', $this->netSpeed, 0, array( 
'prefix' => '' ) );
}
 
/**
diff --git a/includes/MobileFrontend.hooks.php 
b/includes/MobileFrontend.hooks.php
index dc733d6..f866ad0 100644
--- a/includes/MobileFrontend.hooks.php
+++ b/includes/MobileFrontend.hooks.php
@@ -350,10 +350,6 @@
return;
}
 
-   if ( $context->getNetSpeed()

[MediaWiki-commits] [Gerrit] Blacklist mediawiki-extensions-php55 test on branch fundrais... - change (integration/config)

2016-03-04 Thread jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged.

Change subject: Blacklist mediawiki-extensions-php55 test on branch 
fundraising/REL
..


Blacklist mediawiki-extensions-php55 test on branch fundraising/REL

Bug: T128883
Change-Id: I384618faf4f0f636feee5c51203521e9d0167146
---
M zuul/layout.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8b49684..742556a 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -680,6 +680,10 @@
 branch: (?!REL1_23|REL1_24|fundraising/REL.*)
 queue-name: mediawiki
 
+  - name: ^mediawiki-extensions-php55$
+branch: (?!REL1_23|REL1_24|REL1_25|REL1_26|fundraising/REL.*)
+queue-name: mediawiki
+
   # ... older branches get the legacy job
   - name: ^mwext-AbuseFilter-testextension-php53$
 branch: (REL1_23|REL1_24|fundraising/REL.*)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I384618faf4f0f636feee5c51203521e9d0167146
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Paladox 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: JanZerebecki 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Add oozie-ste.xml configuration to handle SLAs - change (operations...cdh)

2016-03-04 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Add oozie-ste.xml configuration to handle SLAs
..


Add oozie-ste.xml configuration to handle SLAs

In order to use SLAs in oozie, oozie-site.xml must have
SLAs services setup.

Change-Id: I47f0418ec6df0cd0aec2a9453e0cda82a1dd7ee7
---
M templates/oozie/oozie-site.xml.erb
1 file changed, 16 insertions(+), 1 deletion(-)

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



diff --git a/templates/oozie/oozie-site.xml.erb 
b/templates/oozie/oozie-site.xml.erb
index c0c05c1..b5d087b 100644
--- a/templates/oozie/oozie-site.xml.erb
+++ b/templates/oozie/oozie-site.xml.erb
@@ -262,6 +262,21 @@
 
 
 
+oozie.services.ext
+
+org.apache.oozie.service.EventHandlerService,
+org.apache.oozie.sla.service.SLAService
+
+
+
+oozie.service.EventHandlerService.event.listeners
+
+org.apache.oozie.sla.listener.SLAJobEventListener,
+org.apache.oozie.sla.listener.SLAEmailEventListener
+
+
+
+
 use.system.libpath.for.mapreduce.and.pig.jobs
 false
 
@@ -456,4 +471,4 @@
 
 <% end # if @smtp_host -%>
 
-
\ No newline at end of file
+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I47f0418ec6df0cd0aec2a9453e0cda82a1dd7ee7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet/cdh
Gerrit-Branch: master
Gerrit-Owner: Joal 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Improve pageview & projectview oozie error emails - change (analytics/refinery)

2016-03-04 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Improve pageview & projectview oozie error emails
..


Improve pageview & projectview oozie error emails

Add error information in existing pageview & projectview/geo error emails.
Add error emails in projectview/hourly.
Correct projectview/geo archive to use .gz filtering.

Change-Id: I710d3c5cc53359e77803994d534eb63427a48183
---
M oozie/pageview/hourly/workflow.xml
M oozie/projectview/geo/coordinator.xml
M oozie/projectview/geo/workflow.xml
M oozie/projectview/hourly/coordinator.properties
M oozie/projectview/hourly/coordinator.xml
M oozie/projectview/hourly/workflow.xml
6 files changed, 73 insertions(+), 10 deletions(-)

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



diff --git a/oozie/pageview/hourly/workflow.xml 
b/oozie/pageview/hourly/workflow.xml
index ece5b4a..c2e68d8 100644
--- a/oozie/pageview/hourly/workflow.xml
+++ b/oozie/pageview/hourly/workflow.xml
@@ -333,17 +333,21 @@
 
 
 
-parent_name
-${wf:name()}
-
-
 subject
 Unexpected values in pageview for workflow - 
${wf:name()}
+
+
+body
+Values were found in pageview that were not in the 
whitelist.
+
+Please have a look and take necessary action !
+Thanks :)
+-- Oozie
 
 
 
 
-
+
 
 
 
@@ -355,6 +359,18 @@
 parent_name
 ${wf:name()}
 
+
+parent_failed_action
+${wf:lastErrorNode()}
+
+
+parent_error_code
+${wf:errorCode(wf:lastErrorNode())}
+
+
+parent_error_message
+${wf:errorMessage(wf:lastErrorNode())}
+
 
 
 
diff --git a/oozie/projectview/geo/coordinator.xml 
b/oozie/projectview/geo/coordinator.xml
index d1178a1..59815b7 100644
--- a/oozie/projectview/geo/coordinator.xml
+++ b/oozie/projectview/geo/coordinator.xml
@@ -31,6 +31,7 @@
 
 mark_directory_done_workflow_file
 archive_job_output_workflow_file
+send_error_email_workflow_file
 
 
 
diff --git a/oozie/projectview/geo/workflow.xml 
b/oozie/projectview/geo/workflow.xml
index 418ca54..482e677 100644
--- a/oozie/projectview/geo/workflow.xml
+++ b/oozie/projectview/geo/workflow.xml
@@ -149,7 +149,7 @@
 
 
 expected_filename_ending
-EMPTY
+.gz
 
 
 archive_file
@@ -170,6 +170,18 @@
 parent_name
 ${wf:name()}
 
+
+parent_failed_action
+${wf:lastErrorNode()}
+
+
+parent_error_code
+${wf:errorCode(wf:lastErrorNode())}
+
+
+parent_error_message
+${wf:errorMessage(wf:lastErrorNode())}
+
 
 
 
diff --git a/oozie/projectview/hourly/coordinator.properties 
b/oozie/projectview/hourly/coordinator.properties
index c598270..e605464 100644
--- a/oozie/projectview/hourly/coordinator.properties
+++ b/oozie/projectview/hourly/coordinator.properties
@@ -48,6 +48,8 @@
 mark_directory_done_workflow_file = 
${oozie_directory}/util/mark_directory_done/workflow.xml
 # HDFS path to workflow to archive output.
 archive_job_output_workflow_file  = 
${oozie_directory}/util/archive_job_output/workflow.xml
+# Workflow to send an error email
+send_error_email_workflow_file= 
${oozie_directory}/util/send_error_email/workflow.xml
 
 # HDFS path to hive-site.xml file.  This is needed to run hive actions.
 hive_site_xml = ${oozie_directory}/util/hive/hive-site.xml
diff --git a/oozie/projectview/hourly/coordinator.xml 
b/oozie/projectview/hourly/coordinator.xml
index c95dc4e..da8281c 100644
--- a/oozie/projectview/hourly/coordinator.xml
+++ b/oozie/projectview/hourly/coordinator.xml
@@ -33,6 +33,7 @@
 
 mark_directory_done_workflow_file
 archive_job_output_workflow_file
+send_error_email_workflow_file
 
 
 
diff --git a/oozie/projectview/hourly/workflow.xml 
b/oozie/projectview/hourly/workflow.xml
index 15eadd6..a9d8a3e 100644
--- a/oozie/projectview/hourly/workflow.xml
+++ b/oozie/projectview/hourly/workflow.xml
@@ -101,6 +101,10 @@
 archive_job_output_workflow_file
 Workflow to move a data file to the 
archive
 
+
+

[MediaWiki-commits] [Gerrit] Improve webrequest oozie jobs emails - change (analytics/refinery)

2016-03-04 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Improve webrequest oozie jobs emails
..


Improve webrequest oozie jobs emails

Send more information in error emails in load job.
Add error email sending (with more info) in refine and legacy_tsvs jobs.
Clean coordinator files from non needed parameters passing.

Change-Id: Iecf741552b8eee315b63d0860e8ea8c39e72c723
---
M oozie/webrequest/legacy_tsvs/bundle.properties
M oozie/webrequest/legacy_tsvs/bundle.xml
M oozie/webrequest/legacy_tsvs/coordinator_misc.xml
M oozie/webrequest/legacy_tsvs/coordinator_misc_text.xml
M oozie/webrequest/legacy_tsvs/coordinator_text.xml
M oozie/webrequest/legacy_tsvs/coordinator_text_upload.xml
M oozie/webrequest/legacy_tsvs/coordinator_upload.xml
M oozie/webrequest/legacy_tsvs/workflow.xml
M oozie/webrequest/load/workflow.xml
M oozie/webrequest/refine/bundle.properties
M oozie/webrequest/refine/bundle.xml
M oozie/webrequest/refine/coordinator.xml
M oozie/webrequest/refine/workflow.xml
13 files changed, 87 insertions(+), 231 deletions(-)

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



diff --git a/oozie/webrequest/legacy_tsvs/bundle.properties 
b/oozie/webrequest/legacy_tsvs/bundle.properties
index 50269ae..21600bf 100644
--- a/oozie/webrequest/legacy_tsvs/bundle.properties
+++ b/oozie/webrequest/legacy_tsvs/bundle.properties
@@ -56,6 +56,9 @@
 
 archive_job_output_workflow_file   = 
${oozie_directory}/util/archive_job_output/workflow.xml
 
+# Workflow to send an error email
+send_error_email_workflow_file = 
${oozie_directory}/util/send_error_email/workflow.xml
+
 # HDFS path to hive-site.xml file.  This is needed to run hive actions.
 hive_site_xml  = 
${oozie_directory}/util/hive/hive-site.xml
 
diff --git a/oozie/webrequest/legacy_tsvs/bundle.xml 
b/oozie/webrequest/legacy_tsvs/bundle.xml
index 654bfde..86eba3d 100644
--- a/oozie/webrequest/legacy_tsvs/bundle.xml
+++ b/oozie/webrequest/legacy_tsvs/bundle.xml
@@ -25,6 +25,7 @@
 temporary_directory
 webrequest_archive_directory
 archive_job_output_workflow_file
+send_error_email_workflow_file
 
 
 
diff --git a/oozie/webrequest/legacy_tsvs/coordinator_misc.xml 
b/oozie/webrequest/legacy_tsvs/coordinator_misc.xml
index f202c5d..2373fd1 100644
--- a/oozie/webrequest/legacy_tsvs/coordinator_misc.xml
+++ b/oozie/webrequest/legacy_tsvs/coordinator_misc.xml
@@ -25,6 +25,7 @@
 temporary_directory
 aspect_tsv_archive_directory
 archive_job_output_workflow_file
+send_error_email_workflow_file
 aspect_name
 
 
@@ -78,24 +79,6 @@
 
 ${workflow_file}
 
-
-
-
name_node${name_node}
-
job_tracker${job_tracker}
-
queue_name${queue_name}
-
-
-hive_site_xml
-${hive_site_xml}
-
-
-artifacts_directory
-${artifacts_directory}
-
-
-webrequest_table
-${webrequest_table}
-
 
 year
 ${coord:formatTime(coord:nominalTime(), 
"")}
@@ -107,26 +90,6 @@
 
 day
 ${coord:formatTime(coord:nominalTime(), 
"dd")}
-
-
-mark_directory_done_workflow_file
-${mark_directory_done_workflow_file}
-
-
-temporary_directory
-${temporary_directory}
-
-
-aspect_name
-${aspect_name}
-
-
-aspect_tsv_archive_directory
-${aspect_tsv_archive_directory}
-
-
-archive_job_output_workflow_file
-${archive_job_output_workflow_file}
 
 
 
diff --git a/oozie/webrequest/legacy_tsvs/coordinator_misc_text.xml 
b/oozie/webrequest/legacy_tsvs/coordinator_misc_text.xml
index 6803d89..2b66460 100644
--- a/oozie/webrequest/legacy_tsvs/coordinator_misc_text.xml
+++ b/oozie/webrequest/legacy_tsvs/coordinator_misc_text.xml
@@ -25,6 +25,7 @@
 temporary_directory
 aspect_tsv_archive_directory
 archive_job_output_workflow_file
+send_error_email_workflow_file
 aspect_name
 
 
@@ -84,24 +85,6 @@
 
 ${workflow_file}
 
-
-
-
name_node${name_node}
-
job_tracker${job_tracker}
-
queue_name${queue_name}
-
-
-hive_site_xml
-

[MediaWiki-commits] [Gerrit] Improve pagecounts oozie error emails - change (analytics/refinery)

2016-03-04 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Improve pagecounts oozie error emails
..


Improve pagecounts oozie error emails

Add error emails in pagecounts load and archive.
Clean coordinator from not needeed parameters passing.

Change-Id: I2ee9c96c7fe28174fd21f10598382aa8b2283e29
---
M oozie/pagecounts-all-sites/archive/bundle.properties
M oozie/pagecounts-all-sites/archive/bundle.xml
M oozie/pagecounts-all-sites/archive/coordinator.xml
M oozie/pagecounts-all-sites/archive/workflow.xml
M oozie/pagecounts-all-sites/load/coordinator.properties
M oozie/pagecounts-all-sites/load/coordinator.xml
M oozie/pagecounts-all-sites/load/workflow.xml
7 files changed, 73 insertions(+), 46 deletions(-)

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



diff --git a/oozie/pagecounts-all-sites/archive/bundle.properties 
b/oozie/pagecounts-all-sites/archive/bundle.properties
index d27c924..4f874b6 100644
--- a/oozie/pagecounts-all-sites/archive/bundle.properties
+++ b/oozie/pagecounts-all-sites/archive/bundle.properties
@@ -37,6 +37,9 @@
 
 archive_job_output_workflow_file   = 
${oozie_directory}/util/archive_job_output/workflow.xml
 
+# Workflow to send an error email
+send_error_email_workflow_file = 
${oozie_directory}/util/send_error_email/workflow.xml
+
 # HDFS path to hive-site.xml file.  This is needed to run hive actions.
 hive_site_xml  = 
${oozie_directory}/util/hive/hive-site.xml
 
diff --git a/oozie/pagecounts-all-sites/archive/bundle.xml 
b/oozie/pagecounts-all-sites/archive/bundle.xml
index d5e8110..1c0c874 100644
--- a/oozie/pagecounts-all-sites/archive/bundle.xml
+++ b/oozie/pagecounts-all-sites/archive/bundle.xml
@@ -17,6 +17,7 @@
 mark_directory_done_workflow_file
 temporary_directory
 
pagecounts_all_sites_archive_directory
+send_error_email_workflow_file
 pagecounts_raw_archive_directory
 archive_job_output_workflow_file
 
diff --git a/oozie/pagecounts-all-sites/archive/coordinator.xml 
b/oozie/pagecounts-all-sites/archive/coordinator.xml
index 8aae958..5e52c95 100644
--- a/oozie/pagecounts-all-sites/archive/coordinator.xml
+++ b/oozie/pagecounts-all-sites/archive/coordinator.xml
@@ -30,6 +30,7 @@
 workflow_file
 pagecounts_all_sites_table
 mark_directory_done_workflow_file
+send_error_email_workflow_file
 temporary_directory
 output_directory
 archive_job_output_workflow_file
@@ -75,21 +76,6 @@
 
 ${workflow_file}
 
-
-
-
dataset_name${dataset_name}
-
name_node${name_node}
-
job_tracker${job_tracker}
-
queue_name${queue_name}
-
-
-hive_site_xml
-${hive_site_xml}
-
-
-pagecounts_all_sites_table
-${pagecounts_all_sites_table}
-
 
 year
 ${coord:formatTime(coord:nominalTime(), 
"y")}
@@ -121,34 +107,6 @@
 
 hour_plus_1_hour
 
${coord:formatTime(coord:dateOffset(coord:nominalTime(), 1, "HOUR"), 
"HH")}
-
-
-mark_directory_done_workflow_file
-${mark_directory_done_workflow_file}
-
-
-temporary_directory
-${temporary_directory}
-
-
-output_directory
-${output_directory}
-
-
-archive_job_output_workflow_file
-${archive_job_output_workflow_file}
-
-
-aspect_name
-${aspect_name}
-
-
-aspect_compression_ending
-${aspect_compression_ending}
-
-
-extra_filter
-${extra_filter}
 
 
 
diff --git a/oozie/pagecounts-all-sites/archive/workflow.xml 
b/oozie/pagecounts-all-sites/archive/workflow.xml
index 93d2115..28b19ef 100644
--- a/oozie/pagecounts-all-sites/archive/workflow.xml
+++ b/oozie/pagecounts-all-sites/archive/workflow.xml
@@ -90,6 +90,10 @@
 Workflow to move a data file to the 
archive
 
 
+send_error_email_workflow_file
+Workflow for sending an email
+
+
 aspect_name
 Aspect to cover. Either "pagecounts" or 
"projectcounts".
 
@@ -129,7 +133,7 @@
 extra_filter=${extra_filter eq 'none' ? '' : concat(' AND 
', extra_filter)}
 
 
-
+

[MediaWiki-commits] [Gerrit] Improve aqs, browser & restbase oozie error emails - change (analytics/refinery)

2016-03-04 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Improve aqs, browser & restbase oozie error emails
..


Improve aqs, browser & restbase oozie error emails

Add error information in existing aqs error emails.
Add error emails in browser & restbase jobs.

Change-Id: I4a1ab5c9ad04a7ad1dc7819f5660fc80919d03d6
---
M oozie/aqs/hourly/coordinator.xml
M oozie/aqs/hourly/workflow.xml
M oozie/browser/general/coordinator.properties
M oozie/browser/general/coordinator.xml
M oozie/browser/general/workflow.xml
M oozie/restbase/coordinator.properties
M oozie/restbase/coordinator.xml
M oozie/restbase/workflow.xml
8 files changed, 89 insertions(+), 0 deletions(-)

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



diff --git a/oozie/aqs/hourly/coordinator.xml b/oozie/aqs/hourly/coordinator.xml
index ddc8dda..675a2c3 100644
--- a/oozie/aqs/hourly/coordinator.xml
+++ b/oozie/aqs/hourly/coordinator.xml
@@ -30,6 +30,7 @@
 aqs_hourly_table
 
 mark_directory_done_workflow_file
+send_error_email_workflow_file
 
 
 
diff --git a/oozie/aqs/hourly/workflow.xml b/oozie/aqs/hourly/workflow.xml
index 5baf79b..6702277 100644
--- a/oozie/aqs/hourly/workflow.xml
+++ b/oozie/aqs/hourly/workflow.xml
@@ -62,6 +62,10 @@
 Workflow for marking a directory done
 
 
+send_error_email_workflow_file
+Workflow for sending an email
+
+
 aqs_hourly_dataset_directory
 Pageview directory to generate the done flag 
in
 
@@ -130,6 +134,18 @@
 parent_name
 ${wf:name()}
 
+
+parent_failed_action
+${wf:lastErrorNode()}
+
+
+parent_error_code
+${wf:errorCode(wf:lastErrorNode())}
+
+
+parent_error_message
+${wf:errorMessage(wf:lastErrorNode())}
+
 
 
 
diff --git a/oozie/browser/general/coordinator.properties 
b/oozie/browser/general/coordinator.properties
index 98a43f0..2ae466b 100644
--- a/oozie/browser/general/coordinator.properties
+++ b/oozie/browser/general/coordinator.properties
@@ -49,6 +49,9 @@
 # HDFS path to hive-site.xml file. This is needed to run hive actions.
 hive_site_xml = ${oozie_directory}/util/hive/hive-site.xml
 
+# Workflow to send an error email
+send_error_email_workflow_file= 
${oozie_directory}/util/send_error_email/workflow.xml
+
 # Fully qualified Hive table name for projectviews.
 projectview_source= wmf.projectview_hourly
 
diff --git a/oozie/browser/general/coordinator.xml 
b/oozie/browser/general/coordinator.xml
index a5eca09..4707200 100644
--- a/oozie/browser/general/coordinator.xml
+++ b/oozie/browser/general/coordinator.xml
@@ -33,6 +33,8 @@
 os_major_unknown
 browser_family_unknown
 browser_major_unknown
+
+send_error_email_workflow_file
 
 
 
diff --git a/oozie/browser/general/workflow.xml 
b/oozie/browser/general/workflow.xml
index 4ec3f04..e5d535c 100644
--- a/oozie/browser/general/workflow.xml
+++ b/oozie/browser/general/workflow.xml
@@ -77,6 +77,10 @@
 browser_major_unknown
 Default unknown value for browser major.
 
+
+send_error_email_workflow_file
+Workflow for sending an email
+
 
 
 
@@ -122,6 +126,33 @@
 
 
 
+
+
+
+
+
+${send_error_email_workflow_file}
+
+
+
+parent_name
+${wf:name()}
+
+
+parent_failed_action
+${wf:lastErrorNode()}
+
+
+parent_error_code
+${wf:errorCode(wf:lastErrorNode())}
+
+
+parent_error_message
+${wf:errorMessage(wf:lastErrorNode())}
+
+
+
+
 
 
 
diff --git a/oozie/restbase/coordinator.properties 
b/oozie/restbase/coordinator.properties
index 7f297df..6c4bc1f 100644
--- a/oozie/restbase/coordinator.properties
+++ b/oozie/restbase/coordinator.properties
@@ -56,6 +56,9 @@
 graphite_host = graphite-in.eqiad.wmnet
 graphite_port = 2003
 
+# Workflow to send an error email
+send_error_email_workflow_file= 
${oozie_directory}/util/send_error_email/workflow.xml
+
 # Coordinator to start.
 oozie.coord.application.path  = ${coordinator_file}
 oozie.use.system.libpath  = true
diff --git a/oozie/restbase/coordinator.xml b/oozie/restbase/coordinator.xml
index

[MediaWiki-commits] [Gerrit] Improve last_access_uniques oozie error emails - change (analytics/refinery)

2016-03-04 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Improve last_access_uniques oozie error emails
..


Improve last_access_uniques oozie error emails

Add error information to existing emails
for last_access_uniques daily and monthly.

Change-Id: Ic7534309ccd7d1a4f98949069fc16005982952f3
---
M oozie/last_access_uniques/daily/workflow.xml
M oozie/last_access_uniques/monthly/workflow.xml
2 files changed, 16 insertions(+), 0 deletions(-)

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



diff --git a/oozie/last_access_uniques/daily/workflow.xml 
b/oozie/last_access_uniques/daily/workflow.xml
index d875f18..4137165 100644
--- a/oozie/last_access_uniques/daily/workflow.xml
+++ b/oozie/last_access_uniques/daily/workflow.xml
@@ -120,6 +120,14 @@
 parent_failed_action
 ${wf:lastErrorNode()}
 
+
+parent_error_code
+${wf:errorCode(wf:lastErrorNode())}
+
+
+parent_error_message
+${wf:errorMessage(wf:lastErrorNode())}
+
 
 
 
diff --git a/oozie/last_access_uniques/monthly/workflow.xml 
b/oozie/last_access_uniques/monthly/workflow.xml
index af141cc..3beeb3e 100644
--- a/oozie/last_access_uniques/monthly/workflow.xml
+++ b/oozie/last_access_uniques/monthly/workflow.xml
@@ -115,6 +115,14 @@
 parent_failed_action
 ${wf:lastErrorNode()}
 
+
+parent_error_code
+${wf:errorCode(wf:lastErrorNode())}
+
+
+parent_error_message
+${wf:errorMessage(wf:lastErrorNode())}
+
 
 
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic7534309ccd7d1a4f98949069fc16005982952f3
Gerrit-PatchSet: 2
Gerrit-Project: analytics/refinery
Gerrit-Branch: master
Gerrit-Owner: Joal 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Madhuvishy 
Gerrit-Reviewer: Nuria 
Gerrit-Reviewer: Ottomata 

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

[MediaWiki-commits] [Gerrit] Add error emails to cassandra loading oozie jobs - change (analytics/refinery)

2016-03-04 Thread Ottomata (Code Review)

Ottomata has submitted this change and it was merged.

Change subject: Add error emails to cassandra loading oozie jobs
..


Add error emails to cassandra loading oozie jobs

Add error emails to cassandra hourly, daily & monthly loading jobs.

Change-Id: I6be444e1b9d069cacfb3fc58d26660051c2b1608
---
M oozie/cassandra/bundle.properties
M oozie/cassandra/bundle.xml
M oozie/cassandra/coord_per_article_daily.properties
M oozie/cassandra/coord_per_project_daily.properties
M oozie/cassandra/coord_per_project_hourly.properties
M oozie/cassandra/coord_per_project_monthly.properties
M oozie/cassandra/coord_top_articles_daily.properties
M oozie/cassandra/coord_top_articles_monthly.properties
M oozie/cassandra/daily/coordinator.xml
M oozie/cassandra/daily/workflow.xml
M oozie/cassandra/hourly/coordinator.xml
M oozie/cassandra/hourly/workflow.xml
M oozie/cassandra/monthly/coordinator.xml
M oozie/cassandra/monthly/workflow.xml
14 files changed, 119 insertions(+), 6 deletions(-)

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



diff --git a/oozie/cassandra/bundle.properties 
b/oozie/cassandra/bundle.properties
index f644c23..2210aee 100644
--- a/oozie/cassandra/bundle.properties
+++ b/oozie/cassandra/bundle.properties
@@ -39,6 +39,8 @@
 workflow_file_daily   = 
${oozie_directory}/cassandra/daily/workflow.xml
 workflow_file_monthly = 
${oozie_directory}/cassandra/monthly/workflow.xml
 
+# Workflow to send an error email
+send_error_email_workflow_file= 
${oozie_directory}/util/send_error_email/workflow.xml
 
 # HDFS path to datasets definitions
 pageview_datasets_file= ${oozie_directory}/pageview/datasets.xml
diff --git a/oozie/cassandra/bundle.xml b/oozie/cassandra/bundle.xml
index 928791f..9c4bd83 100644
--- a/oozie/cassandra/bundle.xml
+++ b/oozie/cassandra/bundle.xml
@@ -17,6 +17,8 @@
 workflow_file_daily
 workflow_file_monthly
 
+send_error_email_workflow_file
+
 start_time
 stop_time
 
diff --git a/oozie/cassandra/coord_per_article_daily.properties 
b/oozie/cassandra/coord_per_article_daily.properties
index 9d64104..ce49c70 100644
--- a/oozie/cassandra/coord_per_article_daily.properties
+++ b/oozie/cassandra/coord_per_article_daily.properties
@@ -39,6 +39,8 @@
 workflow_file_daily   = 
${oozie_directory}/cassandra/daily/workflow.xml
 workflow_file_monthly = 
${oozie_directory}/cassandra/monthly/workflow.xml
 
+# Workflow to send an error email
+send_error_email_workflow_file= 
${oozie_directory}/util/send_error_email/workflow.xml
 
 # HDFS path to datasets definitions
 pageview_datasets_file= ${oozie_directory}/pageview/datasets.xml
diff --git a/oozie/cassandra/coord_per_project_daily.properties 
b/oozie/cassandra/coord_per_project_daily.properties
index 76818e4..8726a5a 100644
--- a/oozie/cassandra/coord_per_project_daily.properties
+++ b/oozie/cassandra/coord_per_project_daily.properties
@@ -39,6 +39,8 @@
 workflow_file_daily   = 
${oozie_directory}/cassandra/daily/workflow.xml
 workflow_file_monthly = 
${oozie_directory}/cassandra/monthly/workflow.xml
 
+# Workflow to send an error email
+send_error_email_workflow_file= 
${oozie_directory}/util/send_error_email/workflow.xml
 
 # HDFS path to datasets definitions
 pageview_datasets_file= ${oozie_directory}/pageview/datasets.xml
diff --git a/oozie/cassandra/coord_per_project_hourly.properties 
b/oozie/cassandra/coord_per_project_hourly.properties
index d2d338f..f250d95 100644
--- a/oozie/cassandra/coord_per_project_hourly.properties
+++ b/oozie/cassandra/coord_per_project_hourly.properties
@@ -39,6 +39,8 @@
 workflow_file_daily   = 
${oozie_directory}/cassandra/daily/workflow.xml
 workflow_file_monthly = 
${oozie_directory}/cassandra/monthly/workflow.xml
 
+# Workflow to send an error email
+send_error_email_workflow_file= 
${oozie_directory}/util/send_error_email/workflow.xml
 
 # HDFS path to datasets definitions
 pageview_datasets_file= ${oozie_directory}/pageview/datasets.xml
diff --git a/oozie/cassandra/coord_per_project_monthly.properties 
b/oozie/cassandra/coord_per_project_monthly.properties
index 36c449a..7faf4d9 100644
--- a/oozie/cassandra/coord_per_project_monthly.properties
+++ b/oozie/cassandra/coord_per_project_monthly.properties
@@ -39,6 +39,8 @@
 workflow_file_daily   = 
${oozie_directory}/cassandra/daily/workflow.xml
 workflow_file_monthly = 
${oozie_directory}/cassandra/monthly/workflow.xml
 
+# Workflow to send an error email
+send_error_email_workflow_file= 
${oozie_directory}/util/send_error_email/workflow.xml
 
 # HDFS path to datasets definitions
 pageview_datasets_file= ${oozie_directory}/pageview/datasets.xml
diff --git a/oozie/cassandra/coord_top_articles_daily.properties

1 2 3 4 >

1 - 100 of 371 matches

Mail list logo