Merge pull request #8 from roma/v1.1.0

v1.1.0 release
roma · Mar 30, 2015 · 6e0cd7b · 6e0cd7b
2 parents 17d254e + 7c1a741
commit 6e0cd7b
Show file tree

Hide file tree

Showing 36 changed files with 15,196 additions and 32 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -0,0 +1,20 @@
+*1.1.0 (Mar 30 2015)*
+
+* modify generate join [ooeyoshinori] d9920a2
+* Add connection glaph page [hiroaki-iwase] 7214c99
+  * connection resource pie chart
+  * connection count line chart
+* add rspec test of v1.1.0 [hiroaki-iwase] 3be7f0c
+* Improve log checking function [hiroaki-iwase] ac9cafb
+* Adjust groonga storage type [hiroaki-iwase] 6aa4a55
+* restrict cpdb and data size func to tokyocabinet storage type. [hiroaki-iwase] 7b0345b
+
+*1.0.0 (Sep 20 2014)*
+
+* v1.0.0 commit [hiroaki-iwase] 17d254e
+  * Cluster Control system
+  * Status/Configuration setting system
+  * Routing information system
+  * Gather Logs system
+  * Data Management system
+* Initial commit [Hiroaki Iwase] 016023b
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,6 +14,11 @@
 //= require jquery.tablesorter.js
 //= require jquery.tablesorter.widgets.js
 //= require jquery.tablesorter.pager.js
+//= require jquery.datetimepicker.js
+//= require raphael-min.js
+//= require g.raphael-min.js
+//= require g.pie-min.js
+//= require dygraph-combined-dev.js
 //= require bootstrap
 //= require validate
 //= require jquery.validate

diff --git a/app/assets/javascripts/cluster.js b/app/assets/javascripts/cluster.js
@@ -234,7 +234,10 @@ $(window).load(function() {
         }
 
         var params =  { 'newHost' : newHost, 'currentHost': currentHost, 'newPort' : newPort, 'currentPort': currentPort, 'configPath': configPath };
-        if (checkParams(params)) {
+        if ( !currentHost || !currentPort ) {
+            $('.join-explanation').css({"color":"#ff0000"});
+            $('.join-explanation').text("Irregular situation happened, please login again.");
+        } else if (checkParams(params)) {
             generateJoinCommand(newHost, newPort, currentHost, currentPort, configPath, repetitionOption)
         } else {
             resetResult();

diff --git a/app/assets/javascripts/common.js b/app/assets/javascripts/common.js
@@ -10,4 +10,34 @@ $(function(){
       delay: { show: 200, hide: 50 },
     });
 
+    // gathering logs for log and connection graph
+    $('#date_timepicker_start').datetimepicker({
+        format:'Y/m/d H:i',
+        onShow:function( ct ){
+            this.setOptions({
+             maxDate:$('#date_timepicker_end').val()?$('#date_timepicker_end').val():false,
+             formatDate: 'Y/m/d H:i'
+            })
+        },
+        validateOnBlur: true,
+        defaultDate: new Date(),
+        defaultTime: '00:00',
+        allowBlank: false,
+        timepicker:true
+    });
+    $('#date_timepicker_end').datetimepicker({
+        format:'Y/m/d H:i',
+        onShow:function( ct ){
+            this.setOptions({
+             minDate:$('#date_timepicker_start').val()?$('#date_timepicker_start').val():false,
+             formatDate: 'Y/m/d H:i'
+            })
+        },
+        validateOnBlur: true,
+        defaultDate: new Date(),
+        defaultTime: '23:59',
+        allowBlank: false,
+        timepicker:true
+    });
+
 });
diff --git a/app/assets/javascripts/connection.js b/app/assets/javascripts/connection.js
@@ -0,0 +1,61 @@
+$(window).load(function() {
+    if (gon.connection_count) {
+        //line chart 
+        g = new Dygraph(
+            document.getElementById("line-chart"),
+            gon.connection_count, 
+            {
+                labels: gon.connection_label,
+                labelsDiv:document.getElementById("label-position"),
+                labelsSeparateLines: true,
+                showRangeSelector: true,
+                highlightSeriesOpts: {
+                    strokeWidth: 3,
+                    strokeBorderWidth: 1,
+                    highlightCircleSize: 5
+                },
+                connectSeparatedPoints: true,
+                drawPoints: true
+            }
+        );
+
+        // pie chart
+        var r = Raphael("pie-chart","100%",480);
+        var pieData= gon.source_count;
+        var pieLegends = gon.source_label;
+        var pie = r.piechart( 320, 240, 150, pieData, { legend:pieLegends });
+        pie.hover( function(){
+            /* on mouse over */
+            this.sector.animate({scale:[1.1, 1.1, this.cx, this.cy]},50,"linear");
+            /*
+             * animate legends text and mark.
+             * - label[0] : circle next to text
+             * - label[1] : legend text
+             */
+            //this.label[0].animate({scale:[1.2,1.2]},50,"linear");
+            this.label[0].attr({"stroke-width":"1", "stroke":"red"});
+            this.label[1].attr({"font-weight":"bold","fill":"red"});
+            /* display popup */
+            //this.flag = r.g.popup(this.sector.middle.x, this.sector.middle.y, 
+            //this.label[1].node.textContent );
+
+        }, function(){
+            /* on mouse out */
+            this.sector.animate({scale:[1, 1, this.cx, this.cy]},200,"linear");
+            this.label[0].animate({scale:[1,1]},100,"linear");
+            this.label[0].attr({"stroke-width":0});
+            this.label[1].attr({"font-weight":"normal","fill":"#999999"});
+            //this.flag.animate({opacity:0},200,function(){ this.remove(); });
+        } );
+    }
+})
+
+//submit button
+$("#make-graph-button").click(function() {
+    $(".access-loader").css({"display":"inline"});
+    $(this).val("making graph...");
+    $(this).css({"background-color":"grey", "border-color":"grey"});
+    $(this).attr('disabled', true);
+    $(this).closest('form').submit(); //for chrome
+});
+