Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
N
nexpie-grafana-theme
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Registry
Registry
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kornkitt Poolsup
nexpie-grafana-theme
Commits
fb6aa0e0
Commit
fb6aa0e0
authored
Dec 15, 2016
by
bergquist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(api): adds endpoint for mass pausing alerts
ref #6589
parent
830bf5a9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
111 additions
and
33 deletions
+111
-33
pkg/api/alerting.go
+66
-2
pkg/api/alerting_test.go
+11
-0
pkg/api/api.go
+1
-0
pkg/api/dtos/alerting.go
+5
-0
pkg/models/alert.go
+2
-1
pkg/services/alerting/conditions/query.go
+4
-0
pkg/services/alerting/interfaces.go
+1
-0
pkg/services/sqlstore/alert.go
+21
-12
pkg/services/sqlstore/alert_heartbeat_test.go
+0
-18
No files found.
pkg/api/alerting.go
View file @
fb6aa0e0
...
...
@@ -259,9 +259,10 @@ func NotificationTest(c *middleware.Context, dto dtos.NotificationTestCommand) R
//POST /api/alerts/:alertId/pause
func
PauseAlert
(
c
*
middleware
.
Context
,
dto
dtos
.
PauseAlertCommand
)
Response
{
alertId
:=
c
.
ParamsInt64
(
"alertId"
)
cmd
:=
models
.
PauseAlertCommand
{
OrgId
:
c
.
OrgId
,
AlertId
:
c
.
ParamsInt64
(
"alertId"
)
,
AlertId
s
:
[]
int64
{
alertId
}
,
Paused
:
dto
.
Paused
,
}
...
...
@@ -277,10 +278,73 @@ func PauseAlert(c *middleware.Context, dto dtos.PauseAlertCommand) Response {
}
result
:=
map
[
string
]
interface
{}{
"alertId"
:
cmd
.
A
lertId
,
"alertId"
:
a
lertId
,
"state"
:
response
,
"message"
:
"alert "
+
pausedState
,
}
return
Json
(
200
,
result
)
}
func
existInSlice
(
slice
[]
int64
,
value
int64
)
bool
{
for
_
,
v
:=
range
slice
{
if
v
==
value
{
return
true
}
}
return
false
}
//POST /api/alerts/pause
func
PauseAlerts
(
c
*
middleware
.
Context
,
dto
dtos
.
PauseAlertsCommand
)
Response
{
cmd
:=
&
models
.
GetAllAlertsQuery
{}
if
err
:=
bus
.
Dispatch
(
cmd
);
err
!=
nil
{
return
ApiError
(
500
,
""
,
err
)
}
var
alertsToUpdate
[]
int64
skipFilter
:=
len
(
dto
.
DataSourceIds
)
==
0
for
_
,
alert
:=
range
cmd
.
Result
{
if
skipFilter
{
alertsToUpdate
=
append
(
alertsToUpdate
,
alert
.
Id
)
continue
}
alert
,
err
:=
alerting
.
NewRuleFromDBAlert
(
alert
)
if
err
!=
nil
{
return
ApiError
(
500
,
""
,
err
)
}
for
_
,
v
:=
range
alert
.
Conditions
{
id
,
exist
:=
v
.
GetDatsourceId
()
if
exist
&&
existInSlice
(
dto
.
DataSourceIds
,
*
id
)
{
alertsToUpdate
=
append
(
alertsToUpdate
,
alert
.
Id
)
}
}
}
updateCmd
:=
models
.
PauseAlertCommand
{
OrgId
:
c
.
OrgId
,
AlertIds
:
alertsToUpdate
,
Paused
:
dto
.
Paused
,
}
if
err
:=
bus
.
Dispatch
(
&
updateCmd
);
err
!=
nil
{
return
ApiError
(
500
,
""
,
err
)
}
var
response
models
.
AlertStateType
=
models
.
AlertStatePending
pausedState
:=
"un paused"
if
updateCmd
.
Paused
{
response
=
models
.
AlertStatePaused
pausedState
=
"paused"
}
result
:=
map
[
string
]
interface
{}{
"state"
:
response
,
"message"
:
"alert "
+
pausedState
,
"alertsAffected"
:
updateCmd
.
ResultCount
,
}
return
Json
(
200
,
result
)
}
pkg/api/alerting_test.go
0 → 100644
View file @
fb6aa0e0
package
api
import
(
"testing"
.
"github.com/smartystreets/goconvey/convey"
)
func
TestAlertingApi
(
t
*
testing
.
T
)
{
Convey
(
""
,
func
()
{})
}
pkg/api/api.go
View file @
fb6aa0e0
...
...
@@ -256,6 +256,7 @@ func Register(r *macaron.Macaron) {
r
.
Group
(
"/alerts"
,
func
()
{
r
.
Post
(
"/test"
,
bind
(
dtos
.
AlertTestCommand
{}),
wrap
(
AlertTest
))
r
.
Post
(
"/:alertId/pause"
,
bind
(
dtos
.
PauseAlertCommand
{}),
wrap
(
PauseAlert
),
reqEditorRole
)
r
.
Post
(
"/pause"
,
bind
(
dtos
.
PauseAlertsCommand
{}),
wrap
(
PauseAlerts
),
reqGrafanaAdmin
)
r
.
Get
(
"/:alertId"
,
ValidateOrgAlert
,
wrap
(
GetAlert
))
r
.
Get
(
"/"
,
wrap
(
GetAlerts
))
r
.
Get
(
"/states-for-dashboard"
,
wrap
(
GetAlertStatesForDashboard
))
...
...
pkg/api/dtos/alerting.go
View file @
fb6aa0e0
...
...
@@ -64,3 +64,8 @@ type PauseAlertCommand struct {
AlertId
int64
`json:"alertId"`
Paused
bool
`json:"paused"`
}
type
PauseAlertsCommand
struct
{
DataSourceIds
[]
int64
`json:"datasourceId"`
Paused
bool
`json:"paused"`
}
pkg/models/alert.go
View file @
fb6aa0e0
...
...
@@ -133,7 +133,8 @@ type SaveAlertsCommand struct {
type
PauseAlertCommand
struct
{
OrgId
int64
AlertId
int64
AlertIds
[]
int64
ResultCount
int64
Paused
bool
}
...
...
pkg/services/alerting/conditions/query.go
View file @
fb6aa0e0
...
...
@@ -34,6 +34,10 @@ type AlertQuery struct {
To
string
}
func
(
c
*
QueryCondition
)
GetDatsourceId
()
(
datasourceId
*
int64
,
exist
bool
)
{
return
&
c
.
Query
.
DatasourceId
,
true
}
func
(
c
*
QueryCondition
)
Eval
(
context
*
alerting
.
EvalContext
)
(
*
alerting
.
ConditionResult
,
error
)
{
timeRange
:=
tsdb
.
NewTimeRange
(
c
.
Query
.
From
,
c
.
Query
.
To
)
...
...
pkg/services/alerting/interfaces.go
View file @
fb6aa0e0
...
...
@@ -30,4 +30,5 @@ type ConditionResult struct {
type
Condition
interface
{
Eval
(
result
*
EvalContext
)
(
*
ConditionResult
,
error
)
GetDatsourceId
()
(
datasourceId
*
int64
,
exist
bool
)
}
pkg/services/sqlstore/alert.go
View file @
fb6aa0e0
...
...
@@ -5,6 +5,8 @@ import (
"fmt"
"time"
"strings"
"github.com/go-xorm/xorm"
"github.com/grafana/grafana/pkg/bus"
m
"github.com/grafana/grafana/pkg/models"
...
...
@@ -246,25 +248,32 @@ func SetAlertState(cmd *m.SetAlertStateCommand) error {
func
PauseAlertRule
(
cmd
*
m
.
PauseAlertCommand
)
error
{
return
inTransaction
(
func
(
sess
*
xorm
.
Session
)
error
{
alert
:=
m
.
Alert
{}
has
,
err
:=
x
.
Where
(
"id = ? AND org_id=?"
,
cmd
.
AlertId
,
cmd
.
OrgId
)
.
Get
(
&
alert
)
var
buffer
bytes
.
Buffer
params
:=
make
([]
interface
{},
0
)
buffer
.
WriteString
(
`UPDATE alert SET state = ?`
)
if
err
!=
nil
{
return
err
}
else
if
!
has
{
return
fmt
.
Errorf
(
"Could not find alert"
)
alertIdCount
:=
len
(
cmd
.
AlertIds
)
if
alertIdCount
==
1
{
buffer
.
WriteString
(
` WHERE id = ?`
)
}
else
if
alertIdCount
>
1
{
buffer
.
WriteString
(
` WHERE id IN (?`
+
strings
.
Repeat
(
",?"
,
len
(
cmd
.
AlertIds
)
-
1
)
+
`)`
)
}
var
newState
m
.
AlertStateType
if
cmd
.
Paused
{
newState
=
m
.
AlertStatePaused
params
=
append
(
params
,
string
(
m
.
AlertStatePaused
))
}
else
{
newState
=
m
.
AlertStatePending
params
=
append
(
params
,
string
(
m
.
AlertStatePending
))
}
alert
.
State
=
newState
sess
.
Id
(
alert
.
Id
)
.
Update
(
&
alert
)
for
_
,
v
:=
range
cmd
.
AlertIds
{
params
=
append
(
params
,
v
)
}
res
,
err
:=
sess
.
Exec
(
buffer
.
String
(),
params
...
)
if
err
!=
nil
{
return
err
}
cmd
.
ResultCount
,
_
=
res
.
RowsAffected
()
return
nil
})
}
...
...
pkg/services/sqlstore/alert_heartbeat_test.go
deleted
100644 → 0
View file @
830bf5a9
package
sqlstore
import
(
"testing"
// m "github.com/grafana/grafana/pkg/models"
.
"github.com/smartystreets/goconvey/convey"
)
func
TestAlertingHeartbeatDataAccess
(
t
*
testing
.
T
)
{
Convey
(
"Testing Alerting data access"
,
t
,
func
()
{
InitTestDB
(
t
)
//send heartbeat from server 1
//send heartbeat from server 2
})
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment