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
4c26c55f
Commit
4c26c55f
authored
Oct 14, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix(api): minor change to how pause alert was done
parent
46bab0bb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
pkg/api/api.go
+1
-1
pkg/services/sqlstore/alert.go
+3
-1
No files found.
pkg/api/api.go
View file @
4c26c55f
...
...
@@ -252,7 +252,7 @@ func Register(r *macaron.Macaron) {
r
.
Group
(
"/alerts"
,
func
()
{
r
.
Post
(
"/test"
,
bind
(
dtos
.
AlertTestCommand
{}),
wrap
(
AlertTest
))
r
.
Post
(
"/:alertId/pause"
,
ValidateOrgAlert
,
bind
(
dtos
.
PauseAlertCommand
{}),
wrap
(
PauseAlert
))
r
.
Post
(
"/:alertId/pause"
,
bind
(
dtos
.
PauseAlertCommand
{}),
wrap
(
PauseAlert
))
r
.
Get
(
"/:alertId"
,
ValidateOrgAlert
,
wrap
(
GetAlert
))
r
.
Get
(
"/"
,
wrap
(
GetAlerts
))
r
.
Get
(
"/states-for-dashboard"
,
wrap
(
GetAlertStatesForDashboard
))
...
...
pkg/services/sqlstore/alert.go
View file @
4c26c55f
...
...
@@ -248,7 +248,9 @@ func PauseAlertRule(cmd *m.PauseAlertCommand) error {
return
inTransaction
(
func
(
sess
*
xorm
.
Session
)
error
{
alert
:=
m
.
Alert
{}
if
has
,
err
:=
sess
.
Id
(
cmd
.
AlertId
)
.
Get
(
&
alert
);
err
!=
nil
{
has
,
err
:=
x
.
Where
(
"id = ? AND org_id=?"
,
cmd
.
AlertId
,
cmd
.
OrgId
)
.
Get
(
&
alert
)
if
err
!=
nil
{
return
err
}
else
if
!
has
{
return
fmt
.
Errorf
(
"Could not find alert"
)
...
...
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