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): improve spacing in alerting tab

Browse Source
This commit is contained in:
bergquist 2016-05-30 17:50:35 +02:00
parent 3d5c27df91
commit c5c261e955
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/models/alerts.go
View File

@ -27,6 +27,25 @@ type AlertRule struct {
Updated time.Time `json:"updated"`
}
func (this *AlertRule) Equals(other AlertRule) bool {
result := false
result = result || this.Aggregator != other.Aggregator
result = result || this.CritLevel != other.CritLevel
result = result || this.WarnLevel != other.WarnLevel
result = result || this.WarnOperator != other.WarnOperator
result = result || this.CritOperator != other.CritOperator
result = result || this.Query != other.Query
result = result || this.QueryRefId != other.QueryRefId
result = result || this.Frequency != other.Frequency
result = result || this.Title != other.Title
result = result || this.Description != other.Description
result = result || this.QueryRange != other.QueryRange
//don't compare .State! That would be insane.
return result
}
type AlertingClusterInfo struct {
ServerId string
ClusterSize int

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

@ -102,25 +102,6 @@ func DeleteAlertDefinition(dashboardId int64, sess *xorm.Session) error {
return nil
}
func alertIsDifferent(rule1, rule2 m.AlertRule) bool {
result := false
result = result || rule1.Aggregator != rule2.Aggregator
result = result || rule1.CritLevel != rule2.CritLevel
result = result || rule1.WarnLevel != rule2.WarnLevel
result = result || rule1.WarnOperator != rule2.WarnOperator
result = result || rule1.CritOperator != rule2.CritOperator
result = result || rule1.Query != rule2.Query
result = result || rule1.QueryRefId != rule2.QueryRefId
result = result || rule1.Frequency != rule2.Frequency
result = result || rule1.Title != rule2.Title
result = result || rule1.Description != rule2.Description
result = result || rule1.QueryRange != rule2.QueryRange
//don't compare .State! That would be insane.
return result
}
func SaveAlerts(cmd *m.SaveAlertsCommand) error {
return inTransaction(func(sess *xorm.Session) error {
alerts, err := GetAlertsByDashboardId2(cmd.DashboardId, sess)
@ -149,7 +130,7 @@ func upsertAlerts(alerts []m.AlertRule, posted []m.AlertRule, sess *xorm.Session
}
if update {
if alertIsDifferent(alertToUpdate, alert) {
if alertToUpdate.Equals(alert) {
alert.Updated = time.Now()
alert.State = alertToUpdate.State
_, err := sess.Id(alert.Id).Update(&alert)

6
public/app/plugins/panel/graph/partials/tab_alerting.html
View File

@ -36,7 +36,7 @@
<div class="gf-form-group section">
<h5 class="section-heading">Aggregation settings</h5>
<div class="gf-form">
<span class="gf-form-label width-10">Aggregation method</span>
<span class="gf-form-label width-12">Aggregation method</span>
<div class="gf-form-select-wrapper max-width-10">
<select class="gf-form-input"
ng-model="ctrl.panel.alerting.aggregator"
@ -45,13 +45,13 @@
</div>
<div class="gf-form">
<span class="gf-form-label width-10">Query range (seconds)</span>
<span class="gf-form-label width-12">Query range (seconds)</span>
<input class="gf-form-input max-width-10" type="number"
ng-model="ctrl.panel.alerting.queryRange" placeholder="3600"></input>
</div>
<div class="gf-form">
<span class="gf-form-label width-10">Frequency (seconds)</span>
<span class="gf-form-label width-12">Frequency (seconds)</span>
<input class="gf-form-input max-width-10" type="number"
ng-model="ctrl.panel.alerting.interval" placeholder="60"></input>
</div>