opendev/system-config
Code Issues Proposed changes

Add jquery-graphite to zuul status page.

Browse Source 
So we can add graphs in a readable form.

Change-Id: I8208e7f5e5ebe1b3432aaf2cd18dc0071f4882ea
Reviewed-on: https://review.openstack.org/18667
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2012-12-26 14:59:27 -08:00 committed by Jenkins
parent c82040917a
commit 99296b2d56
3 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
modules/openstack_project/files/zuul/status.html
View File

@ -44,6 +44,7 @@
<script type="text/javascript" src="jquery.min.js"></script>
<script type="text/javascript" src="jquery-visibility.min.js"></script>
<script type="text/javascript" src="jquery-graphite.js"></script>
<script type="text/javascript" src="status.js"></script>
@ -109,9 +110,25 @@
<div id="pipeline-container">
</div>
<div class="container">
<div class="container" id="graph-container">
<h2> Job Stats </h2>
<img class="graphite" src="http://graphite.openstack.org/render/?width=310&height=170&_salt=1356393274.997&graphOnly=false&title=Ready%20Devstack%20Jenkins%20Nodes&hideGrid=false&vtitle=&bgcolor=FFFFFF&fgcolor=000000&target=alias(sumSeries(stats.gauges.devstack.pool.*.oneiric.ready)%2C%22Oneiric%22)&target=alias(sumSeries(stats.gauges.devstack.pool.*.precise.ready)%2C%22Precise%22)"/>
<script type="text/javascript">
$.fn.graphite.defaults.url = "http://graphite.openstack.org/render/";
$("#graph-container").append($(new Image()).addClass('graph').graphite({
from: "-24hours",
width: 310,
height: 170,
bgcolor: 'ffffff',
fgcolor: '000000',
target: [
"alias(sumSeries(stats.gauges.devstack.pool.*.oneiric.ready), 'Oneiric')",
"alias(sumSeries(stats.gauges.devstack.pool.*.precise.ready), 'Precise')"
],
title: "Ready Devstack Jenkins Nodes"
}));
</script>
</div>
<div class="container">

2
modules/openstack_project/files/zuul/status.js
View File

@ -131,7 +131,7 @@ function update() {
}
function update_graphs() {
$('.graphite').each(function(i, img) {
$('.graph').each(function(i, img) {
var newimg = new Image()
var parts = img.src.split('#');
newimg.src = parts[0] + '#' + new Date().getTime();

13
modules/openstack_project/manifests/zuul.pp
View File

@ -104,4 +104,17 @@ class openstack_project::zuul(
target => '/opt/jquery-visibility/jquery-visibility.min.js',
require => File['/var/lib/zuul/www'],
}
vcsrepo { '/opt/jquery-graphite':
ensure => latest,
provider => git,
revision => 'master',
source => 'https://github.com/prestontimmons/graphitejs.git',
}
file { '/var/lib/zuul/www/jquery.graphite.js':
ensure => link,
target => '/opt/jquery-visibility/jquery-graphite.js',
require => File['/var/lib/zuul/www'],
}
}