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.

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

Feature/create firehose and glue #45

Merged
merged 49 commits into from
Jul 28, 2024
Merged
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
f47e730
初回だけエラーが発生するようなので、再度実行してい見る
XxxKMSxxX Jul 15, 2024
5f7ab69
serviceロール名を変更
XxxKMSxxX Jul 15, 2024
b9fab2e
Merge branch 'main' into feature/ecsの定義修正
XxxKMSxxX Jul 15, 2024
acb496e
policyも自前で作成
XxxKMSxxX Jul 15, 2024
8e7277b
Merge branch 'feature/ecsの定義修正' of https://github.com/XxxKMSxxX/Crypt…
XxxKMSxxX Jul 15, 2024
7f22162
iam_roleを追加
XxxKMSxxX Jul 15, 2024
88555b9
一度リソースを削除してみる
XxxKMSxxX Jul 15, 2024
c85fe85
ストリームの構成を変更
XxxKMSxxX Jul 28, 2024
09530fe
タグを共通化
XxxKMSxxX Jul 28, 2024
c050697
タグの定義参照をリバイス
XxxKMSxxX Jul 28, 2024
da84338
バケット定義を追加
XxxKMSxxX Jul 28, 2024
1d4db86
ECSタスクの修正
XxxKMSxxX Jul 28, 2024
f19612b
ECSタスクの修正
XxxKMSxxX Jul 28, 2024
6e5736c
kinesisの定義修正
XxxKMSxxX Jul 28, 2024
0cb85e0
Merge branch 'feature/create-pipeline' of https://github.com/XxxKMSxx…
XxxKMSxxX Jul 28, 2024
21ecd13
一旦firehoseを除外
XxxKMSxxX Jul 28, 2024
1c54fcd
Merge branch 'main' into feature/create-pipeline
XxxKMSxxX Jul 28, 2024
f0c1ea1
ecs定義の再修正
XxxKMSxxX Jul 28, 2024
8ef96ce
Merge branch 'feature/create-pipeline' of https://github.com/XxxKMSxx…
XxxKMSxxX Jul 28, 2024
b6d7e6e
main.tfのフォーマット修正
XxxKMSxxX Jul 28, 2024
2fd94f2
ECSの定義を再修正
XxxKMSxxX Jul 28, 2024
128efb2
Merge branch 'main' into feature/create-pipeline
XxxKMSxxX Jul 28, 2024
fbbbc82
ネットワーク設定を変更
XxxKMSxxX Jul 28, 2024
d97cb39
Merge branch 'feature/create-pipeline' of https://github.com/XxxKMSxx…
XxxKMSxxX Jul 28, 2024
0159527
ECS定義修正
XxxKMSxxX Jul 28, 2024
5b96ce7
Merge branch 'main' into feature/create-pipeline
XxxKMSxxX Jul 28, 2024
af1988e
ECS定義修正
XxxKMSxxX Jul 28, 2024
dc19e1c
Merge branch 'feature/create-pipeline' of https://github.com/XxxKMSxx…
XxxKMSxxX Jul 28, 2024
e557e62
ECSタスク修正
XxxKMSxxX Jul 28, 2024
d67b319
Merge branch 'main' into feature/create-pipeline
XxxKMSxxX Jul 28, 2024
3341332
メモリ、CPUの指定を元に戻す
XxxKMSxxX Jul 28, 2024
ce2f5ee
container nameを修正
XxxKMSxxX Jul 28, 2024
9918879
ネットワーク設定を追加、ポートを動的に割当
XxxKMSxxX Jul 28, 2024
e9bf927
Merge branch 'main' into feature/create-pipeline
XxxKMSxxX Jul 28, 2024
b254f69
logdriverの設定を追加
XxxKMSxxX Jul 28, 2024
9e3e35d
log groupを作成
XxxKMSxxX Jul 28, 2024
6efd296
タスクを停止した際の強制デプロイオプションを追加
XxxKMSxxX Jul 28, 2024
fe13571
initial commit
XxxKMSxxX Jul 28, 2024
18dd6c6
既存のストリームを使用するよう修正
XxxKMSxxX Jul 28, 2024
f616737
出力も変更
XxxKMSxxX Jul 28, 2024
267b275
Merge branch 'main' into feature/create-firehose-and-glue
XxxKMSxxX Jul 28, 2024
93205e6
firehoseにglueのポリシーを追加
XxxKMSxxX Jul 28, 2024
bb2d9f9
Merge branch 'feature/create-firehose-and-glue' of https://github.com…
XxxKMSxxX Jul 28, 2024
d34c243
aws_caller_identityを追加
XxxKMSxxX Jul 28, 2024
1760c70
Merge branch 'main' into feature/create-firehose-and-glue
XxxKMSxxX Jul 28, 2024
296487a
ロググループの追加
XxxKMSxxX Jul 28, 2024
9f95ba7
Merge branch 'feature/create-firehose-and-glue' of https://github.com…
XxxKMSxxX Jul 28, 2024
dee3396
tag指定を追加
XxxKMSxxX Jul 28, 2024
308a04f
一部tagsを削除
XxxKMSxxX Jul 28, 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
29 changes: 28 additions & 1 deletion modules/firehose/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
data "aws_caller_identity" "current" {}

