Merge pull request rancher#199 from Bourne-ID/master

Add Not Null (API states has-value) to Alerts/Metric
jordanjean · Dec 4, 2019 · 4b844fe · 4b844fe
2 parents fea6d6f + 77660e5
commit 4b844fe
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/rancher2/schema_alert_rule.go b/rancher2/schema_alert_rule.go
@@ -22,6 +22,7 @@ const (
 	metricRuleComparisonLessOrEqual             = "less-or-equal"
 	metricRuleComparisonLessThan                = "less-than"
 	metricRuleComparisonNotEqual                = "not-equal"
+	metricRuleComparisonNotNull                 = "has-value"
 	nodeRuleConditionCPU                        = "cpu"
 	nodeRuleConditionMem                        = "mem"
 	nodeRuleConditionNotReady                   = "notready"
@@ -50,6 +51,7 @@ var (
 		metricRuleComparisonLessOrEqual,
 		metricRuleComparisonLessThan,
 		metricRuleComparisonNotEqual,
+		metricRuleComparisonNotNull,
 	}
 	nodeRuleConditions = []string{
 		nodeRuleConditionCPU,

diff --git a/website/docs/r/clusterAlertRule.html.markdown b/website/docs/r/clusterAlertRule.html.markdown
@@ -73,7 +73,7 @@ The following attributes are exported:
 * `duration` - (Required) Metric rule duration (string)
 * `expression` - (Required) Metric rule expression (string)
 * `threshold_value` - (Required) Metric rule threshold value (float64)
-* `comparison` - (Optional) Metric rule comparison. Supported values : `"equal" | "greater-or-equal" | "greater-than" | "less-or-equal" | "less-than" | "not-equal"`. Default: `equal`  (string)
+* `comparison` - (Optional) Metric rule comparison. Supported values : `"equal" | "greater-or-equal" | "greater-than" | "less-or-equal" | "less-than" | "not-equal" | "has-value"`. Default: `equal`  (string)
 * `description` - (Optional) Metric rule description (string)
 
 ### `node_rule`

diff --git a/website/docs/r/projectAlertRule.html.markdown b/website/docs/r/projectAlertRule.html.markdown
@@ -89,7 +89,7 @@ The following attributes are exported:
 * `duration` - (Required) Metric rule duration (string)
 * `expression` - (Required) Metric rule expression (string)
 * `threshold_value` - (Required) Metric rule threshold value (float64)
-* `comparison` - (Optional) Metric rule comparison. Supported values : `"equal" | "greater-or-equal" | "greater-than" | "less-or-equal" | "less-than" | "not-equal"`. Default: `equal`  (string)
+* `comparison` - (Optional) Metric rule comparison. Supported values : `"equal" | "greater-or-equal" | "greater-than" | "less-or-equal" | "less-than" | "not-equal" | "has-value"`. Default: `equal`  (string)
 * `description` - (Optional) Metric rule description (string)
 
 ### `pod_rule`