From 6a49d4ed6bda95fa8337001cdf1f7ed82d70019a Mon Sep 17 00:00:00 2001
From: bergquist <carl.bergquist@gmail.com>
Date: Fri, 3 Jun 2016 15:24:53 +0200
Subject: [PATCH] feat(alerting): remove orgid from alertrule query

---
 pkg/models/alerts.go                       |  4 ++++
 pkg/services/alerting/alert_rule_reader.go | 10 ++++------
 pkg/services/sqlstore/alert_rule.go        | 12 ++++++++++++
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkg/models/alerts.go b/pkg/models/alerts.go
index 7f674d67ac0..d0252285a11 100644
--- a/pkg/models/alerts.go
+++ b/pkg/models/alerts.go
@@ -89,6 +89,10 @@ type GetAlertsQuery struct {
 	Result []AlertRule
 }
 
+type GetAllAlertsQuery struct {
+	Result []AlertRule
+}
+
 type GetAlertsForExecutionQuery struct {
 	Timestamp int64
 
diff --git a/pkg/services/alerting/alert_rule_reader.go b/pkg/services/alerting/alert_rule_reader.go
index ccc81e1c3de..797fe3fa796 100644
--- a/pkg/services/alerting/alert_rule_reader.go
+++ b/pkg/services/alerting/alert_rule_reader.go
@@ -21,10 +21,10 @@ type AlertRuleReader struct {
 }
 
 func NewRuleReader() *AlertRuleReader {
-	rrr := &AlertRuleReader{}
+	ruleReader := &AlertRuleReader{}
 
-	go rrr.initReader()
-	return rrr
+	go ruleReader.initReader()
+	return ruleReader
 }
 
 var (
@@ -52,9 +52,7 @@ func (arr *AlertRuleReader) updateRules() {
 	arr.Lock()
 	defer arr.Unlock()
 
-	cmd := &m.GetAlertsQuery{
-		OrgId: 1,
-	}
+	cmd := &m.GetAllAlertsQuery{}
 	err := bus.Dispatch(cmd)
 
 	if err == nil {
diff --git a/pkg/services/sqlstore/alert_rule.go b/pkg/services/sqlstore/alert_rule.go
index 6674d2ec410..486635e96fc 100644
--- a/pkg/services/sqlstore/alert_rule.go
+++ b/pkg/services/sqlstore/alert_rule.go
@@ -16,6 +16,7 @@ func init() {
 	bus.AddHandler("sql", HandleAlertsQuery)
 	bus.AddHandler("sql", GetAlertById)
 	bus.AddHandler("sql", DeleteAlertById)
+	bus.AddHandler("sql", GetAllAlertQueryHandler)
 }
 
 func GetAlertById(query *m.GetAlertByIdQuery) error {
@@ -32,6 +33,17 @@ func GetAlertById(query *m.GetAlertByIdQuery) error {
 	return nil
 }
 
+func GetAllAlertQueryHandler(query *m.GetAllAlertsQuery) error {
+	var alerts []m.AlertRule
+	err := x.Sql("select * from alert_rule").Find(&alerts)
+	if err != nil {
+		return err
+	}
+
+	query.Result = alerts
+	return nil
+}
+
 func DeleteAlertById(cmd *m.DeleteAlertCommand) error {
 	return inTransaction(func(sess *xorm.Session) error {
 		if _, err := sess.Exec("DELETE FROM alert_rule WHERE id = ?", cmd.AlertId); err != nil {