enhancement: adding env/container labels options #407
Merged
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
BryanQuigley
force-pushed
the
add_allowlists
branch
from
21d6276
to
0d56a21
Compare
github-actions
bot
added
enhancement
Docs Build 📝Thank you for contribution!✨ This PR has been merged and the docs are now incorporated into |
BryanQuigley
force-pushed
the
add_allowlists
branch
from
0d56a21
to
61cc69c
Compare
github-actions
bot
added
enhancement
BryanQuigley
force-pushed
the
add_allowlists
branch
from
61cc69c
to
046020a
Compare
github-actions
bot
added
enhancement
|
The failures seem unrelated to the PR - failing to pull image. |
BryanQuigley
force-pushed
the
add_allowlists
branch
from
046020a
to
9e9f3ef
Compare
github-actions
bot
added
enhancement
|
@gardar are you the right person to review? Thanks! |
gardar
requested changes
Aug 21, 2024
| cadvisor_store_container_labels: | ||
| description: "do not store all container labels" | ||
| type: "bool" | ||
| default: false |
There was a problem hiding this comment.
Shouldn't this be
Suggested change
| default: false | |
| default: true |
as defined in defaults/main.yml? Or should defaults/main.yml perhaps be set to false?
There was a problem hiding this comment.
Sorry, you are correct. Updating description too
BryanQuigley
force-pushed
the
add_allowlists
branch
from
9e9f3ef
to
e04f959
Compare
github-actions
bot
added
enhancement
|
Thanks! Just wanted to double check if any other action is needed before merging. |
Add following
- cadvisor_env_metadata_whitelist
- cadvisor_whitelisted_container_labels
- cadvisor_store_container_labels
Tested with this simple playbook:
---
- name: Install cAdvisor
hosts: localhost
become: yes
tasks:
- name: Import cAdvisor role
import_role:
name: cadvisor
vars:
cadvisor_docker_only: true
cadvisor_enable_metrics: [ "cpu", "memory", "network", "oom_event" ]
cadvisor_whitelisted_container_labels: [ "com.docker.compose.oneoff" ]
cadvisor_env_metadata_whitelist: [ "JEKYLL_ENV", "PATH" ]
cadvisor_store_container_labels: false
Also tested dropping the options, which is why I decided to explicitly set
store_container_labels: true (which is the cadvisor default).
Closes: prometheus-community#403
Signed-off-by: Bryan Quigley <[email protected]>
gardar
force-pushed
the
add_allowlists
branch
from
e04f959
to
39eddc9
Compare
github-actions
bot
added
enhancement
No sorry, I just needed to fix up the CI config a bit for the tests to pass successfully. |
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.
Add following
Tested with this simple playbook:
Also tested dropping the options, which is why I decided to explicitly set store_container_labels: true (which is the cadvisor default).
Closes: #403