Skip to content

feat: support OBSERVE_COLLECTION_ENDPOINT #73

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 11, 2023
Merged

feat: support OBSERVE_COLLECTION_ENDPOINT #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ Terraform module which sets up a Lambda to forward event data towards Observe.
module "observe_lambda" {
source = "observeinc/lambda/aws"

name = "observe-lambda"
observe_customer = "<id>"
observe_token = "<token>"
name = "observe-lambda"
observe_collection_endpoint = "https://<customerid>.collect.observeinc.com"
observe_token = "<token>"
}
```

Expand Down Expand Up @@ -76,8 +76,9 @@ No modules.
| <a name="input_lambda_version"></a> [lambda\_version](#input\_lambda\_version) | Version of lambda binary to use | `string` | `"latest"` | no |
| <a name="input_memory_size"></a> [memory\_size](#input\_memory\_size) | The amount of memory that your function has access to. Increasing the function's memory also increases its CPU allocation.<br>The default value is 128 MB. The value must be a multiple of 64 MB. | `number` | `128` | no |
| <a name="input_name"></a> [name](#input\_name) | Name of Lambda resource | `string` | n/a | yes |
| <a name="input_observe_customer"></a> [observe\_customer](#input\_observe\_customer) | Observe Customer ID | `string` | n/a | yes |
| <a name="input_observe_domain"></a> [observe\_domain](#input\_observe\_domain) | Observe domain | `string` | `"observeinc.com"` | no |
| <a name="input_observe_collection_endpoint"></a> [observe\_collection\_endpoint](#input\_observe\_collection\_endpoint) | Observe Collection Endpoint, e.g https://123456789012.collect.observeinc.com | `string` | `null` | no |
| <a name="input_observe_customer"></a> [observe\_customer](#input\_observe\_customer) | Observe Customer ID. Deprecated, please use observe\_collection\_endpoint instead | `string` | `null` | no |
| <a name="input_observe_domain"></a> [observe\_domain](#input\_observe\_domain) | Observe domain. Deprecated, please use observe\_collection\_endpoint instead | `string` | `"observeinc.com"` | no |
| <a name="input_observe_token"></a> [observe\_token](#input\_observe\_token) | Observe Token | `string` | n/a | yes |
| <a name="input_reserved_concurrent_executions"></a> [reserved\_concurrent\_executions](#input\_reserved\_concurrent\_executions) | The number of simultaneous executions to reserve for the function. | `number` | `100` | no |
| <a name="input_retention_in_days"></a> [retention\_in\_days](#input\_retention\_in\_days) | Retention in days of cloudwatch log group | `number` | `14` | no |
Expand Down
3 changes: 1 addition & 2 deletions examples/cloudtrail/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ Note that this will create AWS resources - once you are done, run `terraform des

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_observe_customer"></a> [observe\_customer](#input\_observe\_customer) | Observe Customer ID | `string` | n/a | yes |
| <a name="input_observe_domain"></a> [observe\_domain](#input\_observe\_domain) | Observe Domain | `string` | `null` | no |
| <a name="input_observe_collection_endpoint"></a> [observe\_collection\_endpoint](#input\_observe\_collection\_endpoint) | Observe Collection Endpoint, e.g https://123456789012.collect.observeinc.com | `string` | n/a | yes |
| <a name="input_observe_token"></a> [observe\_token](#input\_observe\_token) | Observe token | `string` | n/a | yes |

## Outputs
Expand Down
9 changes: 4 additions & 5 deletions examples/cloudtrail/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@ module "cloudtrail" {
}

module "observe_lambda" {
source = "../.."
observe_customer = var.observe_customer
observe_token = var.observe_token
observe_domain = var.observe_domain
name = random_pet.run.id
source = "../.."
observe_collection_endpoint = var.observe_collection_endpoint
observe_token = var.observe_token
name = random_pet.run.id
}

module "observe_lambda_s3_subscription" {
Expand Down
10 changes: 2 additions & 8 deletions examples/cloudtrail/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
variable "observe_customer" {
description = "Observe Customer ID"
variable "observe_collection_endpoint" {
description = "Observe Collection Endpoint, e.g https://123456789012.collect.observeinc.com"
type = string
}

variable "observe_token" {
description = "Observe token"
type = string
}

variable "observe_domain" {
description = "Observe Domain"
type = string
default = null
}
3 changes: 1 addition & 2 deletions examples/s3_access_logs/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ Note that this will create AWS resources - once you are done, run `terraform des
| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_name"></a> [name](#input\_name) | Lambda name | `string` | n/a | yes |
| <a name="input_observe_customer"></a> [observe\_customer](#input\_observe\_customer) | Observe Customer ID | `string` | n/a | yes |
| <a name="input_observe_domain"></a> [observe\_domain](#input\_observe\_domain) | Observe Domain | `string` | `null` | no |
| <a name="input_observe_collection_endpoint"></a> [observe\_collection\_endpoint](#input\_observe\_collection\_endpoint) | Observe Collection Endpoint, e.g https://123456789012.collect.observeinc.com | `string` | n/a | yes |
| <a name="input_observe_token"></a> [observe\_token](#input\_observe\_token) | Observe token | `string` | n/a | yes |

## Outputs
Expand Down
9 changes: 4 additions & 5 deletions examples/s3_access_logs/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,10 @@ resource "aws_s3_bucket_acl" "access_logs" {
}

module "observe_lambda" {
source = "../.."
observe_customer = var.observe_customer
observe_token = var.observe_token
observe_domain = var.observe_domain
name = var.name
source = "../.."
observe_collection_endpoint = var.observe_collection_endpoint
observe_token = var.observe_token
name = var.name
}

module "observe_lambda_s3_subscription" {
Expand Down
10 changes: 2 additions & 8 deletions examples/s3_access_logs/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "observe_customer" {
description = "Observe Customer ID"
variable "observe_collection_endpoint" {
description = "Observe Collection Endpoint, e.g https://123456789012.collect.observeinc.com"
type = string
}

Expand All @@ -8,12 +8,6 @@ variable "observe_token" {
type = string
}

variable "observe_domain" {
description = "Observe Domain"
type = string
default = null
}

variable "name" {
description = "Lambda name"
type = string
Expand Down
3 changes: 1 addition & 2 deletions examples/s3_bucket/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ Note that this will create AWS resources - once you are done, run `terraform des
| <a name="input_bucket_count"></a> [bucket\_count](#input\_bucket\_count) | Number of buckets to create and subscribe. | `number` | `1` | no |
| <a name="input_filter_prefix"></a> [filter\_prefix](#input\_filter\_prefix) | Specifies object key name prefix on S3 bucket notifications. | `string` | `null` | no |
| <a name="input_filter_suffix"></a> [filter\_suffix](#input\_filter\_suffix) | Specifies object key name suffix on S3 bucket notifications. | `string` | `null` | no |
| <a name="input_observe_customer"></a> [observe\_customer](#input\_observe\_customer) | Observe Customer ID | `string` | n/a | yes |
| <a name="input_observe_domain"></a> [observe\_domain](#input\_observe\_domain) | Observe Domain | `string` | `null` | no |
| <a name="input_observe_collection_endpoint"></a> [observe\_collection\_endpoint](#input\_observe\_collection\_endpoint) | Observe Collection Endpoint, e.g https://123456789012.collect.observeinc.com | `string` | n/a | yes |
| <a name="input_observe_token"></a> [observe\_token](#input\_observe\_token) | Observe token | `string` | n/a | yes |

## Outputs
Expand Down
9 changes: 4 additions & 5 deletions examples/s3_bucket/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ module "observe_s3_bucket" {
}

module "observe_lambda" {
source = "../.."
observe_customer = var.observe_customer
observe_token = var.observe_token
observe_domain = var.observe_domain
name = random_pet.run.id
source = "../.."
observe_collection_endpoint = var.observe_collection_endpoint
observe_token = var.observe_token
name = random_pet.run.id
}

module "observe_lambda_s3_subscription" {
Expand Down
10 changes: 2 additions & 8 deletions examples/s3_bucket/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
variable "observe_customer" {
description = "Observe Customer ID"
variable "observe_collection_endpoint" {
description = "Observe Collection Endpoint, e.g https://123456789012.collect.observeinc.com"
type = string
}

Expand All @@ -8,12 +8,6 @@ variable "observe_token" {
type = string
}

variable "observe_domain" {
description = "Observe Domain"
type = string
default = null
}

variable "bucket_count" {
description = "Number of buckets to create and subscribe."
type = number
Expand Down
3 changes: 1 addition & 2 deletions examples/vpc_config/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ Note that this will create AWS resources - once you are done, run `terraform des

| Name | Description | Type | Default | Required |
|------|-------------|------|---------|:--------:|
| <a name="input_observe_customer"></a> [observe\_customer](#input\_observe\_customer) | Observe Customer ID | `string` | n/a | yes |
| <a name="input_observe_domain"></a> [observe\_domain](#input\_observe\_domain) | Observe Domain | `string` | `"observeinc.com"` | no |
| <a name="input_observe_collection_endpoint"></a> [observe\_collection\_endpoint](#input\_observe\_collection\_endpoint) | Observe Collection Endpoint, e.g https://123456789012.collect.observeinc.com | `string` | n/a | yes |
| <a name="input_observe_token"></a> [observe\_token](#input\_observe\_token) | Observe token | `string` | n/a | yes |

## Outputs
Expand Down
7 changes: 3 additions & 4 deletions examples/vpc_config/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ resource "random_pet" "run" {
module "observe_lambda" {
source = "../.."

name = random_pet.run.id
observe_domain = var.observe_domain
observe_customer = var.observe_customer
observe_token = var.observe_token
name = random_pet.run.id
observe_collection_endpoint = var.observe_collection_endpoint
observe_token = var.observe_token

vpc_config = {
subnets = [aws_subnet.private]
Expand Down
10 changes: 2 additions & 8 deletions examples/vpc_config/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,9 @@
variable "observe_customer" {
description = "Observe Customer ID"
variable "observe_collection_endpoint" {
description = "Observe Collection Endpoint, e.g https://123456789012.collect.observeinc.com"
type = string
}

variable "observe_token" {
description = "Observe token"
type = string
}

variable "observe_domain" {
description = "Observe Domain"
type = string
default = "observeinc.com"
}
4 changes: 2 additions & 2 deletions main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ resource "aws_lambda_function" "this" {

environment {
variables = merge({
OBSERVE_URL = format("https://%s.collect.%s/v1/http", var.observe_customer, var.observe_domain)
OBSERVE_TOKEN = var.observe_token
OBSERVE_COLLECTION_ENDPOINT = var.observe_collection_endpoint != null ? var.observe_collection_endpoint : format("https://%s.collect.%s", var.observe_customer, var.observe_domain)
OBSERVE_TOKEN = var.observe_token
}, length(var.lambda_s3_custom_rules) > 0 ? {
S3_CUSTOM_RULES = base64encode(jsonencode(var.lambda_s3_custom_rules))
} : {}
Expand Down
9 changes: 4 additions & 5 deletions modules/cloudwatch_logs_subscription/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ resource "aws_cloudwatch_log_group" "group" {
}

module "observe_lambda" {
source = "observeinc/lambda/aws"
observe_customer = var.observe_customer
observe_token = var.observe_token
observe_domain = var.observe_domain
name = random_pet.run.id
source = "observeinc/lambda/aws"
observe_collection_endpoint = var.observe_collection_endpoint
observe_token = var.observe_token
name = random_pet.run.id
}

module "observe_lambda_cloudwatch_logs_subscription" {
Expand Down
9 changes: 4 additions & 5 deletions modules/cloudwatch_metrics/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,10 @@ Lambda to ensure that all requested endpoints are accessible.

```hcl
module "observe_lambda" {
source = "observeinc/lambda/aws"
observe_customer = var.observe_customer
observe_token = var.observe_token
observe_domain = var.observe_domain
name = random_pet.run.id
source = "observeinc/lambda/aws"
observe_collection_endpoint = var.observe_collection_endpoint
observe_token = var.observe_token
name = random_pet.run.id
}

module "cloudwatch_metrics" {
Expand Down
9 changes: 4 additions & 5 deletions modules/s3_bucket/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,10 @@ module "observe_s3_bucket"
}

module "observe_lambda" {
source = "observeinc/lambda/aws"
observe_customer = var.observe_customer
observe_token = var.observe_token
observe_domain = var.observe_domain
name = random_pet.run.id
source = "observeinc/lambda/aws"
observe_collection_endpoint = var.observe_collection_endpoint
observe_token = var.observe_token
name = random_pet.run.id
}

module "observe_lambda_s3_subscription" {
Expand Down
9 changes: 4 additions & 5 deletions modules/s3_bucket_subscription/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ resource "aws_s3_bucket" "bucket" {
}

module "observe_lambda" {
source = "observeinc/lambda/aws"
observe_customer = var.observe_customer
observe_token = var.observe_token
observe_domain = var.observe_domain
name = random_pet.run.id
source = "observeinc/lambda/aws"
observe_collection_endpoint = var.observe_collection_endpoint
observe_token = var.observe_token
name = random_pet.run.id
}

module "observe_lambda_s3_subscription" {
Expand Down
9 changes: 4 additions & 5 deletions modules/snapshot/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ to ensure that all requested endpoints are accessible.

```hcl
module "observe_lambda" {
source = "observeinc/lambda/aws"
observe_customer = var.observe_customer
observe_token = var.observe_token
observe_domain = var.observe_domain
name = random_pet.run.id
source = "observeinc/lambda/aws"
observe_collection_endpoint = var.observe_collection_endpoint
observe_token = var.observe_token
name = random_pet.run.id
}

module "observe_lambda_snapshot" {
Expand Down
16 changes: 13 additions & 3 deletions variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,20 @@ variable "name" {
type = string
}

variable "observe_collection_endpoint" {
description = "Observe Collection Endpoint, e.g https://123456789012.collect.observeinc.com"
type = string
default = null
validation {
condition = var.observe_collection_endpoint == null || can(regex("^https://.*$", var.observe_collection_endpoint))
error_message = "Endpoint must be a valid HTTPS URL."
}
}

variable "observe_customer" {
description = "Observe Customer ID"
description = "Observe Customer ID. Deprecated, please use observe_collection_endpoint instead"
type = string
default = null
}

variable "observe_token" {
Expand All @@ -18,9 +29,8 @@ variable "observe_token" {
}
}

# Optional input variables
variable "observe_domain" {
description = "Observe domain"
description = "Observe domain. Deprecated, please use observe_collection_endpoint instead"
type = string
nullable = false
default = "observeinc.com"
Expand Down