Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ time = "0.3"
colored = "2.0"
chrono = "0.4"
docker-sync = { version = "0.1.2", optional = true }
k8s-openapi = { version = "0.13.0", features = ["v1_21"] }
k8s-sync = { version = "0.2.3", optional = true }
hyper = { version = "0.14", features = ["full"], optional = true }
tokio = { version = "1.26.0", features = ["full"], optional = true }
Expand Down
4 changes: 4 additions & 0 deletions helm/scaphandre/templates/daemonset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ spec:
{{- end }}
{{- end }}
env:
- name: KUBERNETES_NODE_NAME
valueFrom:
fieldRef:
fieldPath: spec.nodeName
Comment thread
bpetit marked this conversation as resolved.
{{- if .Values.scaphandre.rustBacktrace }}
- name: RUST_BACKTRACE
value: '{{ .Values.scaphandre.rustBacktrace }}'
Expand Down
16 changes: 15 additions & 1 deletion src/exporters/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ use crate::sensors::{
utils::{IProcess, current_system_time_since_epoch},
};
use chrono::Utc;
use clap::ArgMatches;
use docker_sync::{container::Container, Docker};
use k8s_sync::kubernetes::Kubernetes;
use k8s_sync::ListOptional;
use k8s_sync::Pod;
use std::collections::HashMap;
use std::env;
use std::fmt;
use std::time::Duration;
use utils::get_scaphandre_version;
Expand Down Expand Up @@ -856,7 +862,15 @@ impl MetricGenerator {
fn gen_kubernetes_pods_basic_metadata(&mut self) {
if self.watch_kubernetes {
if let Some(kubernetes) = self.kubernetes_client.as_mut() {
if let Ok(pods_result) = kubernetes.list_pods("".to_string()) {
let node_name = env::var("KUBERNETES_NODE_NAME").unwrap_or_default();
let selector = format!("spec.nodeName={}", node_name);
let mut list_options = ListOptional {
..Default::default()
};
if !node_name.is_empty() {
list_options.field_selector = Some(&selector);
Comment thread
bpetit marked this conversation as resolved.
}
if let Ok(pods_result) = kubernetes.list_pods("".to_string(), list_options) {
self.pods = pods_result;
debug!("Found {} pods", &self.pods.len());
} else {
Expand Down
Loading