opendev/system-config
Code Issues Proposed changes

Merge "Add configurable graphite url on zuul status"

Browse Source
This commit is contained in:
Jenkins 2015-03-17 14:30:09 +00:00 committed by Gerrit Code Review
commit 6bc77ae41d
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/openstack_project/manifests/status.pp
View File

@ -14,6 +14,7 @@ class openstack_project::status (
$recheck_bot_nick, $recheck_bot_nick,
$status_base_url = 'http://status.openstack.org/', $status_base_url = 'http://status.openstack.org/',
$status_title = 'OpenStack', $status_title = 'OpenStack',
$graphite_render_url = 'http://graphite.openstack.org/render/',
) { ) {
class { 'openstack_project::server': class { 'openstack_project::server':
@ -161,13 +162,13 @@ class openstack_project::status (
file { '/srv/static/status/zuul/index.html': file { '/srv/static/status/zuul/index.html':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/zuul/status.html', content => template('openstack_project/zuul/status.html.erb'),
require => File['/srv/static/status/zuul'], require => File['/srv/static/status/zuul'],
} }
file { '/srv/static/status/zuul/status.js': file { '/srv/static/status/zuul/status.js':
ensure => present, ensure => present,
source => 'puppet:///modules/openstack_project/zuul/status.js', content => template('openstack_project/zuul/status.js.erb'),
require => File['/srv/static/status/zuul'], require => File['/srv/static/status/zuul'],
} }

2
modules/openstack_project/files/zuul/status.html → modules/openstack_project/templates/zuul/status.html.erb
View File

@ -300,7 +300,7 @@ progress[aria-valuenow]:before {
<h2> Job Stats </h2> <h2> Job Stats </h2>
<script type="text/javascript"> <script type="text/javascript">
$.fn.graphite.defaults.url = "http://graphite.openstack.org/render/"; $.fn.graphite.defaults.url = "<%= @graphite_render_url %>";
$("#graph-container").append($(new Image()).addClass('graph').graphite({ $("#graph-container").append($(new Image()).addClass('graph').graphite({
from: "-24hours", from: "-24hours",

2
modules/openstack_project/files/zuul/status.js → modules/openstack_project/templates/zuul/status.js.erb
View File

@ -147,7 +147,7 @@ function create_tree(pipeline) {
function get_sparkline_url(pipeline_name) { function get_sparkline_url(pipeline_name) {
if (!(pipeline_name in window.zuul_sparkline_urls)) { if (!(pipeline_name in window.zuul_sparkline_urls)) {
window.zuul_sparkline_urls[pipeline_name] = $.fn.graphite.geturl({ window.zuul_sparkline_urls[pipeline_name] = $.fn.graphite.geturl({
url: "http://graphite.openstack.org/render/", url: "<%= @graphite_render_url %>",
from: "-8hours", from: "-8hours",
width: 100, width: 100,
height: 16, height: 16,