Merge pull request #7 from microsoft/master

Dexterw/features/app monitoring - follow up (#144)
microsoft · May 31, 2019 · 1cbe9d2 · 1cbe9d2
2 parents 655d863 + 94ed5a8
commit 1cbe9d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/infra/modules/providers/azure/app-monitoring/README.md b/infra/modules/providers/azure/app-monitoring/README.md
@@ -81,7 +81,7 @@ module "service_plan" {
 
 module "app_monitoring" {
   source                            = "../../modules/providers/azure/app-monitoring"
-  resource_group_name               = "${azurerm_resource_group.svcplan.name}"
+  resource_group_name               = "${module.service_plan.resource_group_name}"
   resource_ids                      = ["${module.service_plan.app_service_plan_id}"]
   action_group_name                 = "${var.action_group_name}"
   action_group_email_receiver       = "${var.action_group_email_receiver}"

diff --git a/infra/modules/providers/azure/app-monitoring/variables.tf b/infra/modules/providers/azure/app-monitoring/variables.tf
@@ -12,6 +12,7 @@ variable "action_group_name" {
 variable "action_group_email_receiver" {
   description = "The e-mail receiver for an alert rule resource."
   type        = "string"
+  default     = ""
 }
 
 variable "action_group_email_receiver_name" {
@@ -77,4 +78,4 @@ variable "metric_alert_period" {
   description = "The look back window over which metric values are checked."
   type        = "string"
   default     = "PT5M"
-}
+}