Commit Graph

102 Commits

Author SHA1 Message Date
Rodrigue Koffi e04d736e76 chore: Bump to EKS 1.28 (#248)
Bump to EKS 1.28
2023-12-18 17:06:36 -05:00
rlanore dee3dcb3da fix: eks 1.28 migrate kubectl provider to alekc repo (#245)
Migrate kubectl provider to alekc repo

Migrate kubectl provider to alekc repo
2023-12-14 20:46:29 +01:00
Rodrigue Koffi 20ae14498a Update cross cluster examples with additional options (#239) 2023-11-14 11:25:10 +01:00
Ruchika Modi 70405b9732 Adding Module and Example for ECS cluster monitoring with ecs_observer (#211)
* Adding Module and Example for ECS cluster monitoring with ecs_observer

* Adding Module and Example for ECS cluster monitoring with ecs_observer

* Incorporating PR comments

* Restructuring Examples and modules folder for ECS, Added content in main Readme

* Fixing path as per PR comments

* Parameterzing the config files, incorporated PR review comments

* Adding condition for AMP WS and fixing AMP endpoint

* Adding Document for ECS Monitoring and parameterized some variables

* Added sample dashboard

* Adding Document for ECS Monitoring and parameterized some variables

* Fixing failures detected by pre-commit

* Fixing failures detected by pre-commit

* Fixing failures detected by pre-commit

* Pre-commit fixes

* Fixing failures detected by pre-commit

* Fixing failures detected by pre-commit

* Pre-commit

* Fixing HIGH security alerts detected by pre-commit

* Fixing HIGH security alerts detected by pre-commit

* Fixing HIGH security alerts detected by pre-commit, 31stOct

* Add links after merge

* 2ndNov - Added condiotnal creation for Grafana WS and module versions for AMG, AMP

---------

Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>
2023-11-02 12:53:32 +01:00
Rafael Pereyra a6c0875586 Added updated example for traffic generator (#230)
* Added updated example for traffic generator

* Updated readme and docs

* Pre-commit fixes
2023-09-07 15:48:44 +02:00
Venkat Penmetsa d7daeb8c22 EKS Cross Account Observability using central AMP (#213)
* Added example for multi-cluster eks-monitoring and made changes to eks-monitoring module to allow cross-cluster IRSA

* Updated eks-monitoring module's README to add the variable description

* Hard-coded grafana license type in eks-cross-cluster-with-amp/main.tf

* Added README page for eks-cross-account-with-central-amp

* Extracted out the eks/amg creation and modified it to use existing resources

* Update README.md to add multiaccount dashboard png

* Updated README.md and multiaccount.md to add eks multiaccount png

* Updated eks-cross-cluster-with-amp example to disable dashboard creation for cluster 2

* Pre commit changed committed

* Fixed cross-account-observability docs and README.md and added variable for amp_workpace_alias

* Removed extra spacing in multiaccount.md and added precommit suggested changes

* Modified cross-account-observability example to change cross-account-amp-role to snake_case

* Capitalized Terraform string in multiaccount.md and converted iam-role-attach to snake_case

---------

Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>
2023-09-01 12:55:44 -04:00
Rajat Omar 97177eea04 EKS container insights (#204)
* adot-container-insight-tf-code by Rajat Omar

* Documentation and naming convention added

* PR review fixes

* PR CI pipeline fixes

* pr ci run fixes

* added the variables mentioned in ci build

* ci variable fixes

* changed the module name

---------

Co-authored-by: Omar <merajat@3c0630162a5a.ant.amazon.com>
2023-08-09 18:23:54 +02:00
Jens-Uwe Walther 4d88d16cb6 Add Kubernetes admin dashboards for api-server (#208)
* added workqueue related and apiserver_storage_db_total_size_in_bytes (available since K8s/EKS v1.26+) metrics into kube-admin scrape job

* chnanged OTEL scrape config and recording rules file to make apiserver Grafana dashboards working

* added APISERVER Grafana dashboards into variables, Flux kustomization

* added original kube-prom-stack kube-apiserver scrape config into OTEL

* Revert "added original kube-prom-stack kube-apiserver scrape config into OTEL"
because this scrape config does not work :-(

This reverts commit 715db895c656af09430e3d6ada2087bd1828413f.

* added API server troubleshoting dashboard

* removed empty line for clarity

* make API serve rmonitoring default to true but can be disabled as well

* Update eks-apiserver.md

* updated eks-monitoring/README.md according to pre-commit

---------

Co-authored-by: Jens-Uwe Walther <waltju@amazon.com>
2023-08-09 16:53:16 +02:00
Rodrigue Koffi 6f973b95f9 fix: EKS cluster example (#200)
* Bump eks blueprint version

* Default EKS cluster version to 1.25

* fixup! Bump eks blueprint version

* Pre-commit docs
2023-08-01 13:17:33 -04:00
Dave Shimko 1ceecb3041 Add EKS Istio Dashboards (#194)
* Update readme

* checking in new readme example

* new istio readme

* Updated mkdocs.yml

* checking in readme files

* checking in all changes

* Test

* Test

* Test

* Testing

* Testing

* test

* Update main.tf

* Update outputs.tf

* Adding Istio dashboards

* Updating URL's

* Removing dashboards

* Updates from pre-commit

* Update istio.md

* Removing empty file

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update README.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update istio.md

* Update README.md

* Update README.md

* Istio Documentation Updates

Added istioctl prereq, updated dashboards image

* Updated setup and cleanup of Istio Bookinfo

Updated Istio Bookinfo sample app instructions, included clean up of Bookinfo resources

* Updating image and removing advanced configuration

-Switching image to Github generated link
-Removing advanced configuration section

---------

Co-authored-by: Prithvi Reddy <ypreddy@amazon.com>
Co-authored-by: Prithvi Reddy <47993564+preddy727@users.noreply.github.com>
2023-07-27 18:44:52 +02:00
Rodrigue Koffi de8c1233ee eks-monitoring minor fixes (#182)
* Grafana URL should not be required at all times

* Enable ADOT OTLP receiver on 0.0.0.0

* Fix variable name

* Update helm release version
2023-06-14 17:23:34 +02:00
Rodrigue Koffi 86d0831248 Remove Grafana provider for EKS (#179)
* Remove Grafana provider for EKS

* Drop provider

* Add provider constraint config
2023-06-12 20:40:54 +02:00
Rodrigue Koffi fa38a90efc Move all dashboards to GitOps (#175)
* Typo

* Remove Grafana provider

* Temp: move dashbaords to gitOps

* Move external labels to resource attributes

* Avoid DDoS with using 0.0.0.0

* Pre-commit

* Transition in two steps

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

* Move patterns' dashboards creation to gitOps

Standardize config objects for patterns as well

* Pre-commit

* Create AMP dashboard from external source with Grafana provider

* Fix deprecated option

* Fix Flux requirements

* Run pre-commit

* Update example with operator

* Cleanup examples

* Update multicluster example

* Update multicluster example

* Drop dead variable

* Update docs

* Change GitOps branch name

* Update docs

* Replacing Secrets Manager to SSM to store Grafana API Key (#178)

* Fixing SSM

* Fixing SSM

* Replacing Secrets Manager with SSM

* Replacing Secrets Manager with SSM

* Update architecture diagram

* Update architecture diagram

* Update README.md

* Update index.md

* Fixing Grafana Operator Version

* Fix multicluster example

* Update docs

---------

Co-authored-by: Ela AWS <51791117+elamaran11@users.noreply.github.com>
Co-authored-by: Elamaran Shanmugam <elamaran.shan@gmail.com>
2023-06-12 18:00:42 +02:00
Rodrigue Koffi 1f16bec27f Update docs (#172) 2023-06-06 08:19:22 +02:00
Ela AWS 0392f5bda0 Using GitOps with Grafana Operator to create Grafana Dashboard with Flux. (#164)
* Grafana With GitOps Feature

* Grafana With GitOps Feature

* Grafana With GitOps Feature

* Fix setup logs retention policy (#169)

* Fixing GitOps Repo

* Commenting out the NodeExp Dash

* Commenting out the NodeExp Dash

* Adding all Grafana Dashboards

* Adding all Grafana Dashboards

* Fixing Grafana Operator Version and cleaning full boards

* Fixing Grafana Operator Version and cleaning full boards

* Fixing Grafana Operator Version and cleaning full boards

* Fixing Grafana Operator Version and cleaning full boards

* Fixing Grafana Operator Version and cleaning full boards and PR Issues

* Fixing Grafana Operator Version and cleaning full boards and PR Issues

* Fixing Grafana Operator Version and cleaning full boards and PR Issues

* Fixing Grafana Operator Version and cleaning full boards and PR Issues

* Fixing Grafana Operator Version and cleaning full boards and PR Issues

* Fixing Grafana Operator Version and cleaning full boards and PR Issues

---------

Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>
2023-06-05 11:11:30 +02:00
Rodrigue Koffi 2737eb9d4d Grafana v9.4 (#168)
* Bump Grafana example to v9.4

* Re-order multi-cluster

* Update docs
2023-06-01 11:37:10 +02:00
Rodrigue Koffi 0c4407638a Update dependencies (#167)
* Lint file

* Update dependencies

* Update badges

* Bump terraform versions

* Temp allow run on current branch

* Run tests on push
2023-06-01 10:55:35 +02:00
Rodrigue Koffi 850ce8075f Plan tests (#166)
* Updated plan-examples.yml to support e2e tests for multi cluster example (#165)

* Updated plan-examples.yml to support e2e tests for multi cluster example

* Put the variables in right place with right values

* (to drop): Allow running tests in branch

---------

Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>

* Force running tests

* Update plan-examples.yml

---------

Co-authored-by: Vijay Chintalapati <Vijay.Chintalapati@gmail.com>
2023-05-31 17:19:05 +02:00
Vijay Chintalapati b84e9b800f Addition of EKS multi-cluster observability example (#155)
* Adding EKS multicluster observability example

* EKS multicluster example - precommit fix

* Corrected the path to an example

* Made the multicluster example simpler

* Pre-commit changes

* Saved the images to Github and linked them in docs

* Comments and language edits

* Fix trailing spaces

* Non-controversial naming and simpler variables

* Added region to the data gathering

* Formatting changes

---------

Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>
2023-05-16 10:33:23 -04:00
Ela AWS 5b52c7b8e1 GitOps support with Grafana Operator, External Secrets and FluxCD (#151)
* Adding FluxCD and Grafana Operator Addons

* Adding Helm release for Grafana Operator

* Adding External Secrets

* removing spot options

* Fixing Documentation
---------
2023-04-14 10:20:24 +02:00
Rodrigue Koffi b513fe4e72 Move plan tests to AWS CodeBuild (#152)
* Add plan test on CodeBuild

* (to revert) remove changes filter

* (to revert) allow running on current branch

* (to revert) run assume role always

* Fix terraform state s3 keys for ci tests

* Add defaults for e2e

* Fix bucket name

* Debug clone version

* Pass build version

* Use actions env syntax

* fixup! Use actions env syntax

* fixup! fixup! Use actions env syntax

* fixup! fixup! fixup! Use actions env syntax

* Add input for amp monitoring

* Update e2e cluster name

* use credentials v2

* Cleanup

* Add build badge

* Revert triggers settings
2023-04-13 15:23:35 +02:00
Garrett Johnson eb5f294606 Remove terraform.tfvars from example (#150)
* Remove terraform.tfvars, use variables.tf for defaults

* Run pre-commit

---------

Co-authored-by: gjohnson <garrjh@amazon.com>
Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>
2023-04-13 12:21:19 +02:00
Vijay Chintalapati f708659758 Publish dashboards only if grafana folder exists (#148) 2023-04-06 22:02:39 +02:00
Rodrigue Koffi a97568034a EKS cluster example updates (#144)
* doc: Update EKS example

* Bump eks blueprint version

* Bump eks blueprint version
2023-03-30 21:11:05 +02:00
Rodrigue Koffi 4019db6cd7 Support Fluentbit to CloudWatch logs (#140)
* Import and customize fluenbit add-on

* Enable fluent bit logs

* Bump helm addon version

* Dropping account id as it seems to create scraping errors

* Create separate log groups per namespace

* Apply pre-commit

* Remove conflicting global label

* Add config object for logs

* Enable logs in examples

* Add logs docs

* Fix broken link

* Add screenshots

* Update docs

* Typos
2023-03-30 15:48:40 +02:00
Soto Sugita c358008f92 Added missing cluster name variable (#142)
* Added missing cluster name variable

Added missing cluster name variable.

* update docs
2023-03-29 12:10:48 +02:00
Luis Amaral 1ee09d2c1a Lsa/resource name length i#118 (#135)
* Validation added to cluster_name variable

* Update ref to eks-cluster-with-vpc on v4.13.1 (#121)

* Added cluster_name validation with message (#118)

* Error message typo fixed to follow the standards.

* Adding requested new line at the end
2023-03-28 09:48:09 +02:00
Rodrigue Koffi 71b6f352bf Amazon Managed Grafana setup (#133)
* Managed Grafana Workspace with Identity Centre Users (#83)

* update kuberenetes and instance type

* initial setup of managed grafana workspace and identity centre identities

* cleanup

* run precommit

* output grafana workspace ID

* add identity store id variable

* remove API key

* update outputs naming convention as per terraform guidelines

* update docs and add versions

* update variables type

* update naming conventions

* add managed policy arn for querying promethues

* update readme

* update workshop references to this

* add role arn type

* cleanup and simplification

* remove workshop

---------

Co-authored-by: charlie keegan <chakeega@amazon.com>
Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>

* Rename example

* Update grafana example and base module references

* Update example's reference

* Cleanup and docs ref

* Add docs

* Update docs

* TODO: add link after merge

* Update managed-grafana.md

---------

Co-authored-by: Charlie Keegan <91210223+charliekeeegan@users.noreply.github.com>
Co-authored-by: charlie keegan <chakeega@amazon.com>
Co-authored-by: Mark Beacom <7315957+mbeacom@users.noreply.github.com>
2023-03-20 18:44:49 +01:00
Rodrigue Koffi 663404598a Improve docs readability (#127)
* Improve docs readability

* Fix numerotation that renders 1s
2023-02-24 20:33:17 +01:00
Rodrigue Koffi daed34db80 Compose EKS monitoring modules (#115)
* Move modules around

* Update amp billing source

* Merge Java monitoring to EKS

* Update docs

* Merge nginx pattern

* Pre-commit

* Add save and test URL output

* Move EKS dependencies to EKS monitoring module

* update docs

* Update examples and docs

* Add java doc

* Add NGINX doc

* Update nginx doc

* Fix amp monitoring example path

* Fix pre-commit

* Todo: move to main after merge

* Update docs, fix tags
2023-02-20 18:36:08 +01:00
Luis Amaral fe83579997 Update ref to eks-cluster-with-vpc on v4.13.1 (#121) 2023-02-19 22:19:57 +01:00
Rodrigue Koffi b617f8d04e Enhance Java dashboard (#114)
* Enhance Java dashboards visuals

- migrate panels versions
- apply rate functions on counters
- dynamic datasource

* Update screenshot

* Update dashboard screenshot

* fixup! Update dashboard screenshot
2023-02-09 15:18:45 +01:00
Rafael Pereyra 2d452be57f Added parameter for instance type (#91)
* Added parameter for instance type
See #89.
Added a variable to change the default instance type for the EKS Cluster

* Added additional parameters for size and version
2023-01-26 21:38:19 +01:00
Rodrigue Koffi e68a9307e4 Revert back to t3 for general availability (#90) 2023-01-26 18:04:21 +01:00
Charlie Keegan 3c82cf82cf update kuberenetes and instance type (#81)
Co-authored-by: charlie keegan <chakeega@amazon.com>
Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>
2023-01-20 12:46:13 +01:00
Kevin Lewin 0f60fb8a8d Docs (#69)
* working first run

* removing core module dependencies

* adding CW datasource

* alarms MVP

* readmes

* Adding Screenshot

* Adding billing note

* adding billing module

* Revert "adding billing module"

This reverts commit 40d667e37db1036cd71a471ef2fde83ec02aaa13.

reverting

* adding billing module

* Updating Screenshot

* resolving feedback

* removing unused modules

* fmt

* Support for tf 1.3.x

* removing unused variables

* support alarms for multiple workspaces

* Updating Readme

* docs first draft

* indigo nav fix

* Simplify docs

* RUM White Logo

* amp docs

* removing billing docs

* Change docs structure, reword infrastructure monitoring doc

* Pre-commit fixes

* drop dead code

* Add concepts page

* Update contributors

* Update java

* Update docs

* Docs for workloads

* Update docs site

* typos

* pre-commit fixes

* Update pre-commit

* Update pre-commit

Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>
2023-01-09 17:03:08 -05:00
Kevin Lewin 07545aca27 AMP Observability Pattern (#55)
* working first run

* removing core module dependencies

* adding CW datasource

* alarms MVP

* readmes

* Adding Screenshot

* Adding billing note

* adding billing module

* Revert "adding billing module"

This reverts commit 40d667e37db1036cd71a471ef2fde83ec02aaa13.

reverting

* adding billing module

* Updating Screenshot

* resolving feedback

* removing unused modules

* fmt

* Support for tf 1.3.x

* removing unused variables

* support alarms for multiple workspaces

* Updating Readme

* amp to managed prometheus

* sub-module

* Fix pre-commit

Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>
2022-12-09 10:49:55 -05:00
Rodrigue Koffi 54c810e1a9 Add support for tf 1.3+ (#58)
* Add support for tf 1.3+

* Bump min version

* Bump blueprint version
2022-10-25 15:57:37 +02:00
Kevin Lewin 46ffad7bd2 Updating Screenshot (#54) 2022-10-17 18:19:57 +02:00
Kevin Lewin a5a444ee65 Java dev (#52)
* Update Java module

* Add java example

* Updating Readme

* Updating Readme Images

* Pre-commit

* Fixing readme screenshot

* Update README.md

Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>
2022-10-14 19:12:14 +02:00
Rodrigue Koffi 4fdb719f32 doc: Update Managed Grafana instructions (#51)
* Update README.md

* Update README.md

* Add Grafana workspace id as output

* Fix instructions
2022-10-10 16:26:28 +02:00
Rodrigue Koffi 6032c6da23 feat: Default scrape interval (#49)
* Enable higher but configurable scrape intervals

* Use global parameters per job level

* Remove scrape limit
2022-10-04 18:20:14 +02:00
Rodrigue Koffi 27e9cc84ea Add dashboards output (#46) 2022-09-29 10:40:28 +02:00
Rodrigue Koffi 3b1b530050 Pre-commit fixes (#44)
* Pre-commit fixes

* Restrict terraform version to < 1.3.0

* fixup! Restrict terraform version to < 1.3.0

* fixup! Restrict terraform version to < 1.3.0

* Pinned min version to 1.1.0, support for nullable

* Update README.md
2022-09-27 23:40:14 +02:00
Kevin Lewin 9f0b90ab2f Nginx module source (#35)
* working module

* metrics work

* Add dynamic targets

* dashboards and rules

* readme and outputs

* updating readme

* Update scrape config

- Drop unused go metrics
- Drop empty labels
- Add host, container and namespace labels

* Update tags and query labels

Co-authored-by: EC2 Default User <ec2-user@ip-172-31-9-72.us-west-2.compute.internal>
Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>
2022-09-27 16:00:55 +02:00
Rodrigue Koffi c9f783db11 Setup actions for pre-commit (#34)
* Setup actions for pre-commit

* Link check

* To drop

* Edit path

* Pre-commit badge

* Revert "Edit path"

This reverts commit ccd5c09bf8da61489ec8c2bfa35f6ac8c0a61005.

* Revert "To drop"

This reverts commit a3ccee05faabff7ba28b600acc83cea3f018414f.

* Setup plan for examples

* Remove dead code
2022-09-23 16:18:52 +02:00
Rodrigue Koffi 54b38e72a8 Update README.md 2022-09-22 15:03:23 +02:00
Rodrigue Koffi 1511a57216 Use short-lived Grafana API keys (#33)
* Use short-lived Grafana API keys

* Reduce API key TTL
2022-09-19 17:24:47 +02:00
Rodrigue Koffi 3451706315 Fixes (#32)
* Apply pre-commit

* Pin dependencies modules
2022-09-19 09:01:17 +02:00
Rodrigue Koffi aea69380dc Update README.md 2022-09-13 22:16:51 +02:00