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
65ce01fb
Commit
65ce01fb
authored
Aug 16, 2016
by
Torkel Ödegaard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(alerting): fixing failing typescript build
parent
fe9d591b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
67 deletions
+13
-67
packaging/release_process.md
+13
-0
public/app/features/alerting/alert_log_ctrl.ts
+0
-37
public/app/features/alerting/all.ts
+0
-1
public/app/features/alerting/partials/alert_log.html
+0
-29
No files found.
packaging/release_process.md
0 → 100644
View file @
65ce01fb
# New Grafana Release Processes
## Building release packages
1) Update package.json so that it has the right version.
2) Packages from master a built automatically by circle CI for this repo
[
grafana/grafana-packer
](
https://github.com/grafana/grafana-packer
)
### Non master branch
When building from non master branch create a new branch in repo
[
grafana/grafana-packer
](
https://github.com/grafana/grafana-packer
)
and configure circle.yml to deploy that branch as well, https://github.com/grafana/grafana-packer/blob/master/circle.yml#L25
public/app/features/alerting/alert_log_ctrl.ts
deleted
100644 → 0
View file @
fe9d591b
///<reference path="../../headers/common.d.ts" />
import
angular
from
'angular'
;
import
_
from
'lodash'
;
import
coreModule
from
'../../core/core_module'
;
import
config
from
'app/core/config'
;
import
alertDef
from
'./alert_def'
;
import
moment
from
'moment'
;
export
class
AlertLogCtrl
{
alertLogs
:
any
;
alert
:
any
;
/** @ngInject */
constructor
(
private
$route
,
private
backendSrv
)
{
if
(
$route
.
current
.
params
.
alertId
)
{
this
.
loadAlertLogs
(
$route
.
current
.
params
.
alertId
);
}
}
loadAlertLogs
(
alertId
:
number
)
{
this
.
backendSrv
.
get
(
`/api/alerts/
${
alertId
}
/states`
).
then
(
result
=>
{
this
.
alertLogs
=
_
.
map
(
result
,
log
=>
{
log
.
iconCss
=
alertDef
.
getSeverityIconClass
(
log
.
severity
);
log
.
humanTime
=
moment
(
log
.
created
).
format
(
"YYYY-MM-DD HH:mm:ss"
);
return
log
;
});
});
this
.
backendSrv
.
get
(
`/api/alerts/
${
alertId
}
`
).
then
(
result
=>
{
this
.
alert
=
result
;
});
}
}
coreModule
.
controller
(
'AlertLogCtrl'
,
AlertLogCtrl
);
public/app/features/alerting/all.ts
View file @
65ce01fb
import
'./alert_list_ctrl'
;
import
'./alert_list_ctrl'
;
import
'./alert_log_ctrl'
;
import
'./notifications_list_ctrl'
;
import
'./notifications_list_ctrl'
;
import
'./notification_edit_ctrl'
;
import
'./notification_edit_ctrl'
;
public/app/features/alerting/partials/alert_log.html
deleted
100644 → 0
View file @
fe9d591b
<navbar
icon=
"fa fa-fw fa-list"
title=
"Alerts"
title-url=
"alerting"
>
</navbar>
<div
class=
"page-container"
>
<div
class=
"page-header"
>
<h1>
Alert history for {{ctrl.alert.title}}
</h1>
</div>
<table
class=
"filter-table"
>
<thead>
<th
style=
"width: 68px"
>
Status
</th>
<th
style=
"width: 160px"
>
Time
</th>
<th>
Description
</th>
</thead>
<tr
ng-repeat=
"alertLog in ctrl.alertLogs"
>
<td>
<i
class=
"icon-gf {{alertLog.iconCss}}"
></i>
</td>
<td>
{{alertLog.humanTime}}
</td>
<td>
{{alertLog.info}}
</td>
</tr>
</table>
</div>
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