dom
/
telegraf
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow jobs with dashes in the name in lustre2 input (#6313)

This commit is contained in:
Jesse Hanley 2019-08-26 22:03:35 -04:00 committed by Daniel Nelson
parent acedbe0633
commit 17a79e2d6f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/inputs/lustre2/lustre2.go
View File

@ -377,7 +377,7 @@ func (l *Lustre2) GetLustreProcStats(fileglob string, wantedFields []*mapping, a
if err != nil { if err != nil {
return err return err
} }
jobs := strings.Split(string(wholeFile), "-") jobs := strings.Split(string(wholeFile), "- ")
for _, job := range jobs { for _, job := range jobs {
lines := strings.Split(string(job), "\n") lines := strings.Split(string(job), "\n")
jobid := "" jobid := ""

6
plugins/inputs/lustre2/lustre2_test.go
View File

@ -42,7 +42,7 @@ cache_miss 11653333250 samples [pages] 1 1 11653333250
` `
const obdfilterJobStatsContents = `job_stats: const obdfilterJobStatsContents = `job_stats:
- job_id: testjob1 - job_id: cluster-testjob1
snapshot_time: 1461772761 snapshot_time: 1461772761
read_bytes: { samples: 1, unit: bytes, min: 4096, max: 4096, sum: 4096 } read_bytes: { samples: 1, unit: bytes, min: 4096, max: 4096, sum: 4096 }
write_bytes: { samples: 25, unit: bytes, min: 1048576, max: 1048576, sum: 26214400 } write_bytes: { samples: 25, unit: bytes, min: 1048576, max: 1048576, sum: 26214400 }
@ -92,7 +92,7 @@ crossdir_rename 369571 samples [reqs]
` `
const mdtJobStatsContents = `job_stats: const mdtJobStatsContents = `job_stats:
- job_id: testjob1 - job_id: cluster-testjob1
snapshot_time: 1461772761 snapshot_time: 1461772761
open: { samples: 5, unit: reqs } open: { samples: 5, unit: reqs }
close: { samples: 4, unit: reqs } close: { samples: 4, unit: reqs }
@ -207,7 +207,7 @@ func TestLustre2GeneratesJobstatsMetrics(t *testing.T) {
tempdir := os.TempDir() + "/telegraf/proc/fs/lustre/" tempdir := os.TempDir() + "/telegraf/proc/fs/lustre/"
ost_name := "OST0001" ost_name := "OST0001"
job_names := []string{"testjob1", "testjob2"} job_names := []string{"cluster-testjob1", "testjob2"}
mdtdir := tempdir + "/mdt/" mdtdir := tempdir + "/mdt/"
err := os.MkdirAll(mdtdir+"/"+ost_name, 0755) err := os.MkdirAll(mdtdir+"/"+ost_name, 0755)