Note: The default ITS GitLab runner is a shared resource and is subject to slowdowns during heavy usage.
You can run your own GitLab runner that is dedicated just to your group if you need to avoid processing delays.

Commit 4d815fe5 authored by Kenny Moore's avatar Kenny Moore
Browse files

Minor_cleanup

parent 4b46b520
# Still need:
# write to DB
# write to DB - Figure out the curl piece (404 error)
resource "random_id" "id" {
byte_length = 2
......@@ -8,7 +8,6 @@ resource "random_id" "id" {
locals{
project_name_string = substr(lower(replace(var.project_name, "/\\s/", "-")), 0, 25)
# filter_string = "logName=\"projects/${google_project.gcp_project.project_id}/logs/cloudaudit.googleapis.com%2Factivity\""
filter_string = "Change_Me_to_Send_Additional_Logs_to_Splunk; Leave_Exclusions_in_Place_PLEASE"
default_cidr = "10.255.0.0/16"
default_subnets = {for x in var.regions : x => cidrsubnet(local.default_cidr,4,index(var.regions, x))}
......@@ -74,33 +73,6 @@ resource "google_project_service" "pubsub_api" {
service = "pubsub.googleapis.com"
}
# module "log_export" {
# source = "terraform-google-modules/log-export/google"
# destination_uri = module.destination.destination_uri
# filter = local.filter_string
# # filter = local.required_filters
# log_sink_name = var.logging_destination_topic
# # log_sink_name = local.log_export_name
# # parent_resource_id = var.parent_resource_id
# parent_resource_id = module.gcp-at-um-project.google_project.gcp_project.project_id
# parent_resource_type = "project"
# unique_writer_identity = true
# # include_children = true
# }
# module "destination" {
# source = "terraform-google-modules/log-export/google//modules/pubsub"
# project_id = var.logging_destination_project
# topic_name = var.logging_destination_topic
# log_sink_writer_identity = "${module.log_export.writer_identity}"
# create_subscriber = false
# # topic_labels = {
# # data_type = var.compliance_effort,
# # env = terraform.workspace
# } # Working here - not seeing it as an update?
# }
resource "google_logging_project_sink" "log_export" {
destination = var.log_export_destination
project = google_project.gcp_project.project_id
......
......@@ -47,16 +47,6 @@ variable "log_export_destination" {
default = "pubsub.googleapis.com/projects/vci-mcloud-service/topics/vci-service-project-logs-export"
}
# variable "logging_destination_project" {
# type = string
# description = "Log export destination project"
# }
# variable "logging_destination_topic" {
# type = string
# description = "Log export Pub/Sub topic in destination logging destination project"
# }
variable "requestor" {
type = string
description = "The person that made the initial request for the GCP Project"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment