openstack
/
fuel-stats
Code Issues Proposed changes

Merge "Fast ui fixes - temporarily removed number of installations - fixed number of env"

This commit is contained in:
Jenkins 2014-11-12 18:12:36 +00:00 committed by Gerrit Code Review
parent 00f5c82788 a2619713da
commit 3a2f16b5ba
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
analytics/static/index.html
View File

@ -65,7 +65,7 @@
<div class="row"> <div class="row">
<div class="col-xs-6 col-md-3"> <div class="col-xs-6 col-md-3">
<div class="header"> <div class="header">
<p><div class="title">Number of installations: <b><span id="installations-count"></span></b></div></p> <!-- <p><div class="title">Number of installations: <b><span id="installations-count"></span></b></div></p> -->
<p><div class="title">Total number of environments: <b><span id="environments-count"></span></b></div></p> <p><div class="title">Total number of environments: <b><span id="environments-count"></span></b></div></p>
</div> </div>
</div> </div>
@ -103,7 +103,7 @@
<!-- Start Item Content --> <!-- Start Item Content -->
<div class="content"> <div class="content">
<div class="image"><div id="nodes-distribution"><svg style="height: 280px;"></svg></div></div> <div class="image"><div id="nodes-distribution"><svg style="height: 280px;"></svg></div></div>
<div class="description">Number of environments: <span class="numberOfCountedEnvironments"></span> <div class="description">Number of environments: <span id="count-nodes-distribution"></span>
</div> </div>
</div> </div>
<!-- End Item Content --> <!-- End Item Content -->
@ -123,7 +123,7 @@
<!-- Start Item Content --> <!-- Start Item Content -->
<div class="content"> <div class="content">
<div class="image"><div id="releases-distribution"></div></div> <div class="image"><div id="releases-distribution"></div></div>
<div class="description">Number of environments: <span class="numberOfCountedEnvironments"></span> <div class="description">Number of environments: <span id="count-releases-distribution"></span>
</div> </div>
</div> </div>
<!-- End Item Content --> <!-- End Item Content -->
@ -143,7 +143,7 @@
<!-- Start Item Content --> <!-- Start Item Content -->
<div class="content"> <div class="content">
<div class="image"><div id="distribution-of-oses"></div></div> <div class="image"><div id="distribution-of-oses"></div></div>
<div class="description">Number of environments: <span class="numberOfCountedEnvironments"></span> <div class="description">Number of environments: <span id="count-distribution-of-oses"></span>
</div> </div>
</div> </div>
<!-- End Item Content --> <!-- End Item Content -->

11
analytics/static/js/app.js
View File

@ -32,7 +32,7 @@ function(jquery, d3, d3pie, d3tip, nv, elasticsearch) {
}; };
var statsPage = function() { var statsPage = function() {
installationsCount(); //installationsCount();
environmentsCount(); environmentsCount();
nodesDistributionChart(); nodesDistributionChart();
virtualizationDistributionChart(); virtualizationDistributionChart();
@ -74,7 +74,7 @@ function(jquery, d3, d3pie, d3tip, nv, elasticsearch) {
}).then(function (resp) { }).then(function (resp) {
var rawData = resp.aggregations.clusters.statuses.buckets, var rawData = resp.aggregations.clusters.statuses.buckets,
total = resp.aggregations.clusters.doc_count, total = resp.aggregations.clusters.doc_count,
chartData = [];; chartData = [];
$.each(rawData, function(key, value) { $.each(rawData, function(key, value) {
if (value.key == 'operational' || value.key == 'error') numberOfCountedEnvironments += value.doc_count; if (value.key == 'operational' || value.key == 'error') numberOfCountedEnvironments += value.doc_count;
@ -163,8 +163,9 @@ function(jquery, d3, d3pie, d3tip, nv, elasticsearch) {
} }
}).then(function (resp) { }).then(function (resp) {
var rawData = resp.aggregations.clusters.statuses.structure.nodes_ranges.buckets, var rawData = resp.aggregations.clusters.statuses.structure.nodes_ranges.buckets,
total = resp.aggregations.clusters.statuses.structure.doc_count,
chartData = []; chartData = [];
$('#count-nodes-distribution').html(total);
$.each(rawData, function(key, value) { $.each(rawData, function(key, value) {
var labelText = '', var labelText = '',
labelData = value.key.split("-"); labelData = value.key.split("-");
@ -400,7 +401,9 @@ function(jquery, d3, d3pie, d3tip, nv, elasticsearch) {
} }
}).then(function (resp) { }).then(function (resp) {
var rawData = resp.aggregations.clusters.statuses.attributes.libvirt_types.buckets, var rawData = resp.aggregations.clusters.statuses.attributes.libvirt_types.buckets,
total = resp.aggregations.clusters.statuses.attributes.doc_count,
chartData = []; chartData = [];
$('#count-releases-distribution').html(total);
$.each(rawData, function(key, value) { $.each(rawData, function(key, value) {
chartData.push({label: value.key, value: value.doc_count}) chartData.push({label: value.key, value: value.doc_count})
}); });
@ -519,7 +522,9 @@ function(jquery, d3, d3pie, d3tip, nv, elasticsearch) {
} }
}).then(function (resp) { }).then(function (resp) {
var rawData = resp.aggregations.clusters.statuses.release.oses.buckets, var rawData = resp.aggregations.clusters.statuses.release.oses.buckets,
total = resp.aggregations.clusters.statuses.doc_count,
chartData = []; chartData = [];
$('#count-distribution-of-oses').html(total);
$.each(rawData, function(key, value) { $.each(rawData, function(key, value) {
chartData.push({label: value.key, value: value.doc_count}) chartData.push({label: value.key, value: value.doc_count})
}); });

1
analytics/static/js/main.js
View File

@ -1,5 +1,6 @@
requirejs.config({ requirejs.config({
baseUrl: "js", baseUrl: "js",
urlArgs: '_=' + (new Date()).getTime(),
paths: { paths: {
jquery: 'jquery-2.1.1.min', jquery: 'jquery-2.1.1.min',
elasticsearch: 'elasticsearch.min', elasticsearch: 'elasticsearch.min',