data "aws_kinesis_stream" "existing_kinesis_stream" {
name = var.stream_name
}

resource "aws_cloudwatch_log_group" "firehose_log_group" {
name = "/firehose/${var.project_name}"
retention_in_days = 1
tags = var.tags
}

resource "aws_kinesis_firehose_delivery_stream" "extended_s3_stream" {
name = "${var.project_name}-kinesis-firehose-extended-s3-stream"
destination = "extended_s3"
Expand Down Expand Up @@ -42,7 +50,7 @@ resource "aws_kinesis_firehose_delivery_stream" "extended_s3_stream" {

schema_configuration {
role_arn = aws_iam_role.firehose_role.arn
catalog_id = "AWS"
catalog_id = data.aws_caller_identity.current.account_id
database_name = aws_glue_catalog_database.my_database.name
table_name = aws_glue_catalog_table.my_table.name
region = var.aws_region
Expand All @@ -65,7 +73,15 @@ resource "aws_kinesis_firehose_delivery_stream" "extended_s3_stream" {
}
}
}

cloudwatch_logging_options {
enabled = true
log_group_name = aws_cloudwatch_log_group.firehose_log_group.name
log_stream_name = "firehose-delivery"
}
}

tags = var.tags
}

resource "aws_glue_catalog_database" "my_database" {
Expand Down Expand Up @@ -147,6 +163,7 @@ resource "aws_glue_catalog_table" "my_table" {

resource "aws_s3_bucket" "bucket" {
bucket = "${var.project_name}-collector"
tags = var.tags
}

data "aws_iam_policy_document" "firehose_assume_role" {
Expand All @@ -165,6 +182,7 @@ data "aws_iam_policy_document" "firehose_assume_role" {
resource "aws_iam_role" "firehose_role" {
name = "${var.project_name}-firehose-role"
assume_role_policy = data.aws_iam_policy_document.firehose_assume_role.json
tags = var.tags
}

resource "aws_iam_role_policy" "firehose_policy" {
Expand Down Expand Up @@ -217,6 +235,15 @@ resource "aws_iam_role_policy" "firehose_policy" {
"firehose:PutRecordBatch"
],
Resource = "*"
},
{
Effect = "Allow",
Action = [
"logs:PutLogEvents",
"logs:CreateLogStream",
"logs:CreateLogGroup"
],
Resource = "arn:aws:logs:${var.aws_region}:${data.aws_caller_identity.current.account_id}:log-group:/firehose/${var.project_name}:*"
}
]
})
Expand Down
Loading