Merge branch 'master' into vsphere

jordanjean · Dec 4, 2019 · 951be94 · 951be94
2 parents cefaccc + cfc6d45
commit 951be94
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/rancher2/config.go b/rancher2/config.go
@@ -28,10 +28,31 @@ type Config struct {
 	Bootstrap bool   `json:"bootstrap"`
 	ClusterID string `json:"clusterId"`
 	ProjectID string `json:"projectId"`
+	Version   string
 	Sync      sync.Mutex
 	Client    Client
 }
 
+// GetRancherVersion get Rancher server version
+func (c *Config) GetRancherVersion() (string, error) {
+	if len(c.Version) > 0 {
+		return c.Version, nil
+	}
+
+	client, err := c.ManagementClient()
+	if err != nil {
+		return "", fmt.Errorf("[ERROR] Getting Rancher version: %s", err)
+	}
+
+	version, err := client.Setting.ByID("server-version")
+	if err != nil {
+		return "", fmt.Errorf("[ERROR] Getting Rancher version: %s", err)
+	}
+	c.Version = version.Value
+
+	return c.Version, nil
+}
+
 // UpdateToken update tokenkey and restart client connections
 func (c *Config) UpdateToken(token string) error {
 	if len(token) == 0 {
@@ -85,6 +106,12 @@ func (c *Config) ManagementClient() (*managementClient.Client, error) {
 	}
 	c.Client.Management = mClient
 
+	version, err := mClient.Setting.ByID("server-version")
+	if err != nil {
+		return nil, err
+	}
+	c.Version = version.Value
+
 	return c.Client.Management, nil
 }
 

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`