Merge pull request #204 from mackerelio-labs/elasticache_auto_retire

Allow ElastiCache to retire automatically

Author: yohfee

docs/data-sources/aws_integration.md

@@ -39,4 +39,4 @@ data "mackerel_aws_integration" "foo" {
 * `enable` - Whether integration settings are enabled. Default is `true`.
 * `role` - The set of monitoring target’s service name or role name.
 * `excluded_metrics` - 	Metrics to exclude from integration.
-* `retire_automatically` - (EC2 only) Whether automatic retirement is enabled. 
+* `retire_automatically` - (EC2, RDS and ElastiCache only) Whether automatic retirement is enabled. 

docs/resources/aws_integration.md

@@ -75,7 +75,7 @@ resource "mackerel_aws_integration" "baz" {
 * `enable` - Whether integration settings are enabled. Default is `true`.
 * `role` - The set of monitoring target’s service name or role name.
 * `excluded_metrics` - 	Metrics to exclude from integration.
-* `retire_automatically` - (EC2 only) Whether automatic retirement is enabled. 
+* `retire_automatically` - (EC2, RDS and ElastiCache only) Whether automatic retirement is enabled. 
 
 ## Attributes Reference
 

mackerel/data_source_mackerel_aws_integration.go

@@ -107,7 +107,7 @@ func dataSourceMackerelAWSIntegration() *schema.Resource {
 			},
 		},
 	}
-	var supportedRetireAutomatically = map[string]bool{"ec2": true, "rds": true}
+	var supportedRetireAutomatically = map[string]bool{"ec2": true, "rds": true, "elasticache": true}
 	for schemaKey := range awsIntegrationServicesKey {
 		if supportedRetireAutomatically[schemaKey] {
 			resource.Schema[schemaKey] = awsIntegrationServiceDataSchemaWithRetireAutomatically

mackerel/resource_mackerel_aws_integration.go

@@ -149,7 +149,7 @@ func resourceMackerelAWSIntegration() *schema.Resource {
 			},
 		},
 	}
-	var supportedRetireAutomatically = map[string]bool{"ec2": true, "rds": true}
+	var supportedRetireAutomatically = map[string]bool{"ec2": true, "rds": true, "elasticache": true}
 	for schemaKey := range awsIntegrationServicesKey {
 		if supportedRetireAutomatically[schemaKey] {
 			resource.Schema[schemaKey] = awsIntegrationServiceSchemaWithRetireAutomatically
@@ -231,7 +231,7 @@ func expandUpdateAWSIntegrationParam(d *schema.ResourceData) *mackerel.UpdateAWS
 }
 
 func expandAWSIntegrationServicesSet(d *schema.ResourceData) map[string]*mackerel.AWSIntegrationService {
-	var supportedRetireAutomatically = map[string]bool{"ec2": true, "rds": true}
+	var supportedRetireAutomatically = map[string]bool{"ec2": true, "rds": true, "elasticache": true}
 	services := make(map[string]*mackerel.AWSIntegrationService)
 	for schemaKey, mapKey := range awsIntegrationServicesKey {
 		if _, ok := d.GetOk(schemaKey); ok {

mackerel/structure_flattens.go

@@ -342,7 +342,7 @@ func flattenAWSIntegration(awsIntegration *mackerel.AWSIntegration, d *schema.Re
 	d.Set("included_tags", awsIntegration.IncludedTags)
 	d.Set("excluded_tags", awsIntegration.ExcludedTags)
 
-	var supportedRetireAutomatically = map[string]bool{"EC2": true, "RDS": true}
+	var supportedRetireAutomatically = map[string]bool{"EC2": true, "RDS": true, "ElastiCache": true}
 
 	awsIntegration.Services = deleteAWSIntegrationDisableService(awsIntegration.Services)
 	for key, service := range awsIntegration.Services {