ganglia_js_charts 0.0.2 → 0.0.3

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/ganglia_js_charts.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ganglia_js_charts}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Golick"]

data/public/ganglia-js.js

@@ -6,16 +6,20 @@ Function.prototype.bind = function(object) {
 };
 
 var viewModel = {
+  graphTitle: ko.observable(""),
   timeWindow:  ko.observable("1.hour"),
+
   clusters: ko.observableArray([]),
   servers: ko.observableArray([]),
   metrics: ko.observableArray([]),
   selectedCluster: ko.observable(""),
   selectedServer: ko.observable(""),
   selectedMetric: ko.observable(""),
+
+  metricsLoading: ko.observable(false),
+
   currentGraph: ko.observableArray([]),
   savedGraphs: ko.observableArray([]),
-  graphTitle: ko.observable(""),
   savingSavedGraphs: ko.observable(false),
   selectSavedGraph: function(i) {
     var graph = this.savedGraphs()[i];
@@ -67,8 +71,12 @@ var viewModel = {
     var cluster = this.selectedCluster();
     var server  = this.selectedServer();
 
+    _.each(this.metrics(), function(m) { this.metrics.remove(m); }.bind(this));
+
+    this.metricsLoading(true);
     $.getJSON("/" + cluster + "/" + server + "/metrics.json", function(data) {
       $.each(data, function(i, e) { this.metrics.push(e); }.bind(this));
+      this.metricsLoading(false);
     }.bind(this));
   },
   addToGraph: function() {

data/public/index.html

@@ -51,7 +51,7 @@
         <div class="graphOptions">
           <p>
             ${g.name}
-            <a href="#scale_${i}" data-bind="click: function() { viewModel.scale(i); }, style: { backgroundColor: currentGraph()[i].scale ? 'red' : '' }">scale to per minute</a>
+            <a href="#scale_${i}" data-bind="click: function() { viewModel.scale(i); }, style: { backgroundColor: g.scale ? 'red' : '' }">scale to per minute</a>
             <a href="#remove_${i}" data-bind="click: function() { viewModel.remove(i); }">remove</a>
           </p>
         </div>
@@ -69,7 +69,8 @@
       </p>
       <p style="float:left; margin-right: 10px;">
         <label for="metric">Metric:</label> 
-        <select name="metric" data-bind="options: metrics, value: selectedMetric"></select>
+        <select name="metric" data-bind="options: metrics, value: selectedMetric, visible: !metricsLoading()"></select>
+        <span data-bind="visible: metricsLoading"><img src="/ajax-loader.gif" /></span>
       </p>
       <p style="float:left">
         <input type="button" value="Add to Graph" data-bind="click: addToGraph" />

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ganglia_js_charts
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - James Golick