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.

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

Add Datadog configurations for Artemis #248

Merged
merged 3 commits into from
Aug 26, 2024
Merged

Add Datadog configurations for Artemis #248

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a50fbb7
Add Datadog configurations to Artemis
Kamsiy Aug 26, 2024
ff511a0
Add default datadog values
Kamsiy Aug 26, 2024
5dac598
Add default datadog values
Kamsiy Aug 26, 2024
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
45 changes: 33 additions & 12 deletions backend/terraform/modules/analyzer/api_groups.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ resource "aws_lambda_function" "groups-handler" {
s3_bucket = var.s3_analyzer_files_id
s3_key = "lambdas/groups/v${var.ver}/groups.zip"

layers = concat([
layers = concat(var.datadog_enabled ? var.datadog_lambda_layers : [], [
aws_lambda_layer_version.backend_core.arn
], var.extra_lambda_layers_groups_handler)

Expand All @@ -204,7 +204,7 @@ resource "aws_lambda_function" "groups-handler" {
]
}

handler = "handlers.handler"
handler = var.datadog_enabled ? "datadog_lambda.handler.handler" : "handlers.handler"
runtime = var.lambda_runtime
architectures = [var.lambda_architecture]
memory_size = 1024
Expand All @@ -221,11 +221,18 @@ resource "aws_lambda_function" "groups-handler" {
}

environment {
variables = {
variables = merge({
ANALYZER_DJANGO_SECRETS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/django-secret-key"
ANALYZER_DB_CREDS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/db-user"
ARTEMIS_CUSTOM_FILTERING_MODULE = var.custom_filtering_module
}
DATADOG_ENABLED = var.datadog_enabled
},
var.datadog_enabled ? merge({
DD_LAMBDA_HANDLER = "handlers.handler"
DD_SERVICE = "${var.app}-api"
DD_API_KEY_SECRET_ARN = aws_secretsmanager_secret.datadog-api-key.arn
}, var.datadog_lambda_variables)
: {})
}

tags = merge(
Expand All @@ -242,7 +249,7 @@ resource "aws_lambda_function" "groups-members-handler" {
s3_bucket = var.s3_analyzer_files_id
s3_key = "lambdas/groups_members/v${var.ver}/groups_members.zip"

layers = concat([
layers = concat(var.datadog_enabled ? var.datadog_lambda_layers : [], [
aws_lambda_layer_version.backend_core.arn
], var.extra_lambda_layers_groups_members_handler)

Expand All @@ -253,7 +260,7 @@ resource "aws_lambda_function" "groups-members-handler" {
]
}

handler = "handlers.handler"
handler = var.datadog_enabled ? "datadog_lambda.handler.handler" : "handlers.handler"
runtime = var.lambda_runtime
architectures = [var.lambda_architecture]
memory_size = 1024
Expand All @@ -270,11 +277,18 @@ resource "aws_lambda_function" "groups-members-handler" {
}

environment {
variables = {
variables = merge({
ANALYZER_DJANGO_SECRETS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/django-secret-key"
ANALYZER_DB_CREDS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/db-user"
ARTEMIS_CUSTOM_FILTERING_MODULE = var.custom_filtering_module
}
DATADOG_ENABLED = var.datadog_enabled
},
var.datadog_enabled ? merge({
DD_LAMBDA_HANDLER = "handlers.handler"
DD_SERVICE = "${var.app}-api"
DD_API_KEY_SECRET_ARN = aws_secretsmanager_secret.datadog-api-key.arn
}, var.datadog_lambda_variables)
: {})
}

tags = merge(
Expand All @@ -291,7 +305,7 @@ resource "aws_lambda_function" "groups-keys-handler" {
s3_bucket = var.s3_analyzer_files_id
s3_key = "lambdas/groups_keys/v${var.ver}/groups_keys.zip"

layers = concat([
layers = concat(var.datadog_enabled ? var.datadog_lambda_layers : [], [
aws_lambda_layer_version.backend_core.arn
], var.extra_lambda_layers_groups_keys_handler)

Expand All @@ -302,7 +316,7 @@ resource "aws_lambda_function" "groups-keys-handler" {
]
}

handler = "handlers.handler"
handler = var.datadog_enabled ? "datadog_lambda.handler.handler" : "handlers.handler"
runtime = var.lambda_runtime
architectures = [var.lambda_architecture]
memory_size = 1024
Expand All @@ -319,11 +333,18 @@ resource "aws_lambda_function" "groups-keys-handler" {
}

environment {
variables = {
variables = merge({
ANALYZER_DJANGO_SECRETS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/django-secret-key"
ANALYZER_DB_CREDS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/db-user"
ARTEMIS_CUSTOM_FILTERING_MODULE = var.custom_filtering_module
}
DATADOG_ENABLED = var.datadog_enabled
},
var.datadog_enabled ? merge({
DD_LAMBDA_HANDLER = "handlers.handler"
DD_SERVICE = "${var.app}-api"
DD_API_KEY_SECRET_ARN = aws_secretsmanager_secret.datadog-api-key.arn
}, var.datadog_lambda_variables)
: {})
}

tags = merge(
Expand Down
32 changes: 23 additions & 9 deletions backend/terraform/modules/analyzer/api_main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ resource "aws_lambda_function" "ci-tools" {
s3_bucket = var.s3_analyzer_files_id
s3_key = "lambdas/ci_tools/v${var.ver}/ci_tools.zip"

layers = concat([
layers = concat(var.datadog_enabled ? var.datadog_lambda_layers : [], [
aws_lambda_layer_version.backend_core.arn
], var.extra_lambda_layers_ci_tools_handler)

Expand All @@ -244,7 +244,7 @@ resource "aws_lambda_function" "ci-tools" {
]
}

handler = "handlers.handler"
handler = var.datadog_enabled ? "datadog_lambda.handler.handler" : "handlers.handler"
runtime = var.lambda_runtime
architectures = [var.lambda_architecture]
memory_size = 1024
Expand All @@ -261,9 +261,16 @@ resource "aws_lambda_function" "ci-tools" {
}

environment {
variables = {
S3_BUCKET = var.s3_analyzer_files_id
}
variables = merge({
DATADOG_ENABLED = var.datadog_enabled
S3_BUCKET = var.s3_analyzer_files_id
},
var.datadog_enabled ? merge({
DD_LAMBDA_HANDLER = "handlers.handler"
DD_SERVICE = "${var.app}-api"
DD_API_KEY_SECRET_ARN = aws_secretsmanager_secret.datadog-api-key.arn
}, var.datadog_lambda_variables)
: {})
}

tags = merge(
Expand Down Expand Up @@ -485,7 +492,7 @@ resource "aws_lambda_function" "api-authorizer" {
s3_bucket = var.s3_analyzer_files_id
s3_key = "lambdas/authorizer/v${var.ver}/authorizer.zip"

layers = concat([
layers = concat(var.datadog_enabled ? var.datadog_lambda_layers : [], [
aws_lambda_layer_version.backend_core.arn
], var.extra_lambda_layers_api_authorizer)

Expand All @@ -496,7 +503,7 @@ resource "aws_lambda_function" "api-authorizer" {
]
}

handler = "handlers.handler"
handler = var.datadog_enabled ? "datadog_lambda.handler.handler" : "handlers.handler"
runtime = var.lambda_runtime
architectures = [var.lambda_architecture]
memory_size = 1024
Expand All @@ -513,7 +520,8 @@ resource "aws_lambda_function" "api-authorizer" {
}

environment {
variables = {
variables = merge({
DATADOG_ENABLED = var.datadog_enabled
S3_BUCKET = var.s3_analyzer_files_id
ANALYZER_DJANGO_SECRETS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/django-secret-key"
ANALYZER_DB_CREDS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/db-user"
Expand All @@ -527,7 +535,13 @@ resource "aws_lambda_function" "api-authorizer" {
ARTEMIS_MAINTENANCE_MODE_RETRY_AFTER = var.maintenance_mode_retry_after
ARTEMIS_DEFAULT_SCOPE = jsonencode(var.default_scope)
EMAIL_DOMAIN_ALIASES = jsonencode(var.email_domain_aliases)
}
},
var.datadog_enabled ? merge({
DD_LAMBDA_HANDLER = "handlers.handler"
DD_SERVICE = "${var.app}-api"
DD_API_KEY_SECRET_ARN = aws_secretsmanager_secret.datadog-api-key.arn
}, var.datadog_lambda_variables)
: {})
}

tags = merge(
Expand Down
30 changes: 22 additions & 8 deletions backend/terraform/modules/analyzer/api_sbom.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ resource "aws_lambda_function" "sbom_components" {
s3_bucket = var.s3_analyzer_files_id
s3_key = "lambdas/sbom_components/v${var.ver}/sbom_components.zip"

layers = concat([
layers = concat(var.datadog_enabled ? var.datadog_lambda_layers : [], [
aws_lambda_layer_version.backend_core.arn
], var.extra_lambda_layers_sbom_components_handler)

Expand All @@ -210,7 +210,7 @@ resource "aws_lambda_function" "sbom_components" {
]
}

handler = "handlers.handler"
handler = var.datadog_enabled ? "datadog_lambda.handler.handler" : "handlers.handler"
runtime = var.lambda_runtime
architectures = [var.lambda_architecture]
memory_size = 1024
Expand All @@ -227,12 +227,19 @@ resource "aws_lambda_function" "sbom_components" {
}

environment {
variables = {
variables = merge({
DATADOG_ENABLED = var.datadog_enabled
ANALYZER_DJANGO_SECRETS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/django-secret-key"
ANALYZER_DB_CREDS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/db-user"
ARTEMIS_DOMAIN_NAME = var.domain_name
ARTEMIS_CUSTOM_FILTERING_MODULE = var.custom_filtering_module
}
},
var.datadog_enabled ? merge({
DD_LAMBDA_HANDLER = "handlers.handler"
DD_SERVICE = "${var.app}-api"
DD_API_KEY_SECRET_ARN = aws_secretsmanager_secret.datadog-api-key.arn
}, var.datadog_lambda_variables)
: {})
}

tags = merge(
Expand All @@ -249,7 +256,7 @@ resource "aws_lambda_function" "sbom_licenses" {
s3_bucket = var.s3_analyzer_files_id
s3_key = "lambdas/sbom_licenses/v${var.ver}/sbom_licenses.zip"

layers = concat([
layers = concat(var.datadog_enabled ? var.datadog_lambda_layers : [], [
aws_lambda_layer_version.backend_core.arn
], var.extra_lambda_layers_sbom_licenses_handler)

Expand All @@ -260,7 +267,7 @@ resource "aws_lambda_function" "sbom_licenses" {
]
}

handler = "handlers.handler"
handler = var.datadog_enabled ? "datadog_lambda.handler.handler" : "handlers.handler"
runtime = var.lambda_runtime
architectures = [var.lambda_architecture]
memory_size = 1024
Expand All @@ -277,12 +284,19 @@ resource "aws_lambda_function" "sbom_licenses" {
}

environment {
variables = {
variables = merge({
DATADOG_ENABLED = var.datadog_enabled
ANALYZER_DJANGO_SECRETS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/django-secret-key"
ANALYZER_DB_CREDS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/db-user"
ARTEMIS_DOMAIN_NAME = var.domain_name
ARTEMIS_CUSTOM_FILTERING_MODULE = var.custom_filtering_module
}
},
var.datadog_enabled ? merge({
DD_LAMBDA_HANDLER = "handlers.handler"
DD_SERVICE = "${var.app}-api"
DD_API_KEY_SECRET_ARN = aws_secretsmanager_secret.datadog-api-key.arn
}, var.datadog_lambda_variables)
: {})
}

tags = merge(
Expand Down
15 changes: 11 additions & 4 deletions backend/terraform/modules/analyzer/api_scans.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ resource "aws_lambda_function" "scans_batch" {
s3_bucket = var.s3_analyzer_files_id
s3_key = "lambdas/scans_batch/v${var.ver}/scans_batch.zip"

layers = concat([
layers = concat(var.datadog_enabled ? var.datadog_lambda_layers : [], [
aws_lambda_layer_version.backend_core.arn
], var.extra_lambda_layers_scans_batch_handler)

Expand All @@ -101,7 +101,7 @@ resource "aws_lambda_function" "scans_batch" {
]
}

handler = "handlers.handler"
handler = var.datadog_enabled ? "datadog_lambda.handler.handler" : "handlers.handler"
runtime = var.lambda_runtime
architectures = [var.lambda_architecture]
memory_size = 1024
Expand All @@ -118,12 +118,19 @@ resource "aws_lambda_function" "scans_batch" {
}

environment {
variables = {
variables = merge({
DATADOG_ENABLED = var.datadog_enabled
ANALYZER_DJANGO_SECRETS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/django-secret-key"
ANALYZER_DB_CREDS_ARN = "arn:aws:secretsmanager:${var.aws_region}:${data.aws_caller_identity.current.account_id}:secret:${var.app}/db-user"
ARTEMIS_DOMAIN_NAME = var.domain_name
ARTEMIS_CUSTOM_FILTERING_MODULE = var.custom_filtering_module
}
},
var.datadog_enabled ? merge({
DD_LAMBDA_HANDLER = "handlers.handler"
DD_SERVICE = "${var.app}-api"
DD_API_KEY_SECRET_ARN = aws_secretsmanager_secret.datadog-api-key.arn
}, var.datadog_lambda_variables)
: {})
}

tags = merge(
Expand Down
Loading