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

Move all dashboards to GitOps #175

Merged
merged 33 commits into from
Jun 12, 2023
Merged

Move all dashboards to GitOps #175

merged 33 commits into from
Jun 12, 2023

Conversation

bonclay7
Copy link
Member

@bonclay7 bonclay7 commented Jun 6, 2023

What does this PR do?

Continuation of #164, linked to aws-observability/aws-observability-accelerator#5

This PR should be merged first.

summary of changes

  • grafana operator and Flux controlling all dashboards, they will appear in grafana workspace
  • terraform will not output dashboards links anymore, docs have been updated to get dashbaords from the k8s cluster or directly on the workspace
  • we will not be required to 'save and test' anymore
  • examples have been updated to reflect the changes

release plan

These changes give the opportunity to remove the Terraform Grafana provider from all modules expect the amp-monitoring which can be used without even using EKS (so no cluster to run grafana operator). This can greatly simplify multi-cluster and cross account/region scenarios.

However, dropping the provider will cause a Terraform issue as it won't be able to cleanup resources created by Terraform in Grafana. The release plan will consist on having

  • a v2.5.0-beta (with this PR) without the provider config but without the resources so Terraform remove dashboards and folders
  • a v2.5.0 (another PR) that do not have a grafana provider at all. Customer using the modules from scratch can directly use this version.

We will write this migration plan in the release notes and docs

Next steps

  • Move patterns (java, nginx) to GitOps
  • Update Docs
  • Update examples
  • Git branch for Grafana Operator manifest

More

  • Yes, I have tested the PR using my local account setup (Provide any test evidence report under Additional Notes)
  • Yes, I ran pre-commit run -a with this PR
  • Yes, I have added a new example under examples to support my PR (when applicable)
  • Yes, I have updated the Pages for this feature

Note: Not all the PRs required examples and docs.

For Moderators

  • E2E Test successfully complete before merge?

Additional Notes

bonclay7 added 9 commits June 5, 2023 21:05
Will need to remove provider in a separate version to provide a transition path as removing this will break terraform and leave orphans in the state
Standardize config objects for patterns as well
@bonclay7 bonclay7 marked this pull request as draft June 6, 2023 16:18
@bonclay7 bonclay7 temporarily deployed to Observability Test June 7, 2023 11:45 — with GitHub Actions Inactive
bonclay7 added 2 commits June 7, 2023 13:45
…rafana

* origin/fix/adot-restart:
  Pre-commit
  Avoid DDoS with using 0.0.0.0
  Move external labels to resource attributes
@bonclay7 bonclay7 temporarily deployed to Observability Test June 7, 2023 11:50 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 7, 2023 13:27 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 7, 2023 18:13 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 7, 2023 18:39 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 7, 2023 19:18 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 7, 2023 20:52 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 7, 2023 21:14 — with GitHub Actions Inactive
@bonclay7 bonclay7 marked this pull request as ready for review June 8, 2023 11:23
@bonclay7 bonclay7 temporarily deployed to Observability Test June 8, 2023 11:23 — with GitHub Actions Inactive
Copy link
Contributor

@elamaran11 elamaran11 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bonclay7 LGTM. This is lot of amazing work. We should test it a few times with e2e before merge.

@bonclay7 bonclay7 temporarily deployed to Observability Test June 9, 2023 09:18 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 9, 2023 11:39 — with GitHub Actions Inactive
* Fixing SSM

* Fixing SSM

* Replacing Secrets Manager with SSM

* Replacing Secrets Manager with SSM
@bonclay7 bonclay7 temporarily deployed to Observability Test June 9, 2023 11:41 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 9, 2023 12:07 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 9, 2023 12:08 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 9, 2023 13:07 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 9, 2023 13:07 — with GitHub Actions Inactive
elamaran11 and others added 3 commits June 9, 2023 11:35
…into cleanup/grafana

* origin/feature/grafanaOperatorVersion:
  Fixing Grafana Operator Version
@bonclay7 bonclay7 temporarily deployed to Observability Test June 9, 2023 15:40 — with GitHub Actions Inactive
@bonclay7 bonclay7 temporarily deployed to Observability Test June 9, 2023 16:27 — with GitHub Actions Inactive
Copy link
Contributor

@lewinkedrs lewinkedrs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@bonclay7 bonclay7 merged commit fa38a90 into main Jun 12, 2023
@bonclay7 bonclay7 mentioned this pull request Jun 12, 2023
5 tasks
@bonclay7 bonclay7 deleted the cleanup/grafana branch July 28, 2023 07:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants