Merge pull request #3 from victorcoder/etcd-2.1

Etcd 2.1
distribworks · Aug 3, 2015 · e7f9576 · e7f9576
2 parents 23efb2c + 72900bb
commit e7f9576
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/bin/etcd b/bin/etcd
diff --git a/bin/serf b/bin/serf
diff --git a/dcron/dashboard.go b/dcron/dashboard.go
@@ -27,7 +27,11 @@ func (a *AgentCommand) dashboardIndexHandler(w http.ResponseWriter, r *http.Requ
 	if err != nil {
 		log.Error(err)
 	}
-	version := res.Body
+	var version struct {
+		Etcdserver  string `json:etcdserver`
+		Etcdcluster string `json:etcdcluster`
+	}
+	json.Unmarshal(res.Body, &version)
 
 	var ss *EtcdServerStats
 	rr = etcdc.NewRawRequest("GET", "stats/self", nil, nil)
@@ -42,7 +46,7 @@ func (a *AgentCommand) dashboardIndexHandler(w http.ResponseWriter, r *http.Requ
 		Stats     *EtcdServerStats
 		StartTime string
 	}{
-		Version:   string(version),
+		Version:   version.Etcdserver,
 		Stats:     ss,
 		StartTime: ss.LeaderInfo.StartTime.Format("2/Jan/2006 15:05:05"),
 	}

diff --git a/static/js/dashboard.js b/static/js/dashboard.js
@@ -19,7 +19,7 @@ dcron.controller('JobListCtrl', function ($scope, $http, $interval) {
     });
 
     response.error(function(data, status, headers, config) {
-      alert("Error getting data");
+      $('#message').html('<div class="alert alert-danger fade in"><button type="button" class="close close-alert" data-dismiss="alert" aria-hidden="true">x</button>Error getting data</div>');
     });
   }, 2000);
 
@@ -97,7 +97,8 @@ dcron.controller('IndexCtrl', function ($scope, $http, $interval, $element) {
     });
 
     response.error(function(data, status, headers, config) {
-      alert("Error getting data");
+      $('#message').html('<div class="alert alert-danger fade in"><button type="button" class="close close-alert" data-dismiss="alert" aria-hidden="true">x</button>Error getting data</div>');
+
     });
   }, 2000);