[MediaWiki-commits] [Gerrit] operations/puppet[production]: ores: Add memory report to uwsgi

2016-08-19 Thread Alexandros Kosiaris (Code Review) 
Alexandros Kosiaris has submitted this change and it was merged.

Change subject: ores: Add memory report to uwsgi
..


ores: Add memory report to uwsgi

Bug: T143081
Change-Id: I31fa386b171ad7b6db1e897f0c4e62fabf73310e
---
M modules/ores/manifests/web.pp
1 file changed, 10 insertions(+), 9 deletions(-)

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



diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
index 729603c..8a35af3 100644
--- a/modules/ores/manifests/web.pp
+++ b/modules/ores/manifests/web.pp
@@ -25,15 +25,16 @@
 healthcheck_url => '/',
 deployment  => $deployment,
 config  => {
-'wsgi-file'  => "${ores::base::config_path}/ores_wsgi.py",
-chdir=> $ores::base::config_path,
-plugins  => 'python3,stats_pusher_statsd',
-venv => $ores::base::venv_path,
-logformat=> '[pid: %(pid)] %(addr) (%(user)) {%(vars) vars in 
%(pktsize) bytes} [%(ctime)] %(method) %(uri) => generated %(rsize) bytes in 
%(msecs) msecs (%(proto) %(status)) %(headers) headers in %(hsize) bytes 
(%(switches) switches on core %(core)) user agent "%(uagent)"',
-processes=> $processes,
-add-header   => 'Access-Control-Allow-Origin: *',
-max-requests => 200,
-stats-push   => 
"statsd:${graphite_server}:8125,ores.${::hostname}.uwsgi",
+'wsgi-file'   => "${ores::base::config_path}/ores_wsgi.py",
+chdir => $ores::base::config_path,
+plugins   => 'python3,stats_pusher_statsd',
+venv  => $ores::base::venv_path,
+logformat => '[pid: %(pid)] %(addr) (%(user)) {%(vars) vars in 
%(pktsize) bytes} [%(ctime)] %(method) %(uri) => generated %(rsize) bytes in 
%(msecs) msecs (%(proto) %(status)) %(headers) headers in %(hsize) bytes 
(%(switches) switches on core %(core)) user agent "%(uagent)"',
+processes => $processes,
+add-header=> 'Access-Control-Allow-Origin: *',
+max-requests  => 200,
+stats-push=> 
"statsd:${graphite_server}:8125,ores.${::hostname}.uwsgi",
+memory-report => true,
 }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I31fa386b171ad7b6db1e897f0c4e62fabf73310e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ladsgroup 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: ores: Add memory report to uwsgi

2016-08-18 Thread Ladsgroup (Code Review) 
Ladsgroup has uploaded a new change for review.

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

Change subject: ores: Add memory report to uwsgi
..

ores: Add memory report to uwsgi

Bug: T143081
Change-Id: I31fa386b171ad7b6db1e897f0c4e62fabf73310e
---
M modules/ores/manifests/web.pp
1 file changed, 10 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/11/305611/1

diff --git a/modules/ores/manifests/web.pp b/modules/ores/manifests/web.pp
index 729603c..8a35af3 100644
--- a/modules/ores/manifests/web.pp
+++ b/modules/ores/manifests/web.pp
@@ -25,15 +25,16 @@
 healthcheck_url => '/',
 deployment  => $deployment,
 config  => {
-'wsgi-file'  => "${ores::base::config_path}/ores_wsgi.py",
-chdir=> $ores::base::config_path,
-plugins  => 'python3,stats_pusher_statsd',
-venv => $ores::base::venv_path,
-logformat=> '[pid: %(pid)] %(addr) (%(user)) {%(vars) vars in 
%(pktsize) bytes} [%(ctime)] %(method) %(uri) => generated %(rsize) bytes in 
%(msecs) msecs (%(proto) %(status)) %(headers) headers in %(hsize) bytes 
(%(switches) switches on core %(core)) user agent "%(uagent)"',
-processes=> $processes,
-add-header   => 'Access-Control-Allow-Origin: *',
-max-requests => 200,
-stats-push   => 
"statsd:${graphite_server}:8125,ores.${::hostname}.uwsgi",
+'wsgi-file'   => "${ores::base::config_path}/ores_wsgi.py",
+chdir => $ores::base::config_path,
+plugins   => 'python3,stats_pusher_statsd',
+venv  => $ores::base::venv_path,
+logformat => '[pid: %(pid)] %(addr) (%(user)) {%(vars) vars in 
%(pktsize) bytes} [%(ctime)] %(method) %(uri) => generated %(rsize) bytes in 
%(msecs) msecs (%(proto) %(status)) %(headers) headers in %(hsize) bytes 
(%(switches) switches on core %(core)) user agent "%(uagent)"',
+processes => $processes,
+add-header=> 'Access-Control-Allow-Origin: *',
+max-requests  => 200,
+stats-push=> 
"statsd:${graphite_server}:8125,ores.${::hostname}.uwsgi",
+memory-report => true,
 }
 }
 

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

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

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