update tf charm to include metrics endpoint - Prometheus #133
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
plars
requested changes
Oct 18, 2023
There was a problem hiding this comment.
You'll see that I also pushed a few changes in here to make the tests pass again, and add the missing charm libraries. There's one workflow still failing, but that one fails because you pushed this to your repo instead of the canonical one. Just make sure to push it to the canonical one next time
| @@ -7,3 +7,7 @@ options: | |||
| default: 10 | |||
| description: Number of seconds to wait for keepalive connections | |||
| type: int | |||
| api_port: | |||
There was a problem hiding this comment.
Remove this section, we don't need api_port in the config, and it was actually recommended that we do not do this. Hardcoding things like this may seem unusual, but there's really no reason for it to change, and removing the option reduces the chances for config mismatches.
charm/src/charm.py
Outdated
| jobs=[ | ||
| { | ||
| "static_configs": [ | ||
| {"targets": [f"*:{self.config['api_port']}"]} |
There was a problem hiding this comment.
make sure to also remove the config item here
charm/src/charm.py
Outdated
| @@ -80,7 +94,7 @@ def _require_nginx_route(self): | |||
| charm=self, | |||
| service_hostname=self.config["external_hostname"], | |||
| service_name=self.app.name, | |||
| service_port=5000, | |||
| service_port=self.config["api_port"], | |||
charm/src/charm.py
Outdated
| @@ -162,7 +176,7 @@ def _pebble_layer(self): | |||
| "--keep-alive", | |||
| keepalive, | |||
| "--bind", | |||
| "0.0.0.0:5000", | |||
| f"0.0.0.0:{self.config['api_port']}", | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Expose Prometheus metrics endpoint for COS lite
Resolved issues
https://warthogs.atlassian.net/browse/CERTTF-203
Tests
Tested via Juju / microK8s
Added "api_port" to config.yaml to make the multiple references to this API port dynamic, helpful with add'l references for the metrics endpoint.