Merge pull request #98 from K-Phoen/improve-alert-decoding

Improve alerts decoding from YAML
K-Phoen · Mar 27, 2021 · e5dfec3 · e5dfec3
2 parents 524d163 + f53de6a
commit e5dfec3
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/decoder/graph.go b/decoder/graph.go
@@ -216,12 +216,12 @@ type GraphAlert struct {
 	EvaluateEvery    string `yaml:"evaluate_every"`
 	For              string
 	If               []AlertCondition
-	Notify           string
-	Notifications    []string
-	Message          string
-	OnNoData         string `yaml:"on_no_data"`
-	OnExecutionError string `yaml:"on_execution_error"`
-	Tags             map[string]string
+	Notify           string            `yaml:",omitempty"`
+	Notifications    []string          `yaml:",omitempty,flow"`
+	Message          string            `yaml:",omitempty"`
+	OnNoData         string            `yaml:"on_no_data"`
+	OnExecutionError string            `yaml:"on_execution_error"`
+	Tags             map[string]string `yaml:",omitempty"`
 }
 
 func (a GraphAlert) toOptions() ([]alert.Option, error) {
@@ -289,11 +289,11 @@ func (a GraphAlert) toOptions() ([]alert.Option, error) {
 }
 
 type AlertThreshold struct {
-	HasNoValue   bool `yaml:"has_no_value"`
-	Above        *float64
-	Below        *float64
-	OutsideRange [2]float64 `yaml:"outside_range"`
-	WithinRange  [2]float64 `yaml:"within_range"`
+	HasNoValue   bool       `yaml:"has_no_value,omitempty"`
+	Above        *float64   `yaml:",omitempty"`
+	Below        *float64   `yaml:",omitempty"`
+	OutsideRange [2]float64 `yaml:"outside_range,omitempty,flow"`
+	WithinRange  [2]float64 `yaml:"within_range,omitempty,flow"`
 }
 
 func (threshold AlertThreshold) toOption() (alert.ConditionOption, error) {
@@ -354,7 +354,7 @@ func (v AlertValue) toOption() (alert.ConditionOption, error) {
 
 type AlertCondition struct {
 	Operand   string
-	Value     AlertValue
+	Value     AlertValue `yaml:",flow"`
 	Threshold AlertThreshold
 }