From 18a59285d2a37c654bf5f2c8edc9ae1a68a2dc25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Legrand?= Date: Thu, 17 Mar 2022 20:35:33 +0100 Subject: [PATCH] Sorting imports and constant variables --- .../network-dashboard/cloud-function/main.py | 38 +++++++++---------- .../network-dashboard/main.tf | 32 ++++++++-------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/examples/cloud-operations/network-dashboard/cloud-function/main.py b/examples/cloud-operations/network-dashboard/cloud-function/main.py index ccbc05e7..8f9c5458 100644 --- a/examples/cloud-operations/network-dashboard/cloud-function/main.py +++ b/examples/cloud-operations/network-dashboard/cloud-function/main.py @@ -14,12 +14,12 @@ # limitations under the License. # -import time import os +import time import yaml +from google.api import metric_pb2 as ga_metric from google.cloud import monitoring_v3 from googleapiclient import discovery -from google.api import metric_pb2 as ga_metric # list of projects from which function will get quotas information MONITORED_PROJECTS_LIST = os.environ.get("MONITORED_PROJECTS_LIST").split(",") @@ -29,24 +29,24 @@ MONITORING_PROJECT_LINK = f"projects/{MONITORING_PROJECT_ID}" service = discovery.build('compute', 'v1') # DEFAULT LIMITS: -LIMIT_VPC_PEER = os.environ.get("LIMIT_VPC_PEER").split(",") -LIMIT_L4 = os.environ.get("LIMIT_L4").split(",") -LIMIT_L7 = os.environ.get("LIMIT_L7").split(",") LIMIT_INSTANCES = os.environ.get("LIMIT_INSTANCES").split(",") LIMIT_INSTANCES_PPG = os.environ.get("LIMIT_INSTANCES_PPG").split(",") -LIMIT_SUBNETS = os.environ.get("LIMIT_SUBNETS").split(",") +LIMIT_L4 = os.environ.get("LIMIT_L4").split(",") LIMIT_L4_PPG = os.environ.get("LIMIT_L4_PPG").split(",") +LIMIT_L7 = os.environ.get("LIMIT_L7").split(",") LIMIT_L7_PPG = os.environ.get("LIMIT_L7_PPG").split(",") +LIMIT_SUBNETS = os.environ.get("LIMIT_SUBNETS").split(",") +LIMIT_VPC_PEER = os.environ.get("LIMIT_VPC_PEER").split(",") # Existing GCP metrics per network -L4_FORWARDING_RULES_USAGE_METRIC = "compute.googleapis.com/quota/internal_lb_forwarding_rules_per_vpc_network/usage" -L4_FORWARDING_RULES_LIMIT_METRIC = "compute.googleapis.com/quota/internal_lb_forwarding_rules_per_vpc_network/limit" -L7_FORWARDING_RULES_USAGE_METRIC = "compute.googleapis.com/quota/internal_managed_forwarding_rules_per_vpc_network/usage" -L7_FORWARDING_RULES_LIMIT_METRIC = "compute.googleapis.com/quota/internal_managed_forwarding_rules_per_vpc_network/limit" -SUBNET_RANGES_USAGE_METRIC = "compute.googleapis.com/quota/subnet_ranges_per_vpc_network/usage" -SUBNET_RANGES_LIMIT_METRIC = "compute.googleapis.com/quota/subnet_ranges_per_vpc_network/limit" -GCE_INSTANCES_USAGE_METRIC = "compute.googleapis.com/quota/instances_per_vpc_network/usage" GCE_INSTANCES_LIMIT_METRIC = "compute.googleapis.com/quota/instances_per_vpc_network/limit" +GCE_INSTANCES_USAGE_METRIC = "compute.googleapis.com/quota/instances_per_vpc_network/usage" +L4_FORWARDING_RULES_LIMIT_METRIC = "compute.googleapis.com/quota/internal_lb_forwarding_rules_per_vpc_network/limit" +L4_FORWARDING_RULES_USAGE_METRIC = "compute.googleapis.com/quota/internal_lb_forwarding_rules_per_vpc_network/usage" +L7_FORWARDING_RULES_LIMIT_METRIC = "compute.googleapis.com/quota/internal_managed_forwarding_rules_per_vpc_network/limit" +L7_FORWARDING_RULES_USAGE_METRIC = "compute.googleapis.com/quota/internal_managed_forwarding_rules_per_vpc_network/usage" +SUBNET_RANGES_LIMIT_METRIC = "compute.googleapis.com/quota/subnet_ranges_per_vpc_network/limit" +SUBNET_RANGES_USAGE_METRIC = "compute.googleapis.com/quota/subnet_ranges_per_vpc_network/usage" def main(event, context): @@ -64,8 +64,13 @@ def main(event, context): # Per Network metrics get_gce_instances_data(metrics_dict) - get_vpc_peering_data(metrics_dict) get_l4_forwarding_rules_data(metrics_dict) + get_vpc_peering_data(metrics_dict) + + get_pgg_data( + metrics_dict["metrics_per_peering_group"]["instance_per_peering_group"], + GCE_INSTANCES_USAGE_METRIC, GCE_INSTANCES_LIMIT_METRIC, + LIMIT_INSTANCES_PPG) get_pgg_data( metrics_dict["metrics_per_peering_group"] @@ -84,11 +89,6 @@ def main(event, context): ["subnet_ranges_per_peering_group"], SUBNET_RANGES_USAGE_METRIC, SUBNET_RANGES_LIMIT_METRIC, LIMIT_SUBNETS) - get_pgg_data( - metrics_dict["metrics_per_peering_group"]["instance_per_peering_group"], - GCE_INSTANCES_USAGE_METRIC, GCE_INSTANCES_LIMIT_METRIC, - LIMIT_INSTANCES_PPG) - return 'Function executed successfully' diff --git a/examples/cloud-operations/network-dashboard/main.tf b/examples/cloud-operations/network-dashboard/main.tf index f3ab73bc..bdc94f77 100644 --- a/examples/cloud-operations/network-dashboard/main.tf +++ b/examples/cloud-operations/network-dashboard/main.tf @@ -18,22 +18,22 @@ locals { project_id_list = toset(var.monitored_projects_list) projects = join(",", local.project_id_list) - limit_subnets_list = tolist(var.limit_subnets) - limit_subnets = join(",", local.limit_subnets_list) - limit_instances_list = tolist(var.limit_instances) limit_instances = join(",", local.limit_instances_list) - limit_instances_ppg_list = tolist(var.limit_instances_ppg) + limit_instances_list = tolist(var.limit_instances) limit_instances_ppg = join(",", local.limit_instances_ppg_list) - limit_vpc_peer_list = tolist(var.limit_vpc_peer) - limit_vpc_peer = join(",", local.limit_vpc_peer_list) - limit_l4_list = tolist(var.limit_l4) + limit_instances_ppg_list = tolist(var.limit_instances_ppg) limit_l4 = join(",", local.limit_l4_list) - limit_l7_list = tolist(var.limit_l7) - limit_l7 = join(",", local.limit_l7_list) - limit_l4_ppg_list = tolist(var.limit_l4_ppg) + limit_l4_list = tolist(var.limit_l4) limit_l4_ppg = join(",", local.limit_l4_ppg_list) - limit_l7_ppg_list = tolist(var.limit_l7_ppg) + limit_l4_ppg_list = tolist(var.limit_l4_ppg) + limit_l7 = join(",", local.limit_l7_list) + limit_l7_list = tolist(var.limit_l7) limit_l7_ppg = join(",", local.limit_l7_ppg_list) + limit_l7_ppg_list = tolist(var.limit_l7_ppg) + limit_subnets = join(",", local.limit_subnets_list) + limit_subnets_list = tolist(var.limit_subnets) + limit_vpc_peer = join(",", local.limit_vpc_peer_list) + limit_vpc_peer_list = tolist(var.limit_vpc_peer) } ################################################ @@ -134,16 +134,16 @@ module "cloud-function" { } environment_variables = { - MONITORED_PROJECTS_LIST = local.projects - MONITORING_PROJECT_ID = module.project-monitoring.project_id - LIMIT_SUBNETS = local.limit_subnets LIMIT_INSTANCES = local.limit_instances LIMIT_INSTANCES_PPG = local.limit_instances_ppg - LIMIT_VPC_PEER = local.limit_vpc_peer LIMIT_L4 = local.limit_l4 - LIMIT_L7 = local.limit_l7 LIMIT_L4_PPG = local.limit_l4_ppg + LIMIT_L7 = local.limit_l7 LIMIT_L7_PPG = local.limit_l7_ppg + LIMIT_SUBNETS = local.limit_subnets + LIMIT_VPC_PEER = local.limit_vpc_peer + MONITORED_PROJECTS_LIST = local.projects + MONITORING_PROJECT_ID = module.project-monitoring.project_id } service_account = module.service-account-function.email