Faidon has submitted this change and it was merged.
Change subject: Ceph: fix radosgw monitoring
......................................................................
Ceph: fix radosgw monitoring
This fixes backend monitoring to actually monitor RADOS, frontend to
monitor apache and also fixes server-status, needed for the Ganglia
plugin.
Change-Id: I774dc17ea6cf703bf7418e5691f3ab9298cbd2ff
---
M modules/ceph/manifests/radosgw.pp
M modules/ceph/templates/radosgw/vhost.erb
2 files changed, 18 insertions(+), 2 deletions(-)
Approvals:
Faidon: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ceph/manifests/radosgw.pp
b/modules/ceph/manifests/radosgw.pp
index bf3f896..05df7aa 100644
--- a/modules/ceph/manifests/radosgw.pp
+++ b/modules/ceph/manifests/radosgw.pp
@@ -57,4 +57,13 @@
require => Package['apache2'],
notify => Service['apache2'],
}
+
+ file { '/var/www/monitoring':
+ ensure => directory,
+ }
+ file { '/var/www/monitoring/frontend':
+ ensure => present,
+ content => "OK\n",
+ require => File['/var/www/monitoring'],
+ }
}
diff --git a/modules/ceph/templates/radosgw/vhost.erb
b/modules/ceph/templates/radosgw/vhost.erb
index 0944fbe..2e29db9 100644
--- a/modules/ceph/templates/radosgw/vhost.erb
+++ b/modules/ceph/templates/radosgw/vhost.erb
@@ -13,8 +13,8 @@
DocumentRoot /var/www/
RewriteEngine On
- RewriteCond %{REQUEST_URI} !^/monitoring/
- RewriteCond %{REQUEST_URI} !^/($|index.html|favicon.ico|robots.txt)
+ RewriteCond %{REQUEST_URI} !^/server-status
+ RewriteCond %{REQUEST_URI} !^/monitoring/frontend$
RewriteRule ^/(.*) /dummyradosgw.fcgi?params=$1&%{QUERY_STRING}
[E=HTTP_AUTHORIZATION:%{HTTP:Authorization},L]
<IfModule mod_fastcgi.c>
@@ -27,6 +27,13 @@
</Directory>
</IfModule>
+ <Location /server-status>
+ SetHandler server-status
+ Order deny,allow
+ Deny from all
+ Allow from 127.0.0.1
+ </Location>
+
AllowEncodedSlashes On
ErrorLog /var/log/apache2/error.log
--
To view, visit https://gerrit.wikimedia.org/r/61043
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I774dc17ea6cf703bf7418e5691f3ab9298cbd2ff
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon <[email protected]>
Gerrit-Reviewer: Faidon <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
