Commit Graph

58 Commits

Author SHA1 Message Date
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 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
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 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
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
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
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
Rodrigue Koffi d98bfe089e Update README.md 2022-09-09 09:58:05 +02:00
Rodrigue Koffi f273622780 Add example tfvars 2022-09-08 21:05:15 +02:00
Rodrigue Koffi 6266c639c8 Merge pull request #18 from aws-observability/docs-and-wording
Apply pre-commit
2022-09-07 18:39:29 +02:00
Rodrigue Koffi 9831f1b56e Apply pre-commit 2022-09-07 18:31:48 +02:00
Rodrigue Koffi dd45719611 Merge pull request #17 from aws-observability/docs-and-wording
Update wording
2022-09-07 17:54:29 +02:00
Rodrigue Koffi a16cf6c568 Update wording 2022-09-07 17:53:48 +02:00
Rodrigue Koffi d9e2fd463d Update README.md 2022-09-07 15:14:34 +02:00
Rodrigue Koffi cc7bc86c0a Update README.md 2022-09-07 15:12:32 +02:00
Rodrigue Koffi e0afa65b54 Update README.md 2022-09-07 15:10:43 +02:00
Imaya Kumar Jagannathan ee1b46456d Update README.md 2022-09-07 09:08:32 -04:00
Imaya Kumar Jagannathan 7e5fcf9ef8 Update README.md 2022-09-07 09:06:13 -04:00
Imaya Kumar Jagannathan 9895ec7a00 Update README.md 2022-09-07 09:05:45 -04:00
Rodrigue Koffi d740403d7b Pre commit fixes 2022-09-07 12:41:45 +02:00
Rodrigue Koffi 9437a97285 Support implicit new AMP creation 2022-09-01 15:34:27 +02:00
Rodrigue Koffi 0f4300bc3e Update README.md 2022-09-01 13:03:00 +02:00
Rodrigue Koffi 3c6406e1ba Update README.md 2022-09-01 12:58:06 +02:00
Rodrigue Koffi 690513ef7b cosmetics 2022-08-31 11:38:35 +02:00
Rodrigue Koffi 31e0b085bb Update README.md 2022-08-30 20:35:20 +02:00
Rodrigue Koffi 0d290d13dd Update README.md 2022-08-30 20:11:22 +02:00
Rodrigue Koffi 05511992e9 Chore 2022-08-30 19:59:34 +02:00
Rodrigue Koffi 2615cac24a Redirect new EKS cluster to the blueprint 2022-08-30 17:53:12 +02:00
Rodrigue Koffi 680a42488c Update doc 2022-08-29 19:24:40 +02:00
Rodrigue Koffi 330227fa52 Update README.md 2022-08-29 12:01:03 +02:00
Rodrigue Koffi 80d7acf45a Add example doc 2022-08-29 11:51:22 +02:00
Bonthu df314a4759 Org updated to repo 2022-08-26 17:30:03 +02:00
Rodrigue Koffi 60ab8b13bf Update docs 2022-08-26 17:30:03 +02:00