Skip to content

Commit

Permalink
support scraping metadata from Kubernetes log files on Windows
Browse files Browse the repository at this point in the history
This implements the changes from #19799, including the suggested fix for
the failing test. I've been running the change with the path separator
successfully for 5 months now.
  • Loading branch information
damoxc committed Oct 15, 2024
1 parent 9bd2593 commit 5d75ac6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/sources/kubernetes_logs/path_helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub(super) fn build_pod_logs_directory(
///
/// Inspired by <https://github.com/kubernetes/kubernetes/blob/31305966789525fca49ec26c289e565467d1f1c4/pkg/kubelet/kuberuntime/helpers.go#L186>
pub(super) fn parse_log_file_path(path: &str) -> Option<LogFileInfo<'_>> {
let mut components = path.rsplit('/');
let mut components = path.rsplit(std::path::MAIN_SEPARATOR);

let _log_file_name = components.next()?;
let container_name = components.next()?;
Expand Down
5 changes: 3 additions & 2 deletions src/sources/kubernetes_logs/pod_metadata_annotator.rs
Original file line number Diff line number Diff line change
Expand Up @@ -752,9 +752,10 @@ mod tests {

#[test]
fn test_annotate_from_file_info() {
let path = ["var", "log", "pods", "sandbox0-ns_sandbox0-name_sandbox0-uid", "sandbox0-container0-name", "1.log"].iter().collect::<PathBuf>();
let cases = vec![(
FieldsSpec::default(),
"/var/log/pods/sandbox0-ns_sandbox0-name_sandbox0-uid/sandbox0-container0-name/1.log",
path,
{
let mut log = LogEvent::default();
log.insert(event_path!("kubernetes", "container_name"), "sandbox0-container0-name");
Expand All @@ -766,7 +767,7 @@ mod tests {
container_name: OwnedTargetPath::event(owned_value_path!("container_name")).into(),
..Default::default()
},
"/var/log/pods/sandbox0-ns_sandbox0-name_sandbox0-uid/sandbox0-container0-name/1.log",
path,
{
let mut log = LogEvent::default();
log.insert(event_path!("container_name"), "sandbox0-container0-name");
Expand Down

0 comments on commit 5d75ac6

Please sign in to comment.