Skip to content

Fix/#347 missing kubernetes pods metric labels #402

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

Open
notCamelCaseName wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Fix/#347 missing kubernetes pods metric labels #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4d917f5
Fixed container_id parsing from cgroup (at least for k3s)
notCamelCaseName Jan 7, 2025
0e2f728
Added taking into account KUBECONFIG environment variable
notCamelCaseName Jan 7, 2025
cc7d620
Removed forgotten dbg! macro call
notCamelCaseName Jan 7, 2025
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
3 changes: 2 additions & 1 deletion src/exporters/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,9 @@ pub fn get_docker_client() -> Result<Docker, std::io::Error> {

#[cfg(feature = "containers")]
pub fn get_kubernetes_client() -> Result<Kubernetes, KubernetesError> {
let kube_config_path = std::env::var("KUBECONFIG").ok();
match Kubernetes::connect(
Some(String::from("/root/.kube/config")),
kube_config_path,
None,
None,
None,
Expand Down
5 changes: 5 additions & 0 deletions src/sensors/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,11 @@ impl ProcessTracker {
}
if container_id.contains("cri-containerd") {
container_id = container_id.split(':').last().unwrap().to_string();
// cgroup name sometimes look like cri-containerd-[actual container_id] so we take
// that into account
if container_id.contains("cri-containerd") {
container_id = container_id.split('-').last().unwrap().to_string();
}
}
Ok(container_id)
}
Expand Down