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.

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

Add Cloudwatch metrics integration #2740

Merged
merged 43 commits into from
Jan 31, 2023
Merged

Add Cloudwatch metrics integration #2740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
0abc330
implemented and working
thepalbi Jan 12, 2023
dfb8708
working
thepalbi Jan 12, 2023
3c971b9
job definition wip
thepalbi Jan 13, 2023
48a11a4
full config translation and test
thepalbi Jan 16, 2023
9f42fd4
add missing period
thepalbi Jan 16, 2023
f7c87b4
design doc changes
thepalbi Jan 17, 2023
5cefa73
register in v2 integrations
thepalbi Jan 17, 2023
d5839d4
cleaning up integration and adding comments
thepalbi Jan 20, 2023
7d607ff
comments on opinionated settings
thepalbi Jan 20, 2023
f9a87c1
docs wip
thepalbi Jan 20, 2023
ac3a953
docs wip 2
thepalbi Jan 20, 2023
82c7530
update doc command
thepalbi Jan 23, 2023
ee78d12
docs wip 3
thepalbi Jan 23, 2023
f3ef014
docs ready
thepalbi Jan 23, 2023
f5acc7d
bumping yace
thepalbi Jan 23, 2023
67258f2
changing exporter implementation
thepalbi Jan 23, 2023
9159448
fix some post yace upgrade things
thepalbi Jan 23, 2023
2086cfd
fix common integration docs
thepalbi Jan 23, 2023
420bc3e
post double check fixes
thepalbi Jan 23, 2023
cee4ef7
fix tests
thepalbi Jan 23, 2023
04109f6
added entry in changelog
thepalbi Jan 24, 2023
794a700
linter passing
thepalbi Jan 24, 2023
fef4570
connect docs checker
thepalbi Jan 24, 2023
cb9118e
Update docs/sources/configuration/integrations/_index.md
thepalbi Jan 24, 2023
9c08d33
Update docs/sources/configuration/integrations/cloudwatch-exporter-co…
thepalbi Jan 24, 2023
d856212
better instance key
thepalbi Jan 24, 2023
e1c1788
docs fixes
thepalbi Jan 24, 2023
b5a6ba4
Update docs/sources/configuration/integrations/cloudwatch-exporter-co…
thepalbi Jan 25, 2023
f83a258
Apply suggestions from code review
thepalbi Jan 25, 2023
c68410c
making doc more clear
thepalbi Jan 25, 2023
0c99279
fix exposed handler
thepalbi Jan 26, 2023
53d6891
Merge branch 'main' into pablo/add-yace-integration
thepalbi Jan 30, 2023
90f250d
pr fixes
thepalbi Jan 30, 2023
45a52da
Move Config to config.go
thepalbi Jan 30, 2023
6f04743
Merge branch 'main' into pablo/add-yace-integration
thepalbi Jan 31, 2023
8ec4242
Update docs/sources/configuration/integrations/cloudwatch-exporter-co…
thepalbi Jan 31, 2023
6f1dc43
Apply suggestions from code review
thepalbi Jan 31, 2023
ce76a36
upload media to grafana media library
thepalbi Jan 31, 2023
a244981
Merge branch 'main' into pablo/add-yace-integration
thepalbi Jan 31, 2023
bbe6f1f
update changelog
thepalbi Jan 31, 2023
fdfcb3f
Merge branch 'main' into pablo/add-yace-integration
thepalbi Jan 31, 2023
5c747c5
wrong changes on changelog
thepalbi Jan 31, 2023
635b583
fix changelog
thepalbi Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Main (unreleased)

- Integrations: Introduce the `mssql` integration. (@binaryfissiongames)

- Integrations: Introduce `cloudwatch metrics` integration. (@thepalbi)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@marctc just fixed it. Terrible mistake trying to merge conflicts with the gh ui 🤦


### Enhancements

- Update Prometheus Node Exporter integration to v1.5.0. (@Thor77)
Expand Down
5 changes: 4 additions & 1 deletion docs/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ pull:
$(PODMAN) pull $(IMAGE)

.PHONY: docs
docs: pull
docs: check-cloudwatch-integration pull
$(PODMAN) run --init -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE)

check-cloudwatch-integration:
thepalbi marked this conversation as resolved.
Show resolved Hide resolved
docker run -v $(shell git rev-parse --show-toplevel):/repo -v $(shell pwd):/docs -w /repo golang:1.19.4-bullseye go run pkg/integrations/cloudwatch_exporter/docs/doc.go check /docs/sources/configuration/integrations/cloudwatch-exporter-config.md

sources/assets/hierarchy.svg: sources/operator/hierarchy.dot
cat $< | $(PODMAN) run --rm -i nshine/dot dot -Tsvg > $@
3 changes: 3 additions & 0 deletions docs/sources/configuration/integrations/_index.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ github_exporter: <github_exporter_config>
# Controls the blackbox_exporter integration
blackbox: <blackbox_config>

# Controls the CloudWatch exporter integration
cloudwatch_exporter: <cloudwatch_exporter_config>

# Automatically collect metrics from enabled integrations. If disabled,
# integrations will be run but not scraped and thus not remote_written. Metrics
# for integrations will be exposed at /integrations/<integration_key>/metrics
Expand Down
Loading