Add resource_group optional field for metrics

jiangong · jiangong · commit f4b7cd0cfd69 · 2019-08-22T15:05:50.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,8 @@
-## 3.39.1 (Unreleased)
+## 3.40.0 (Unreleased)
+
+###Added
+- Add `resource_group` optional field for metrics
+
 ## 3.39.0 (August 21, 2019)
 
 ### Added
diff --git a/examples/monitoring/alarms/alarms.tf b/examples/monitoring/alarms/alarms.tf
@@ -61,6 +61,10 @@ variable "alarm_resolution" {
   default = "1m"
 }
 
+variable "alarm_resource_group" {
+  default = "resourceGroup"
+}
+
 variable "alarm_severity" {
   default = "WARNING"
 }
@@ -145,6 +149,7 @@ resource "oci_monitoring_alarm" "test_alarm" {
   pending_duration                 = "${var.alarm_pending_duration}"
   repeat_notification_duration     = "${var.alarm_repeat_notification_duration}"
   resolution                       = "${var.alarm_resolution}"
+  resource_group                   = "${var.alarm_resource_group}"
 
   suppression {
     #Required
@@ -184,3 +189,8 @@ data "oci_monitoring_alarm_statuses" "test_alarm_statuses" {
   compartment_id_in_subtree = "${var.alarm_status_compartment_id_in_subtree}"
   display_name              = "${var.alarm_status_display_name}"
 }
+
+data "oci_monitoring_alarm" "test_alarm" {
+  #Required
+  alarm_id = "${oci_monitoring_alarm.test_alarm.id}"
+}
diff --git a/examples/monitoring/metrics/metrics.tf b/examples/monitoring/metrics/metrics.tf
@@ -27,6 +27,14 @@ variable "metric_namespace" {
   default = "oci_lbaas"
 }
 
+variable "metric_resource_group" {
+  default = ""
+}
+
+variable "metric_data_resource_group" {
+  default = ""
+}
+
 variable "metric_data_compartment_id_in_subtree" {
   default = false
 }
@@ -68,6 +76,7 @@ data "oci_monitoring_metric_data" "test_metric_data" {
   #Optional
   compartment_id_in_subtree = "${var.metric_data_compartment_id_in_subtree}"
   resolution                = "${var.metric_data_resolution}"
+  resource_group            = "${var.metric_data_resource_group}"
 }
 
 data "oci_monitoring_metrics" "test_metrics" {
@@ -78,6 +87,7 @@ data "oci_monitoring_metrics" "test_metrics" {
   compartment_id_in_subtree = "${var.metric_compartment_id_in_subtree}"
   name                      = "${var.metric_name}"
   namespace                 = "${var.metric_namespace}"
+  resource_group            = "${var.metric_resource_group}"
 }
 
 output "metricData" {
diff --git a/oci/monitoring_alarm_data_source.go b/oci/monitoring_alarm_data_source.go
@@ -114,6 +114,10 @@ func (s *MonitoringAlarmDataSourceCrud) SetData() error {
 		s.D.Set("resolution", *s.Res.Resolution)
 	}
 
+	if s.Res.ResourceGroup != nil {
+		s.D.Set("resource_group", *s.Res.ResourceGroup)
+	}
+
 	s.D.Set("severity", s.Res.Severity)
 
 	s.D.Set("state", s.Res.LifecycleState)
diff --git a/oci/monitoring_alarm_resource.go b/oci/monitoring_alarm_resource.go
@@ -100,6 +100,11 @@ func MonitoringAlarmResource() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"resource_group": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"suppression": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -297,6 +302,11 @@ func (s *MonitoringAlarmResourceCrud) Create() error {
 		request.Resolution = &tmp
 	}
 
+	if resourceGroup, ok := s.D.GetOkExists("resource_group"); ok {
+		tmp := resourceGroup.(string)
+		request.ResourceGroup = &tmp
+	}
+
 	if severity, ok := s.D.GetOkExists("severity"); ok {
 		request.Severity = oci_monitoring.AlarmSeverityEnum(severity.(string))
 	}
@@ -434,6 +444,11 @@ func (s *MonitoringAlarmResourceCrud) Update() error {
 		request.Resolution = &tmp
 	}
 
+	if resourceGroup, ok := s.D.GetOkExists("resource_group"); ok {
+		tmp := resourceGroup.(string)
+		request.ResourceGroup = &tmp
+	}
+
 	if severity, ok := s.D.GetOkExists("severity"); ok {
 		request.Severity = oci_monitoring.AlarmSeverityEnum(severity.(string))
 	}
@@ -525,6 +540,10 @@ func (s *MonitoringAlarmResourceCrud) SetData() error {
 		s.D.Set("resolution", *s.Res.Resolution)
 	}
 
+	if s.Res.ResourceGroup != nil {
+		s.D.Set("resource_group", *s.Res.ResourceGroup)
+	}
+
 	s.D.Set("severity", s.Res.Severity)
 
 	s.D.Set("state", s.Res.LifecycleState)
diff --git a/oci/monitoring_alarm_test.go b/oci/monitoring_alarm_test.go
@@ -55,6 +55,7 @@ var (
 		"pending_duration":                 Representation{repType: Optional, create: `PT5M`, update: `PT10M`},
 		"repeat_notification_duration":     Representation{repType: Optional, create: `PT2H`, update: `PT10M`},
 		"resolution":                       Representation{repType: Optional, create: `1m`},
+		"resource_group":                   Representation{repType: Optional, create: `resourceGroup`, update: `resourceGroup2`},
 		"suppression":                      RepresentationGroup{Optional, alarmSuppressionRepresentation},
 	}
 	alarmSuppressionRepresentation = map[string]interface{}{
@@ -139,6 +140,7 @@ func TestMonitoringAlarmResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "query", "CpuUtilization[10m].percentile(0.9) < 85"),
 					resource.TestCheckResourceAttr(resourceName, "repeat_notification_duration", "PT2H"),
 					resource.TestCheckResourceAttr(resourceName, "resolution", "1m"),
+					resource.TestCheckResourceAttr(resourceName, "resource_group", "resourceGroup"),
 					resource.TestCheckResourceAttr(resourceName, "severity", "WARNING"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttr(resourceName, "suppression.#", "1"),
@@ -178,6 +180,7 @@ func TestMonitoringAlarmResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "query", "CpuUtilization[10m].percentile(0.9) < 85"),
 					resource.TestCheckResourceAttr(resourceName, "repeat_notification_duration", "PT2H"),
 					resource.TestCheckResourceAttr(resourceName, "resolution", "1m"),
+					resource.TestCheckResourceAttr(resourceName, "resource_group", "resourceGroup"),
 					resource.TestCheckResourceAttr(resourceName, "severity", "WARNING"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttr(resourceName, "suppression.#", "1"),
@@ -217,6 +220,7 @@ func TestMonitoringAlarmResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceName, "query", "AcceptedConnections[10m].count() <= 0"),
 					resource.TestCheckResourceAttr(resourceName, "repeat_notification_duration", "PT10M"),
 					resource.TestCheckResourceAttr(resourceName, "resolution", "1m"),
+					resource.TestCheckResourceAttr(resourceName, "resource_group", "resourceGroup2"),
 					resource.TestCheckResourceAttr(resourceName, "severity", "INFO"),
 					resource.TestCheckResourceAttrSet(resourceName, "state"),
 					resource.TestCheckResourceAttr(resourceName, "suppression.#", "1"),
@@ -289,6 +293,7 @@ func TestMonitoringAlarmResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(singularDatasourceName, "query", "AcceptedConnections[10m].count() <= 0"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "repeat_notification_duration", "PT10M"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "resolution", "1m"),
+					resource.TestCheckResourceAttr(singularDatasourceName, "resource_group", "resourceGroup2"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "severity", "INFO"),
 					resource.TestCheckResourceAttrSet(singularDatasourceName, "state"),
 					resource.TestCheckResourceAttr(singularDatasourceName, "suppression.#", "1"),
diff --git a/oci/monitoring_metric_data_data_source.go b/oci/monitoring_metric_data_data_source.go
@@ -40,6 +40,10 @@ func MonitoringMetricDataDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"resource_group": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"start_time": {
 				Type:     schema.TypeString,
 				Optional: true,
@@ -86,6 +90,12 @@ func MonitoringMetricDataDataSource() *schema.Resource {
 							Computed: true,
 							ForceNew: true,
 						},
+						"resource_group": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Computed: true,
+							ForceNew: true,
+						},
 						"start_time": {
 							Type:             schema.TypeString,
 							Optional:         true,
@@ -191,6 +201,11 @@ func (s *MonitoringMetricDataDataSourceCrud) Get() error {
 		request.Resolution = &tmp
 	}
 
+	if resourceGroup, ok := s.D.GetOkExists("resource_group"); ok {
+		tmp := resourceGroup.(string)
+		request.ResourceGroup = &tmp
+	}
+
 	if startTime, ok := s.D.GetOkExists("start_time"); ok {
 		tmp, err := time.Parse(time.RFC3339, startTime.(string))
 		if err != nil {
@@ -242,6 +257,10 @@ func (s *MonitoringMetricDataDataSourceCrud) SetData() error {
 			metricData["resolution"] = *r.Resolution
 		}
 
+		if r.ResourceGroup != nil {
+			metricData["resource_group"] = *r.ResourceGroup
+		}
+
 		resources = append(resources, metricData)
 	}
 
diff --git a/oci/monitoring_metric_data_test.go b/oci/monitoring_metric_data_test.go
@@ -25,6 +25,7 @@ var (
 		"compartment_id_in_subtree": Representation{repType: Optional, create: `false`},
 		"end_time":                  Representation{repType: Optional, create: metricDataEndTimeStr},
 		"resolution":                Representation{repType: Optional, create: `2m`},
+		"resource_group":            Representation{repType: Optional, create: `resourceGroup`},
 		"start_time":                Representation{repType: Optional, create: metricDataStartTimeStr},
 	}
 
@@ -72,6 +73,7 @@ func TestMonitoringMetricDataResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "namespace", "oci_vcn"),
 					resource.TestCheckResourceAttr(datasourceName, "query", "VnicToNetworkPackets[4m].max()"),
 					resource.TestCheckResourceAttr(datasourceName, "resolution", "2m"),
+					resource.TestCheckResourceAttr(datasourceName, "resource_group", "resourceGroup"),
 					resource.TestCheckResourceAttr(datasourceName, "start_time", metricDataStartTimeStr),
 
 					resource.TestCheckResourceAttrSet(datasourceName, "metric_data.#"),
diff --git a/oci/monitoring_metric_test.go b/oci/monitoring_metric_test.go
@@ -19,6 +19,7 @@ var (
 		"dimension_filters":         Representation{repType: Optional, create: map[string]string{"resourceId": "${oci_load_balancer_load_balancer.test_load_balancer.id}"}},
 		"name":                      Representation{repType: Optional, create: `AcceptedConnections`},
 		"namespace":                 Representation{repType: Optional, create: `oci_lbaas`},
+		"resource_group":            Representation{repType: Optional, create: `resourceGroup`},
 	}
 
 	MetricResourceConfig = LoadBalancerResourceConfig
@@ -56,6 +57,7 @@ func TestMonitoringMetricResource_basic(t *testing.T) {
 					resource.TestCheckResourceAttr(datasourceName, "dimension_filters.%", "1"),
 					resource.TestCheckResourceAttr(datasourceName, "name", "AcceptedConnections"),
 					resource.TestCheckResourceAttr(datasourceName, "namespace", "oci_lbaas"),
+					resource.TestCheckResourceAttr(datasourceName, "resource_group", "resourceGroup"),
 
 					resource.TestCheckResourceAttrSet(datasourceName, "metrics.#"),
 
diff --git a/oci/monitoring_metrics_data_source.go b/oci/monitoring_metrics_data_source.go
@@ -42,6 +42,10 @@ func MonitoringMetricsDataSource() *schema.Resource {
 				Type:     schema.TypeString,
 				Optional: true,
 			},
+			"resource_group": {
+				Type:     schema.TypeString,
+				Optional: true,
+			},
 			"metrics": {
 				Type:     schema.TypeList,
 				Computed: true,
@@ -89,6 +93,12 @@ func MonitoringMetricsDataSource() *schema.Resource {
 							Computed: true,
 							ForceNew: true,
 						},
+						"resource_group": {
+							Type:     schema.TypeString,
+							Optional: true,
+							Computed: true,
+							ForceNew: true,
+						},
 
 						// Computed
 						"dimensions": {
@@ -160,6 +170,11 @@ func (s *MonitoringMetricsDataSourceCrud) Get() error {
 		request.Namespace = &tmp
 	}
 
+	if resourceGroup, ok := s.D.GetOkExists("resource_group"); ok {
+		tmp := resourceGroup.(string)
+		request.ResourceGroup = &tmp
+	}
+
 	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "monitoring")
 
 	response, err := s.Client.ListMetrics(context.Background(), request)
@@ -208,6 +223,10 @@ func (s *MonitoringMetricsDataSourceCrud) SetData() error {
 			metric["namespace"] = *r.Namespace
 		}
 
+		if r.ResourceGroup != nil {
+			metric["resource_group"] = *r.ResourceGroup
+		}
+
 		resources = append(resources, metric)
 	}
 
diff --git a/website/docs/d/monitoring_alarm.html.markdown b/website/docs/d/monitoring_alarm.html.markdown
@@ -80,6 +80,7 @@ The following attributes are exported:
 
 	Example: `PT2H` 
 * `resolution` - The time between calculated aggregation windows for the alarm. Supported value: `1m` 
+* `resource_group` - Resource group specified as a filter for metric data retrieved by the alarm. A resource group is a custom string that can be used as a filter. Only one resource group can be applied per metric. A valid resourceGroup value starts with an alphabetical character and includes only alphanumeric characters, periods (.), underscores (_), hyphens (-), and dollar signs ($). Avoid entering confidential information.  Example: `frontend-fleet` 
 * `severity` - The perceived type of response required when the alarm is in the "FIRING" state.  Example: `CRITICAL` 
 * `state` - The current lifecycle state of the alarm.  Example: `DELETED` 
 * `suppression` - The configuration details for suppressing an alarm. 
diff --git a/website/docs/d/monitoring_alarms.html.markdown b/website/docs/d/monitoring_alarms.html.markdown
@@ -94,6 +94,7 @@ The following attributes are exported:
 
 	Example: `PT2H` 
 * `resolution` - The time between calculated aggregation windows for the alarm. Supported value: `1m` 
+* `resource_group` - Resource group specified as a filter for metric data retrieved by the alarm. A resource group is a custom string that can be used as a filter. Only one resource group can be applied per metric. A valid resourceGroup value starts with an alphabetical character and includes only alphanumeric characters, periods (.), underscores (_), hyphens (-), and dollar signs ($). Avoid entering confidential information.  Example: `frontend-fleet` 
 * `severity` - The perceived type of response required when the alarm is in the "FIRING" state.  Example: `CRITICAL` 
 * `state` - The current lifecycle state of the alarm.  Example: `DELETED` 
 * `suppression` - The configuration details for suppressing an alarm. 
diff --git a/website/docs/d/monitoring_metric_data.html.markdown b/website/docs/d/monitoring_metric_data.html.markdown
@@ -29,6 +29,7 @@ data "oci_monitoring_metric_data" "test_metric_data" {
 	compartment_id_in_subtree = "${var.metric_data_compartment_id_in_subtree}"
 	end_time = "${var.metric_data_end_time}"
 	resolution = "${var.metric_data_resolution}"
+	resource_group = "${var.metric_data_resource_group}"
 	start_time = "${var.metric_data_start_time}"
 }
 ```
@@ -49,6 +50,7 @@ The following arguments are supported:
 
 	Example: `CpuUtilization[1m].sum()` 
 * `resolution` - (Optional) The time between calculated aggregation windows. Use with the query interval to vary the frequency at which aggregated data points are returned. For example, use a query interval of 5 minutes with a resolution of 1 minute to retrieve five-minute aggregations at a one-minute frequency. The resolution must be equal or less than the interval in the query. The default resolution is 1m (one minute). Supported values: `1m`-`60m` (also `1h`).  Example: `5m` 
+* `resource_group` - (Optional) Resource group that you want to use as a filter. The specified resource group must exist in the definition of the posted metric. Only one resource group can be applied per metric. A valid resourceGroup value starts with an alphabetical character and includes only alphanumeric characters, periods (.), underscores (_), hyphens (-), and dollar signs ($). Avoid entering confidential information.  Example: `frontend-fleet` 
 * `start_time` - (Optional) The beginning of the time range to use when searching for metric data points. Format is defined by RFC3339. The response includes metric data points for the startTime. Default value: the timestamp 3 hours before the call was sent.  Example: `2019-02-01T01:02:29.600Z` 
 
 
@@ -71,4 +73,5 @@ The following attributes are exported:
 * `name` - The name of the metric.  Example: `CpuUtilization` 
 * `namespace` - The reference provided in a metric definition to indicate the source service or application that emitted the metric.  Example: `oci_computeagent` 
 * `resolution` - The time between calculated aggregation windows. Use with the query interval to vary the frequency at which aggregated data points are returned. For example, use a query interval of 5 minutes with a resolution of 1 minute to retrieve five-minute aggregations at a one-minute frequency. The resolution must be equal or less than the interval in the query. The default resolution is 1m (one minute). Supported values: `1m`-`60m` (also `1h`).  Example: `5m` 
+* `resource_group` - Resource group provided with the posted metric. A resource group is a custom string that can be used as a filter. Only one resource group can be applied per metric. A valid resourceGroup value starts with an alphabetical character and includes only alphanumeric characters, periods (.), underscores (_), hyphens (-), and dollar signs ($). Avoid entering confidential information.  Example: `frontend-fleet` 
 
diff --git a/website/docs/d/monitoring_metrics.html.markdown b/website/docs/d/monitoring_metrics.html.markdown
@@ -29,6 +29,7 @@ data "oci_monitoring_metrics" "test_metrics" {
 	group_by = "${var.metric_group_by}"
 	name = "${var.metric_name}"
 	namespace = "${var.metric_namespace}"
+	resource_group = "${var.metric_resource_group}"
 }
 ```
 
@@ -39,11 +40,12 @@ The following arguments are supported:
 * `compartment_id` - (Required) The [OCID](https://docs.cloud.oracle.com/iaas/Content/General/Concepts/identifiers.htm) of the compartment containing the resources monitored by the metric that you are searching for. Use tenancyId to search in the root compartment.  Example: `ocid1.compartment.oc1..exampleuniqueID` 
 * `compartment_id_in_subtree` - (Optional) When true, returns resources from all compartments and subcompartments. The parameter can only be set to true when compartmentId is the tenancy OCID (the tenancy is the root compartment). A true value requires the user to have tenancy-level permissions. If this requirement is not met, then the call is rejected. When false, returns resources from only the compartment specified in compartmentId. Default is false. 
 * `dimension_filters` - (Optional) Qualifiers that you want to use when searching for metric definitions. Available dimensions vary by metric namespace. Each dimension takes the form of a key-value pair.  Example: { "resourceId": "<var>&lt;instance_OCID&gt;</var>" } 
-* `group_by` - (Optional) Group metrics by these fields in the response. For example, to list all metric namespaces available in a compartment, groupBy the "namespace" field.
+* `group_by` - (Optional) Group metrics by these fields in the response. For example, to list all metric namespaces available in a compartment, groupBy the "namespace" field. Supported fields: namespace, name, resourceGroup.
 
 	Example - group by namespace: `[ "namespace" ]` 
 * `name` - (Optional) The metric name to use when searching for metric definitions.  Example: `CpuUtilization` 
 * `namespace` - (Optional) The source service or application to use when searching for metric definitions.  Example: `oci_computeagent` 
+* `resource_group` - (Optional) Resource group that you want to use as a filter. The specified resource group must exist in the definition of the posted metric. Only one resource group can be applied per metric. A valid resourceGroup value starts with an alphabetical character and includes only alphanumeric characters, periods (.), underscores (_), hyphens (-), and dollar signs ($). Avoid entering confidential information.  Example: `frontend-fleet` 
 
 
 ## Attributes Reference
@@ -60,4 +62,5 @@ The following attributes are exported:
 * `dimensions` - Qualifiers provided in a metric definition. Available dimensions vary by metric namespace. Each dimension takes the form of a key-value pair.  Example: `"resourceId": "ocid1.instance.region1.phx.exampleuniqueID"` 
 * `name` - The name of the metric.  Example: `CpuUtilization` 
 * `namespace` - The source service or application emitting the metric.  Example: `oci_computeagent` 
+* `resource_group` - Resource group provided with the posted metric. A resource group is a custom string that can be used as a filter. Only one resource group can be applied per metric. A valid resourceGroup value starts with an alphabetical character and includes only alphanumeric characters, periods (.), underscores (_), hyphens (-), and dollar signs ($). Avoid entering confidential information.  Example: `frontend-fleet` 
 
diff --git a/website/docs/r/monitoring_alarm.html.markdown b/website/docs/r/monitoring_alarm.html.markdown

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,10 @@ func (s *MonitoringAlarmDataSourceCrud) SetData() error {`
`114`	`114`	`s.D.Set("resolution", *s.Res.Resolution)`
`115`	`115`	`}`
`116`	`116`
	`117`	`+ if s.Res.ResourceGroup != nil {`
	`118`	`+ s.D.Set("resource_group", *s.Res.ResourceGroup)`
	`119`	`+ }`
	`120`	`+`
`117`	`121`	`s.D.Set("severity", s.Res.Severity)`
`118`	`122`
`119`	`123`	`s.D.Set("state", s.Res.LifecycleState)`