apitech/loki - loki - Gitea: Git with a cup of tea

Author SHA1 Message Date

Author	SHA1	Message	Date
Justin Roberson	dd8226e63b	lambda-promtail: fix/refactor SQS integration in Terraform module (#9909 ) What this PR does / why we need it: Currently, the Terraform module for lambda-promtail is not working due to a misnamed reference: ``` ╷ │ Error: Reference to undeclared resource │ │ on .terraform/modules/lambda_promtail/tools/lambda-promtail/sqs.tf line 66, in resource "aws_iam_role_policy_attachment" "lambda_sqs_execution": │ 66: role = aws_iam_role.iam_for_lambda.name │ │ A managed resource "aws_iam_role" "iam_for_lambda" has not been declared in │ module.lambda_promtail. ╵ ``` It looks like this was the result of a conflict with #8231 and #8750. While I was in there I also refactored the SQS work to be more consistent with #8750. I also made the queue name prefix configurable with the `sqs_queue_name_prefix` variable, as it was hardcoded before which could cause issues if multiple instances of this module are initialized in the same AWS account and region. Which issue(s) this PR fixes: Fixes #<issue number> Special notes for your reviewer: Checklist - [x] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (required) - [ ] Documentation added - [ ] Tests updated - [ ] `CHANGELOG.md` updated - [ ] If the change is worth mentioning in the release notes, add `add-to-release-notes` label - [ ] Changes that require user attention or interaction to upgrade are documented in `docs/sources/upgrading/_index.md` - [ ] For Helm chart changes bump the Helm chart version in `production/helm/loki/Chart.yaml` and update `production/helm/loki/CHANGELOG.md` and `production/helm/loki/README.md`. [Example PR](`d10549e3ec`)	2 years ago
Mitch Hulscher	257225b486	refactor(lambda-promtail): apply terraform best practices (#8750 ) What this PR does / why we need it: I would like to offer this PR as a suggestion to improve the lambda-promtail terraform-module. I forked it to be able to deploy it more than once in an AWS account. I also applied terraform best-practices. I was hoping that perhaps these changes could be merged into upstream as well. Unlike https://github.com/grafana/loki/pull/8549 , I unfortunately did not end up making a separate commit for each change. If you would like me to create one or more issue(s) to address the points below, I'd be happy to do that as well. List of improvements: 1. Added `var.name` (defaults to lambda-promtail) so that this module can be deployed multiple times in the same AWS account. This allows us to define unique, non-conflicting names for: * the Lambda function * the CloudWatch log-group * the IAM role 2. Split IAM role policies per component; only assign permissions when required 3. Scope down permissions of the IAM role policies 4. During terraform-destroy, ensure CloudWatch log-group is removed after the lambda-function. An accidental invocation of the function could re-create an already destroyed log-group, leaving an orphaned log-group List of style changes: 1. Rename resources to `this` when there is only one instance of this resource-type 2. Add newline after `count\|before_each` and before `depends_on` 3. Group resources together and add a section comment 4. Add missing(?) statement-id to S3 AWS lambda permission Misc. 1. I added a `moves.tf` file to facilitate moving renamed resources in existing terraform statefiles. This prevents some resources from recreated. Can also be removed. These changes are backwards compatible, even though some resources will end up being re-created. A `terraform apply` should succeed (it did for me). Checklist - [X] Reviewed the [`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md) guide (required) Signed-off-by: Mitch Hulscher <mitch.hulscher@lib.io>	3 years ago

Justin Roberson

lambda-promtail: fix/refactor SQS integration in Terraform module (#9909 )

**What this PR does / why we need it**:

Currently, the Terraform module for lambda-promtail is not working due
to a misnamed reference:

```
╷
│ Error: Reference to undeclared resource
│ 
│   on .terraform/modules/lambda_promtail/tools/lambda-promtail/sqs.tf line 66, in resource "aws_iam_role_policy_attachment" "lambda_sqs_execution":
│   66:   role       = aws_iam_role.iam_for_lambda.name
│ 
│ A managed resource "aws_iam_role" "iam_for_lambda" has not been declared in
│ module.lambda_promtail.
╵
```

It looks like this was the result of a conflict with #8231 and #8750.

While I was in there I also refactored the SQS work to be more
consistent with #8750.

I also made the queue name prefix configurable with the
`sqs_queue_name_prefix` variable, as it was hardcoded before which could
cause issues if multiple instances of this module are initialized in the
same AWS account and region.

**Which issue(s) this PR fixes**:
Fixes #<issue number>

**Special notes for your reviewer**:

**Checklist**
- [x] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)
- [ ] Documentation added
- [ ] Tests updated
- [ ] `CHANGELOG.md` updated
- [ ] If the change is worth mentioning in the release notes, add
`add-to-release-notes` label
- [ ] Changes that require user attention or interaction to upgrade are
documented in `docs/sources/upgrading/_index.md`
- [ ] For Helm chart changes bump the Helm chart version in
`production/helm/loki/Chart.yaml` and update
`production/helm/loki/CHANGELOG.md` and
`production/helm/loki/README.md`. [Example
PR](d10549e3ec)

2 years ago

Mitch Hulscher

257225b486

refactor(lambda-promtail): apply terraform best practices (#8750 )

**What this PR does / why we need it**:

I would like to offer this PR as a suggestion to improve the
lambda-promtail terraform-module. I forked it to be able to deploy it
more than once in an AWS account. I also applied terraform
best-practices. I was hoping that perhaps these changes could be merged
into upstream as well.

Unlike https://github.com/grafana/loki/pull/8549 , I unfortunately did
not end up making a separate commit for each change.

If you would like me to create one or more issue(s) to address the
points below, I'd be happy to do that as well.

List of improvements:

1. Added `var.name` (defaults to lambda-promtail) so that this module
can be deployed multiple times in the same AWS account. This allows us
to define unique, non-conflicting names for:
    * the Lambda function
    * the CloudWatch log-group
    * the IAM role
2. Split IAM role policies per component; only assign permissions when
required
3. Scope down permissions of the IAM role policies
4. During terraform-destroy, ensure CloudWatch log-group is removed
**after** the lambda-function. An accidental invocation of the function
could re-create an already destroyed log-group, leaving an orphaned
log-group

List of style changes:

1. Rename resources to `this` when there is only one instance of this
resource-type
2. Add newline after `count|before_each` and before `depends_on`
3. Group resources together and add a section comment
4. Add missing(?) statement-id to S3 AWS lambda permission

Misc.

1. I added a `moves.tf` file to facilitate moving renamed resources in
existing terraform statefiles. This prevents some resources from
recreated. Can also be removed.

These changes are backwards compatible, even though some resources will
end up being re-created. A `terraform apply` should succeed (it did for
me).

**Checklist**
- [X] Reviewed the
[`CONTRIBUTING.md`](https://github.com/grafana/loki/blob/main/CONTRIBUTING.md)
guide (**required**)

Signed-off-by: Mitch Hulscher <mitch.hulscher@lib.io>

3 years ago

2 Commits (656b1faaaff778cfbbde9cd3fc76f4ef03a0bd03)