Merge branch 'master' of github.com:grafana/grafana

torkelo · torkelo · commit 164de5e3cef8 · 2016-12-19T16:36:26.000+01:00
diff --git a/pkg/services/alerting/reader.go b/pkg/services/alerting/reader.go
@@ -64,21 +64,6 @@ func (arr *DefaultRuleReader) Fetch() []*Rule {
 }
 
 func (arr *DefaultRuleReader) heartbeat() {
-
-	//Lets cheat on this until we focus on clustering
-	//log.Info("Heartbeat: Sending heartbeat from " + this.serverId)
 	arr.clusterSize = 1
 	arr.serverPosition = 1
-
-	/*
-		cmd := &m.HeartBeatCommand{ServerId: this.serverId}
-		err := bus.Dispatch(cmd)
-
-		if err != nil {
-			log.Error(1, "Failed to send heartbeat.")
-		} else {
-			this.clusterSize = cmd.Result.ClusterSize
-			this.serverPosition = cmd.Result.UptimePosition
-		}
-	*/
 }
diff --git a/pkg/services/alerting/reader_test.go b/pkg/services/alerting/reader_test.go
diff --git a/pkg/services/alerting/rule_test.go b/pkg/services/alerting/rule_test.go
@@ -88,11 +88,6 @@ func TestAlertRuleModel(t *testing.T) {
 			Convey("Can read notifications", func() {
 				So(len(alertRule.Notifications), ShouldEqual, 2)
 			})
-			/*
-				Convey("Can read noDataMode", func() {
-					So(len(alertRule.NoDataMode), ShouldEqual, m.AlertStateCritical)
-				})
-			*/
 		})
 	})
 }
