Skip to content

Commit a7ef1a4

Browse files
benjaminvalienteBenjamin Valiente (Contractor)github-actions[bot]
authored
feat: rename log group kube events (#259)
* feat: rename log group kube events * terraform-docs: automated action --------- Co-authored-by: Benjamin Valiente (Contractor) <benjamin.valiente@thoughtbot.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
1 parent 3df8e82 commit a7ef1a4

3 files changed

Lines changed: 4 additions & 15 deletions

File tree

aws/platform/main.tf

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -381,18 +381,15 @@ locals {
381381
Kube_CA_File /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
382382
Kube_Token_File /var/run/secrets/kubernetes.io/serviceaccount/token
383383
Interval_Sec 10
384-
[FILTER]
385-
Name grep
386-
Match kube.events
387-
Exclude type Normal
388384
[OUTPUT]
389385
Name cloudwatch_logs
390386
Match kube.events
391387
auto_create_group false
392388
region ${data.aws_region.current.name}
393-
log_group_name /flightdeck/${var.cluster_name}/kubernetes-events
394-
log_stream_prefix events-
395-
log_retention_days 30
389+
log_group_name ${module.cloudwatch_logs.log_group_name}-events
390+
log_stream_prefix $${HOST_NAME}-
391+
log_stream_template $kubernetes['pod_name'].$kubernetes['container_name']
392+
log_retention_days ${var.logs_retention_in_days}
396393
[OUTPUT]
397394
Name cloudwatch_logs
398395
Match *

aws/platform/modules/cloudwatch-logs/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
| Name | Type |
2424
|------|------|
25-
| [aws_cloudwatch_log_group.kubernetes_events](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
2625
| [aws_cloudwatch_log_group.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) | resource |
2726
| [aws_iam_policy.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
2827
| [aws_iam_role_policy_attachment.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) | resource |

aws/platform/modules/cloudwatch-logs/main.tf

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,6 @@ resource "aws_cloudwatch_log_group" "this" {
1515
tags = var.aws_tags
1616
}
1717

18-
resource "aws_cloudwatch_log_group" "kubernetes_events" {
19-
name = "${var.log_group_prefix}/${var.cluster_full_name}/kubernetes-events"
20-
retention_in_days = var.retention_in_days
21-
skip_destroy = var.skip_destroy
22-
tags = var.aws_tags
23-
}
24-
2518
resource "aws_iam_policy" "this" {
2619
name = module.fluent_bit_service_account_role.name
2720
policy = data.aws_iam_policy_document.this.json

0 commit comments

Comments
 (0)