Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated list of enabled APIs for network dashboard #929

Merged
merged 23 commits into from
Nov 16, 2022
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
561e113
added services to monitoring project
maunope Oct 28, 2022
5b32621
Merge branch 'maunope/static_routes' of https://github.com/maunope/cl…
maunope Oct 28, 2022
5841c11
Merge branch 'master' into maunope/static_routes
aurelienlegrand Oct 28, 2022
fe29b93
fixed proj creation and readme
maunope Oct 28, 2022
06c2ae3
Merge branch 'maunope/static_routes' of https://github.com/maunope/cl…
maunope Oct 28, 2022
9a6b6fd
Merge branch 'master' into maunope/static_routes
juliocc Nov 2, 2022
2bc60e6
readme updates, removed default prefix, completed vpc-sc compatibility
maunope Nov 10, 2022
55d544b
Merge branch 'master' of https://github.com/GoogleCloudPlatform/cloud…
maunope Nov 10, 2022
da0c05c
updated tfdoc
maunope Nov 10, 2022
c2da049
Merge branch 'maunope/static_routes' into vpc-sc
maunope Nov 10, 2022
8b07f1b
Merge pull request #3 from maunope/vpc-sc
maunope Nov 10, 2022
9eb63df
merge
maunope Nov 10, 2022
bb072af
addressed #599 comments
maunope Nov 10, 2022
d65f9ac
Merge branch 'vpc-sc' into maunope/static_routes
maunope Nov 10, 2022
f3002e9
#599 comments
maunope Nov 10, 2022
6a6e326
Merge branch 'maunope/static_routes' of https://github.com/maunope/cl…
maunope Nov 10, 2022
13238be
Merge branch 'master' into maunope/static_routes
maunope Nov 11, 2022
2ffc1c9
Merge branch 'master' into maunope/static_routes
maunope Nov 11, 2022
b39c277
Merge branch 'master' into maunope/static_routes
maunope Nov 14, 2022
ce624f2
moving metrics project conf to next PR
maunope Nov 15, 2022
9815403
removed vpc connector var
maunope Nov 15, 2022
9b84e15
Merge branch 'master' into maunope/static_routes
aurelienlegrand Nov 15, 2022
bf3e623
Merge branch 'master' into maunope/static_routes
maunope Nov 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions blueprints/cloud-operations/network-dashboard/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,14 @@ Three metric descriptors are created for each monitored resource: usage, limit a
Clone this repository, then go through the following steps to create resources:
- Create a terraform.tfvars file with the following content:
```tfvars
organization_id = "<YOUR-ORG-ID>"
billing_account = "<YOUR-BILLING-ACCOUNT>"
monitoring_project_id = "project-0" # Monitoring project where the dashboard will be created and the solution deployed
monitored_projects_list = ["project-1", "project2"] # Projects to be monitored by the solution
monitored_folders_list = ["folder_id"] # Folders to be monitored by the solution
v2 = false # Set to true to use V2 Cloud Functions environment
```
- organization_id = "<YOUR-ORG-ID>"
maunope marked this conversation as resolved.
Show resolved Hide resolved
- billing_account = "<YOUR-BILLING-ACCOUNT>"
- monitoring_project_id = "<YOUR-MONITORING-PROJECT>" # Monitoring project where the dashboard will be created and the solution deployed, a project named "mon-network-dahshboard" will be created if left blank
- monitored_projects_list = ["project-1", "project2"] # Projects to be monitored by the solution
- monitored_folders_list = ["folder_id"] # Folders to be monitored by the solution
- prefix = "<YOUR-PREFIX>" # Monitoring project name prefix, monitoring project name is <YOUR-PREFIX>-network-dashboard, ignored if monitoring_project_id variable is provided
- v2 = true|false # Set to true to use V2 Cloud Functions environment
```
maunope marked this conversation as resolved.
Show resolved Hide resolved
- `terraform init`
- `terraform apply`

Expand Down
2 changes: 1 addition & 1 deletion blueprints/cloud-operations/network-dashboard/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ locals {
module "project-monitoring" {
count = var.monitoring_project_id == "" ? 1 : 0
source = "../../../modules/project"
name = "monitoring"
name = "network-dashboards"
parent = "organizations/${var.organization_id}"
prefix = var.prefix
billing_account = var.billing_account
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ variable "project_vm_services" {
]
}



variable "region" {
description = "Region used to deploy subnets"
default = "europe-west1"
Expand All @@ -45,4 +47,4 @@ variable "region" {
variable "zone" {
description = "Zone used to deploy vms"
default = "europe-west1-b"
}
}
11 changes: 9 additions & 2 deletions blueprints/cloud-operations/network-dashboard/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -50,28 +50,35 @@ variable "organization_id" {

variable "prefix" {
description = "Customer name to use as prefix for monitoring project"
default = "mon"
maunope marked this conversation as resolved.
Show resolved Hide resolved
}


variable "project_monitoring_services" {
description = "Service APIs enabled in the monitoring project if it will be created."
default = [
"artifactregistry.googleapis.com",
"cloudasset.googleapis.com",
"cloudbilling.googleapis.com",
"cloudbuild.googleapis.com",
"cloudfunctions.googleapis.com",
"cloudresourcemanager.googleapis.com",
"cloudscheduler.googleapis.com",
"compute.googleapis.com",
"cloudfunctions.googleapis.com",
"iam.googleapis.com",
"iamcredentials.googleapis.com",
"logging.googleapis.com",
"monitoring.googleapis.com",
"pubsub.googleapis.com",
"run.googleapis.com",
"serviceusage.googleapis.com"
"servicenetworking.googleapis.com",
"serviceusage.googleapis.com",
"storage-component.googleapis.com"
]
}



maunope marked this conversation as resolved.
Show resolved Hide resolved
variable "region" {
description = "Region used to deploy the cloud functions and scheduler"
default = "europe-west1"
Expand Down