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

Jump to bottom

feat: Grafana Prometheus and Loki #1054

Merged

milldr merged 13 commits into main from feat/managed-grafana-prometheus-loki

Jun 11, 2024

Member

milldr commented May 30, 2024 •

edited

Loading

what

Introducing a new set of monitoring components built around the Amazon managed services for Grafana and Prometheus and using Loki and Promtail to read logs from EKS

why

This whole suite of components introduces a new set of monitoring components
The additional managed-grafana sub components are used for setting up complete infrastructure as code provisioning of the monitoring system

references

https://linear.app/cloudposse/issue/DEV-2137/upstream-all-components-to-terraform-aws-components
Documentation included with private repo PR: https://github.com/cloudposse/refarch-scaffold/pull/666


          added all new components for grafana prometheus and loki plus all rel…

…ated components

milldr requested review from a team as code owners

May 30, 2024 23:05

milldr commented

View reviewed changes

modules/eks/prometheus-scraper/README.md Outdated Show resolved Hide resolved

milldr commented

View reviewed changes

modules/eks/promtail/outputs.tf Outdated Show resolved Hide resolved

milldr commented

View reviewed changes

modules/managed-grafana/workspace/README.md Outdated Show resolved Hide resolved

milldr and others added 2 commits

May 30, 2024 16:15


          Apply suggestions from code review

dbfdad5


          Add metadata output block status for promtail module

6d7f997

milldr commented

View reviewed changes

modules/eks/loki/README.md Outdated Show resolved Hide resolved

milldr added 2 commits

May 30, 2024 18:48


          Update modules/eks/loki/README.md

e0cb4bb


          Merge branch 'main' into feat/managed-grafana-prometheus-loki

a676883

osterman reviewed

View reviewed changes

modules/eks/loki/main.tf Outdated Show resolved Hide resolved

osterman reviewed

View reviewed changes

modules/eks/loki/main.tf Outdated Show resolved Hide resolved

dudymas reviewed

View reviewed changes

modules/eks/prometheus-scraper/README.md Outdated Show resolved Hide resolved

osterman reviewed

View reviewed changes

modules/eks/prometheus-scraper/variables.tf Outdated Show resolved Hide resolved

osterman reviewed

View reviewed changes

modules/eks/promtail/main.tf Outdated Show resolved Hide resolved

Benbentwo previously approved these changes

View reviewed changes

Member

Benbentwo left a comment •

edited

Loading

I have some comments here and stored in my head, but I think this PR is tightly coupled with a lot of other changes, and would be best changed in a follow up PR or as the component and modules naturally evolve

modules/eks/loki/main.tf Show resolved Hide resolved

osterman reviewed

View reviewed changes

modules/managed-grafana/dashboard/README.md Show resolved Hide resolved

milldr added 2 commits

June 6, 2024 11:14


          Merge branch 'main' into feat/managed-grafana-prometheus-loki

cf315db


          Add default and additional schema configurations for Loki chart

141db8f

milldr dismissed Benbentwo’s stale review via

141db8f

June 6, 2024 22:38

milldr and others added 6 commits

June 7, 2024 15:22


          Add scrape config variable and path in Promtail module

ea0aa21


          Add metadata output block status description

6ccd254


          heredoc

45500c0


          Update push_api configuration handling and documentation

06cbe55


          corrected readme for scaper

a5f698e


          Merge branch 'main' into feat/managed-grafana-prometheus-loki

d6f8de2

Benbentwo approved these changes

View reviewed changes

modules/managed-prometheus/workspace/main.tf Show resolved Hide resolved

milldr merged commit 0c910b6 into main

5 checks passed

milldr deleted the feat/managed-grafana-prometheus-loki branch

June 11, 2024 19:33

Contributor

github-actions bot commented Jun 11, 2024

These changes were released in v1.462.0.

goruha pushed a commit to cloudposse-terraform-components/aws-eks-loki that referenced this pull request


          feat: Grafana Prometheus and Loki (cloudposse/terraform-aws-component…

b8a8d3c

…s#1054)

goruha pushed a commit to cloudposse-terraform-components/aws-eks-prometheus-scraper that referenced this pull request


          feat: Grafana Prometheus and Loki (cloudposse/terraform-aws-component…

0964cc1

…s#1054)

goruha pushed a commit to cloudposse-terraform-components/aws-eks-promtail that referenced this pull request


          feat: Grafana Prometheus and Loki (cloudposse/terraform-aws-component…

db43dbc

…s#1054)

goruha pushed a commit to cloudposse-terraform-components/aws-managed-grafana-api-key that referenced this pull request


          feat: Grafana Prometheus and Loki (cloudposse/terraform-aws-component…

f9fac6b

…s#1054)

goruha pushed a commit to cloudposse-terraform-components/aws-managed-grafana-dashboard that referenced this pull request


          feat: Grafana Prometheus and Loki (cloudposse/terraform-aws-component…

bf5bfb3

…s#1054)

goruha pushed a commit to cloudposse-terraform-components/aws-managed-grafana-data-source-loki that referenced this pull request


          feat: Grafana Prometheus and Loki (cloudposse/terraform-aws-component…

159f2ed

…s#1054)

goruha pushed a commit to cloudposse-terraform-components/aws-managed-grafana-data-source-managed-prometheus that referenced this pull request


          feat: Grafana Prometheus and Loki (cloudposse/terraform-aws-component…

c0a18ee

…s#1054)

goruha pushed a commit to cloudposse-terraform-components/aws-managed-grafana-workspace that referenced this pull request


          feat: Grafana Prometheus and Loki (cloudposse/terraform-aws-component…

737263c

…s#1054)

goruha pushed a commit to cloudposse-terraform-components/aws-managed-prometheus-workspace that referenced this pull request


          feat: Grafana Prometheus and Loki (cloudposse/terraform-aws-component…

d3c581a

…s#1054)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet