IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

feat(alerting): remove orgid from alertrule query

Browse Source
This commit is contained in:
bergquist 2016-06-03 15:24:53 +02:00
parent 2cf797b567
commit 6a49d4ed6b
3 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/models/alerts.go
View File

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

10
pkg/services/alerting/alert_rule_reader.go
View File

@ -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 {

12
pkg/services/sqlstore/alert_rule.go
View File

@ -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 {