Merge branch 'fast-dev'

blueprints/secops/bindplane-gke/README.md

@@ -38,10 +38,10 @@ git clone https://github.com/GoogleCloudPlatform/cloud-foundation-fabric.git
 Before you deploy the architecture, you will need at least the following
 information/configurations in place (for more precise configuration see the Variables section):
 
-* The project ID
-* The VPC host project
-* VPC and subnets should already exist
-* Subnet must be configured with pods and services secondary ranges (default names for secondary ranges is "pod" and "services")
+- The project ID
+- The VPC host project
+- VPC and subnets should already exist
+- Subnet must be configured with pods and services secondary ranges (default names for secondary ranges is "pod" and "services")
 
 #### Step 2: Prepare the variables
 
@@ -98,7 +98,7 @@ Then running the command `kubectl get pods` you should receive the following mes
 "No resources found in default namespace."
 ```
 
-In case private connection is available and DNS configuration is properly in place you should be able to reach the BindPlane OP Management console navigating the url (e.g. https://bindplane.example.com/), the following login page should show up.
+In case private connection is available and DNS configuration is properly in place you should be able to reach the BindPlane OP Management console navigating the url (e.g. <https://bindplane.example.com/>), the following login page should show up.
 
 ![Bindplane OP Management console login page](./images/login.png)
 
@@ -158,5 +158,5 @@ module "bindplane-gke" {
   region = "europe-west8"
   prefix = "tmp"
 }
-# tftest modules=10 resources=45
+# tftest modules=10 resources=48
 ```

blueprints/secops/bindplane-gke/main.tf

@@ -36,14 +36,15 @@ module "project" {
   project_reuse = var.project_create != null ? null : {}
   name          = var.project_id
   services = concat([
-    "compute.googleapis.com",
-    "iap.googleapis.com",
-    "stackdriver.googleapis.com",
     "chronicle.googleapis.com",
-    "container.googleapis.com",
-    "gkehub.googleapis.com",
+    "compute.googleapis.com",
     "connectgateway.googleapis.com",
-    "gkeconnect.googleapis.com"
+    "container.googleapis.com",
+    "gkeconnect.googleapis.com",
+    "gkehub.googleapis.com",
+    "iap.googleapis.com",
+    "logging.googleapis.com",
+    "monitoring.googleapis.com",
   ])
   iam = {
     "roles/pubsub.editor" = ["principal://iam.googleapis.com/projects/${module.project.number}/locations/global/workloadIdentityPools/${module.project.project_id}.svc.id.goog/subject/ns/bindplane/sa/bindplane"]

blueprints/secops/secops-gke-forwarder/README.md

@@ -33,9 +33,9 @@ git clone https://github.com/GoogleCloudPlatform/cloud-foundation-fabric.git
 Before you deploy the architecture, you will need at least the following
 information/configurations in place (for more precise configuration see the Variables section):
 
-* The project ID
-* The VPC host project
-* VPC and subnets should already exist
+- The project ID
+- The VPC host project
+- VPC and subnets should already exist
 
 #### Step 2: Prepare the variables
 
@@ -147,7 +147,7 @@ module "test" {
     }
   }
 }
-# tftest modules=5 resources=34 files=credentials,config
+# tftest modules=5 resources=37 files=credentials,config
 ```
 
 ```
@@ -198,4 +198,4 @@ collectors:
       tcp_address: 0.0.0.0:10515
       connection_timeout_sec: 60
       tcp_buffer_size: 524288
-```
+```

blueprints/secops/secops-gke-forwarder/main.tf

@@ -37,13 +37,14 @@ module "project" {
   name          = var.project_id
   services = concat([
     "compute.googleapis.com",
-    "iap.googleapis.com",
-    "stackdriver.googleapis.com",
     "chronicle.googleapis.com",
-    "container.googleapis.com",
-    "gkehub.googleapis.com",
     "connectgateway.googleapis.com",
-    "gkeconnect.googleapis.com"
+    "container.googleapis.com",
+    "gkeconnect.googleapis.com",
+    "gkehub.googleapis.com",
+    "iap.googleapis.com",
+    "logging.googleapis.com",
+    "monitoring.googleapis.com",
   ])
 }