diff --git a/src/main/webapp/barData.json b/src/main/webapp/barData.json new file mode 100644 index 000000000..aa5ce465a --- /dev/null +++ b/src/main/webapp/barData.json @@ -0,0 +1,23 @@ +[ + { + "key" : "Cumulative Return", + "values" : [ + { + "label" : "<= 1000ms", + "value" : 220 + }, + { + "label" : "<= 3000ms", + "value" : 110 + }, + { + "label" : "<= 5000ms", + "value" : 50 + }, + { + "label" : "> 5000ms" , + "value" : 30 + } + ] + } +] \ No newline at end of file diff --git a/src/main/webapp/common/js/pinpoint/chart-bar.js b/src/main/webapp/common/js/pinpoint/chart-bar.js new file mode 100644 index 000000000..3e8108109 --- /dev/null +++ b/src/main/webapp/common/js/pinpoint/chart-bar.js @@ -0,0 +1,23 @@ +function showLinkHistogramSum() { + $("#linkInfoBarChart").show(); + + d3.json('/barData.json', function(data) { + nv.addGraph(function() { + var chart = nv.models.discreteBarChart().x(function(d) { + return d.label + }).y(function(d) { + return d.value + }).staggerLabels(true).tooltips(false).showValues(true) + + d3.select('#linkInfoBarChart svg') + .datum(data) + .transition() + .duration(500) + .call(chart); + + nv.utils.windowResize(chart.update); + + return chart; + }); + }); +} \ No newline at end of file diff --git a/src/main/webapp/common/js/pinpoint/chart-servermap.js b/src/main/webapp/common/js/pinpoint/chart-servermap.js index 836f77653..93a6708fa 100644 --- a/src/main/webapp/common/js/pinpoint/chart-servermap.js +++ b/src/main/webapp/common/js/pinpoint/chart-servermap.js @@ -424,5 +424,6 @@ var linkClickHandler = function(e, query, data, containerId) { data.query = query; $('#linkInfoDetails').empty(); $('#linkInfoDetails').append($('#LinkInfoBox').tmpl(data)); - showLinkHistogram(); + showLinkHistogramDetailed(); + showLinkHistogramSum(); } \ No newline at end of file diff --git a/src/main/webapp/common/js/pinpoint/chart-stacked.js b/src/main/webapp/common/js/pinpoint/chart-stacked.js index a2d257924..497eba8d2 100644 --- a/src/main/webapp/common/js/pinpoint/chart-stacked.js +++ b/src/main/webapp/common/js/pinpoint/chart-stacked.js @@ -1,5 +1,5 @@ -function showLinkHistogram() { +function showLinkHistogramDetailed() { $("#linkInfoChart").show(); d3.json('/stackedTestData.json', function(data) { diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html index 5fd66d5ec..0410d167a 100644 --- a/src/main/webapp/index.html +++ b/src/main/webapp/index.html @@ -47,10 +47,11 @@ - + + @@ -119,7 +120,6 @@