feat(alerting): remove orgid from alertrule query

pkg/models/alerts.go

@@ -89,6 +89,10 @@ type GetAlertsQuery struct {
 	Result []AlertRule
 }
 
+type GetAllAlertsQuery struct {
+	Result []AlertRule
+}
+
 type GetAlertsForExecutionQuery struct {
 	Timestamp int64
 

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 {

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 {