opendev/system-config
Code Issues Proposed changes

Merge "switch over to os-loganalyze on logs.o.o"

Browse Source
This commit is contained in:
Jenkins 2013-10-14 20:04:31 +00:00 committed by Gerrit Code Review
commit 2ec6207a31
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/openstack_project/manifests/static.pp
View File

@ -106,6 +106,22 @@ class openstack_project::static (
require => File['/srv/static/logs'], require => File['/srv/static/logs'],
} }
vcsrepo { '/opt/os-loganalyze':
ensure => latest,
provider => git,
revision => 'master',
source => 'https://git.openstack.org/openstack-infra/os-loganalyze',
}
exec { 'install_os-loganalyze':
command => 'python setup.py install',
cwd => '/opt/os-loganalyze',
path => '/bin:/usr/bin',
refreshonly => true,
subscribe => Vcsrepo['/opt/os-loganalyze'],
}
# NOTE(sdague): soon to be deprecated
file { '/usr/local/bin/htmlify-screen-log.py': file { '/usr/local/bin/htmlify-screen-log.py':
ensure => present, ensure => present,
owner => 'root', owner => 'root',

5
modules/openstack_project/templates/logs-dev.vhost.erb
View File

@ -58,9 +58,10 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
</Directory> </Directory>
RewriteEngine On RewriteEngine On
# rewrite all txt.gz files to map to our internal htmlify wsgi app # rewrite all txt.gz & html.gz files to map to our internal htmlify wsgi app
RewriteRule ^/(.*\.txt\.gz)$ /htmlify/$1 [QSA,L,PT] RewriteRule ^/(.*\.txt\.gz)$ /htmlify/$1 [QSA,L,PT]
WSGIScriptAlias /htmlify /usr/local/bin/htmlify-screen-log.py RewriteRule ^/(.*\.html\.gz)$ /htmlify/$1 [QSA,L,PT]
WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py
ErrorLog /var/log/apache2/<%= name %>_error.log ErrorLog /var/log/apache2/<%= name %>_error.log
LogLevel warn LogLevel warn

5
modules/openstack_project/templates/logs.vhost.erb
View File

@ -58,9 +58,10 @@ NameVirtualHost <%= vhost_name %>:<%= port %>
</Directory> </Directory>
RewriteEngine On RewriteEngine On
# rewrite all txt.gz files to map to our internal htmlify wsgi app # rewrite all txt.gz & html.gz files to map to our internal htmlify wsgi app
RewriteRule ^/(.*\.txt\.gz)$ /htmlify/$1 [QSA,L,PT] RewriteRule ^/(.*\.txt\.gz)$ /htmlify/$1 [QSA,L,PT]
WSGIScriptAlias /htmlify /usr/local/bin/htmlify-screen-log.py RewriteRule ^/(.*\.html\.gz)$ /htmlify/$1 [QSA,L,PT]
WSGIScriptAlias /htmlify /usr/local/lib/python2.7/dist-packages/os_loganalyze/wsgi.py
ErrorLog /var/log/apache2/<%= name %>_error.log ErrorLog /var/log/apache2/<%= name %>_error.log
LogLevel warn LogLevel warn