Commit Graph

203 Commits

Author SHA1 Message Date
Rodrigue Koffi 3526f8f7c4 Update CONTRIBUTING.md 2023-08-04 11:00:27 +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 4a660da643 Fixing broken link (#197) 2023-07-28 09:14:43 +02: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 7f60bd72d6 Cleans up alert rules (#192) 2023-07-15 15:55:31 +02:00
Rodrigue Koffi f29113f4da Fluentbit improvements (#189)
* Bump chart version

* Take only log message

* Add multiline parsing

* Add variable config for refresh interval
2023-07-13 18:58:14 +02:00
Rodrigue Koffi 08b4be1490 ADOT collector scrape improvements (#188)
* Bump default scrape interval to 120s

* fixup! Bump default scrape interval to 120s
2023-07-07 09:44:45 -04:00
Rodrigue Koffi d7ebf26c77 Update contributors.md 2023-06-30 16:06:47 +02:00
Rodrigue Koffi 739b581988 K8s operator metrics (#185)
* Add kube admin metrics

* Update chart version

* Variable verbosity level for adot collector
2023-06-29 08:52:41 -04:00
Rodrigue Koffi a7633d1548 fix(doc): EKS custom metrics collection (#184)
* Quickfix eks custom metrics collection

* Fix ssm overwrite required
2023-06-21 18:17:52 +01:00
Ela AWS c705238f0c Fixing Documentation issues with Secrets Manager (#183)
* Fixing Documentation issues with Secrets Manager

* Fixing Documentation issues with Secrets Manager
2023-06-16 17:25:32 +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
Ela AWS 905400a4bb Fixing SSM Parameter Issue (#180) 2023-06-12 20:46:18 +02:00
Rodrigue Koffi f7b0b8ff5c Update README.md 2023-06-12 20:41:49 +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
Ela AWS c5e4c0c718 Fixing commadn issue (#177) 2023-06-07 15:25:02 +02:00
Rodrigue Koffi 3979910e50 Fix: collector failing to scrape targets (#174)
* Move external labels to resource attributes

* Avoid DDoS with using 0.0.0.0

* Pre-commit
2023-06-07 09:10:35 -04:00
Ela AWS 9b6b234922 Fixing breaking changes for path and dash urls (#173)
* Fixing breaking changes for path and dash urls

* Fixing breaking changes for path and dash urls

* Fixing breaking changes for path and dash urls

* Fixing breaking changes for path and dash urls
2023-06-06 09:59:51 +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 0d1c2ef8dd Add OTLP receiver for custom metrics (#170) 2023-06-02 13:26:03 -04:00
Rodrigue Koffi 9085af9285 Fix setup logs retention policy (#169) 2023-06-02 11:54:42 +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 0cc8dc52d9 Correcting the formatting issues in the markdown (#159) 2023-05-18 08:40:36 -04:00
Kevin Lewin 40bcc06563 adding multicluster docs (#157) 2023-05-16 11:12:39 -04: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
Vijay Chintalapati caeebe0e1a Make creation of Grafana Data Source and Folder configurable (#145)
* Made the cluster variable visible in dashboards

* Made the repo reusable with multiple EKS clusters

* Relabled the input variable from create_grafana_data_source to create_prometheus_data_source
2023-04-06 11:04:29 +02:00
Soto Sugita cd28d9975a Bump node-exporter chart to 4.14.0 (#143)
* Bump node-exporter chart to 4.14.0

* terraform docs
2023-04-05 11:19:18 +02:00
Imaya Kumar Jagannathan 0a1b971160 Fix folder path (#146)
Add "terraform-aws-observability-accelerator" to the path
2023-03-31 16:56:20 +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 cdd0eb7beb Fix drill down links in dashboards (#137) 2023-03-24 22:12:50 +01: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 0abea3c8a8 (chore): Issues and PRs CI updates (#134)
* Update PR templates

* Update stale PR & issues
2023-03-20 17:03:59 +01:00
Rodrigue Koffi 215933bd19 docs: improvements (#128)
Update docs
2023-02-27 20:56:12 +01:00
Kevin Lewin 5298fb04b2 updating Diagram (#129) 2023-02-27 14:52:15 -05:00
Munish Dabra a746df8d66 docs: update architecture with tracing (#126)
* Added amp+xray images for o11y-accelerator

Added draw.io and png images with AMP and X-Ray images for AWS Observability Accelerator

* updated doc with images

Updated doc with latest Observability accelerator architecture image and minor changes to draw.io and architicture diagram.

* added light and dark version of architecture diagram

Added draw.io and png files - both dark and light background version

* updated light background diagrams

updated light background diagrams

* Delete o11y-accelerator-amp-xray.drawio

* Delete o11y-accelerator-amp-xray.png

* Update dark-o11y-accelerator-amp-xray.png

* update

* moved images to docs

moved images to docs

* Delete dark-o11y-accelerator-amp-xray.drawio

* Delete dark-o11y-accelerator-amp-xray.png

* Delete light-o11y-accelerator-amp-xray.drawio

* Delete light-o11y-accelerator-amp-xray.png

---------

Co-authored-by: Rodrigue Koffi <bonclay7@users.noreply.github.com>
2023-02-24 20:44:40 +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
Kevin Lewin 77d7bf2aa3 adding pre-req (#123) 2023-02-20 14:47:28 -05:00
Rodrigue Koffi 96fd88be58 Update docs links (#122)
* Update links in doc

* Update broken link

* Apply consistency
2023-02-20 18:56:20 +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