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

[JUJU-1688] Prometheus integration for Juju #20

Closed
wants to merge 11 commits into from
Closed

[JUJU-1688] Prometheus integration for Juju #20

wants to merge 11 commits into from

Conversation

barrettj12
Copy link
Contributor

@barrettj12 barrettj12 commented Mar 29, 2023 •
edited
Loading

Companion to juju/juju#15319.

This adds Prometheus integration to the controller charm using MetricsEndpointProvider in the prometheus-k8s library.

The controller charm needs to:

TODO

  • Check HA works
  • Handle multiple Prometheus relations correctly
  • Add new GitHub integration tests

@barrettj12
WIP for Prometheus integration
0d6cf6e 
- add metrics-endpoint relation
- configure MetricsEndpointProvider

TODO: add user on relation-joined, remove on relation-departed
@barrettj12
Use introspection commands
6147107
@barrettj12
Fix agent.conf path
90bf5e0 
- log introspect command
@barrettj12
rename remove_user to remove_metrics_user
a985f81 
- set scrape config to [] on relation_departed
@barrettj12
Add TODO for later
b939ca9
@barrettj12
Make scrape config persist between hooks
041b9a9 
Store user credentials for Prometheus in stored state, so we can
generate the correct scrape config on hook invocations
@barrettj12 barrettj12 mentioned this pull request Mar 29, 2023
Closed
@barrettj12 barrettj12 changed the base branch from master to 3.3 May 9, 2023 05:32
@barrettj12 barrettj12 mentioned this pull request Aug 16, 2023
Closed
5 tasks
@barrettj12
store metrics user password in relation data
a595723 
- don't log full introspection command - don't want to log passwords
@barrettj12
log msg fixes
fe74055
@jnsgruk
Copy link
Member

jnsgruk commented Sep 5, 2023

Just stumbled across this again, glad to see it :) Probably worth making sure we're using the latest version of the prometheus_scrape lib, which i think means you can drop the juju_topology lib from memory :)

@barrettj12
Copy link
Contributor Author

Thanks @jnsgruk, all done :)

@barrettj12
remove metrics user password caching
5e0bffa
@barrettj12
remove unit # from metrics username
971446c 
All units in a Prometheus app will share the same credentials.
@barrettj12 barrettj12 mentioned this pull request Sep 22, 2023
Merged
@barrettj12
Copy link
Contributor Author

Closing in favour of #28

@barrettj12 barrettj12 closed this Sep 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@barrettj12 @jnsgruk