From 660285d7649ec7508496ca360729a80454efd00e Mon Sep 17 00:00:00 2001 From: Evan Phoenix Date: Tue, 7 Apr 2015 11:59:11 -0700 Subject: [PATCH] Use _ as the namespace separator --- plugins/system/system.go | 180 +++++++++++++++++----------------- plugins/system/system_test.go | 180 +++++++++++++++++----------------- 2 files changed, 180 insertions(+), 180 deletions(-) diff --git a/plugins/system/system.go b/plugins/system/system.go index 624120f20..12a720c21 100644 --- a/plugins/system/system.go +++ b/plugins/system/system.go @@ -52,9 +52,9 @@ func (s *SystemStats) Gather(acc plugins.Accumulator) error { return err } - acc.Add("system.load1", lv.Load1, nil) - acc.Add("system.load5", lv.Load5, nil) - acc.Add("system.load15", lv.Load15, nil) + acc.Add("system_load1", lv.Load1, nil) + acc.Add("system_load5", lv.Load5, nil) + acc.Add("system_load15", lv.Load15, nil) times, err := s.ps.CPUTimes() if err != nil { @@ -66,17 +66,17 @@ func (s *SystemStats) Gather(acc plugins.Accumulator) error { "cpu": cts.CPU, } - s.add(acc, "cpu.user", cts.User, tags) - s.add(acc, "cpu.system", cts.System, tags) - s.add(acc, "cpu.idle", cts.Idle, tags) - s.add(acc, "cpu.nice", cts.Nice, tags) - s.add(acc, "cpu.iowait", cts.Iowait, tags) - s.add(acc, "cpu.irq", cts.Irq, tags) - s.add(acc, "cpu.softirq", cts.Softirq, tags) - s.add(acc, "cpu.steal", cts.Steal, tags) - s.add(acc, "cpu.guest", cts.Guest, tags) - s.add(acc, "cpu.guestNice", cts.GuestNice, tags) - s.add(acc, "cpu.stolen", cts.Stolen, tags) + s.add(acc, "cpu_user", cts.User, tags) + s.add(acc, "cpu_system", cts.System, tags) + s.add(acc, "cpu_idle", cts.Idle, tags) + s.add(acc, "cpu_nice", cts.Nice, tags) + s.add(acc, "cpu_iowait", cts.Iowait, tags) + s.add(acc, "cpu_irq", cts.Irq, tags) + s.add(acc, "cpu_softirq", cts.Softirq, tags) + s.add(acc, "cpu_steal", cts.Steal, tags) + s.add(acc, "cpu_guest", cts.Guest, tags) + s.add(acc, "cpu_guestNice", cts.GuestNice, tags) + s.add(acc, "cpu_stolen", cts.Stolen, tags) } disks, err := s.ps.DiskUsage() @@ -89,12 +89,12 @@ func (s *SystemStats) Gather(acc plugins.Accumulator) error { "path": du.Path, } - acc.Add("disk.total", du.Total, tags) - acc.Add("disk.free", du.Free, tags) - acc.Add("disk.used", du.Total-du.Free, tags) - acc.Add("disk.inodes_total", du.InodesTotal, tags) - acc.Add("disk.inodes_free", du.InodesFree, tags) - acc.Add("disk.inodes_used", du.InodesTotal-du.InodesFree, tags) + acc.Add("disk_total", du.Total, tags) + acc.Add("disk_free", du.Free, tags) + acc.Add("disk_used", du.Total-du.Free, tags) + acc.Add("disk_inodes_total", du.InodesTotal, tags) + acc.Add("disk_inodes_free", du.InodesFree, tags) + acc.Add("disk_inodes_used", du.InodesTotal-du.InodesFree, tags) } diskio, err := s.ps.DiskIO() @@ -108,13 +108,13 @@ func (s *SystemStats) Gather(acc plugins.Accumulator) error { "serial": io.SerialNumber, } - acc.Add("io.reads", io.ReadCount, tags) - acc.Add("io.writes", io.WriteCount, tags) - acc.Add("io.read_bytes", io.ReadBytes, tags) - acc.Add("io.write_bytes", io.WriteBytes, tags) - acc.Add("io.read_time", io.ReadTime, tags) - acc.Add("io.write_time", io.WriteTime, tags) - acc.Add("io.io_time", io.IoTime, tags) + acc.Add("io_reads", io.ReadCount, tags) + acc.Add("io_writes", io.WriteCount, tags) + acc.Add("io_read_bytes", io.ReadBytes, tags) + acc.Add("io_write_bytes", io.WriteBytes, tags) + acc.Add("io_read_time", io.ReadTime, tags) + acc.Add("io_write_time", io.WriteTime, tags) + acc.Add("io_io_time", io.IoTime, tags) } netio, err := s.ps.NetIO() @@ -127,14 +127,14 @@ func (s *SystemStats) Gather(acc plugins.Accumulator) error { "interface": io.Name, } - acc.Add("net.bytes_sent", io.BytesSent, tags) - acc.Add("net.bytes_recv", io.BytesRecv, tags) - acc.Add("net.packets_sent", io.PacketsSent, tags) - acc.Add("net.packets_recv", io.PacketsRecv, tags) - acc.Add("net.err_in", io.Errin, tags) - acc.Add("net.err_out", io.Errout, tags) - acc.Add("net.drop_in", io.Dropin, tags) - acc.Add("net.drop_out", io.Dropout, tags) + acc.Add("net_bytes_sent", io.BytesSent, tags) + acc.Add("net_bytes_recv", io.BytesRecv, tags) + acc.Add("net_packets_sent", io.PacketsSent, tags) + acc.Add("net_packets_recv", io.PacketsRecv, tags) + acc.Add("net_err_in", io.Errin, tags) + acc.Add("net_err_out", io.Errout, tags) + acc.Add("net_drop_in", io.Dropin, tags) + acc.Add("net_drop_out", io.Dropout, tags) } vm, err := s.ps.VMStat() @@ -144,17 +144,17 @@ func (s *SystemStats) Gather(acc plugins.Accumulator) error { vmtags := map[string]string(nil) - acc.Add("mem.total", vm.Total, vmtags) - acc.Add("mem.available", vm.Available, vmtags) - acc.Add("mem.used", vm.Used, vmtags) - acc.Add("mem.used_prec", vm.UsedPercent, vmtags) - acc.Add("mem.free", vm.Free, vmtags) - acc.Add("mem.active", vm.Active, vmtags) - acc.Add("mem.inactive", vm.Inactive, vmtags) - acc.Add("mem.buffers", vm.Buffers, vmtags) - acc.Add("mem.cached", vm.Cached, vmtags) - acc.Add("mem.wired", vm.Wired, vmtags) - acc.Add("mem.shared", vm.Shared, vmtags) + acc.Add("mem_total", vm.Total, vmtags) + acc.Add("mem_available", vm.Available, vmtags) + acc.Add("mem_used", vm.Used, vmtags) + acc.Add("mem_used_prec", vm.UsedPercent, vmtags) + acc.Add("mem_free", vm.Free, vmtags) + acc.Add("mem_active", vm.Active, vmtags) + acc.Add("mem_inactive", vm.Inactive, vmtags) + acc.Add("mem_buffers", vm.Buffers, vmtags) + acc.Add("mem_cached", vm.Cached, vmtags) + acc.Add("mem_wired", vm.Wired, vmtags) + acc.Add("mem_shared", vm.Shared, vmtags) swap, err := s.ps.SwapStat() if err != nil { @@ -163,12 +163,12 @@ func (s *SystemStats) Gather(acc plugins.Accumulator) error { swaptags := map[string]string(nil) - acc.Add("swap.total", swap.Total, swaptags) - acc.Add("swap.used", swap.Used, swaptags) - acc.Add("swap.free", swap.Free, swaptags) - acc.Add("swap.used_perc", swap.UsedPercent, swaptags) - acc.Add("swap.swap_in", swap.Sin, swaptags) - acc.Add("swap.swap_out", swap.Sout, swaptags) + acc.Add("swap_total", swap.Total, swaptags) + acc.Add("swap_used", swap.Used, swaptags) + acc.Add("swap_free", swap.Free, swaptags) + acc.Add("swap_used_perc", swap.UsedPercent, swaptags) + acc.Add("swap_in", swap.Sin, swaptags) + acc.Add("swap_out", swap.Sout, swaptags) containers, err := s.ps.DockerStat() if err != nil { @@ -184,45 +184,45 @@ func (s *SystemStats) Gather(acc plugins.Accumulator) error { cts := cont.CPU - acc.Add("docker.user", cts.User, tags) - acc.Add("docker.system", cts.System, tags) - acc.Add("docker.idle", cts.Idle, tags) - acc.Add("docker.nice", cts.Nice, tags) - acc.Add("docker.iowait", cts.Iowait, tags) - acc.Add("docker.irq", cts.Irq, tags) - acc.Add("docker.softirq", cts.Softirq, tags) - acc.Add("docker.steal", cts.Steal, tags) - acc.Add("docker.guest", cts.Guest, tags) - acc.Add("docker.guestNice", cts.GuestNice, tags) - acc.Add("docker.stolen", cts.Stolen, tags) + acc.Add("docker_user", cts.User, tags) + acc.Add("docker_system", cts.System, tags) + acc.Add("docker_idle", cts.Idle, tags) + acc.Add("docker_nice", cts.Nice, tags) + acc.Add("docker_iowait", cts.Iowait, tags) + acc.Add("docker_irq", cts.Irq, tags) + acc.Add("docker_softirq", cts.Softirq, tags) + acc.Add("docker_steal", cts.Steal, tags) + acc.Add("docker_guest", cts.Guest, tags) + acc.Add("docker_guestNice", cts.GuestNice, tags) + acc.Add("docker_stolen", cts.Stolen, tags) - acc.Add("docker.cache", cont.Mem.Cache, tags) - acc.Add("docker.rss", cont.Mem.RSS, tags) - acc.Add("docker.rss_huge", cont.Mem.RSSHuge, tags) - acc.Add("docker.mapped_file", cont.Mem.MappedFile, tags) - acc.Add("docker.swap_in", cont.Mem.Pgpgin, tags) - acc.Add("docker.swap_out", cont.Mem.Pgpgout, tags) - acc.Add("docker.page_fault", cont.Mem.Pgfault, tags) - acc.Add("docker.page_major_fault", cont.Mem.Pgmajfault, tags) - acc.Add("docker.inactive_anon", cont.Mem.InactiveAnon, tags) - acc.Add("docker.active_anon", cont.Mem.ActiveAnon, tags) - acc.Add("docker.inactive_file", cont.Mem.InactiveFile, tags) - acc.Add("docker.active_file", cont.Mem.ActiveFile, tags) - acc.Add("docker.unevictable", cont.Mem.Unevictable, tags) - acc.Add("docker.memory_limit", cont.Mem.HierarchicalMemoryLimit, tags) - acc.Add("docker.total_cache", cont.Mem.TotalCache, tags) - acc.Add("docker.total_rss", cont.Mem.TotalRSS, tags) - acc.Add("docker.total_rss_huge", cont.Mem.TotalRSSHuge, tags) - acc.Add("docker.total_mapped_file", cont.Mem.TotalMappedFile, tags) - acc.Add("docker.total_swap_in", cont.Mem.TotalPgpgIn, tags) - acc.Add("docker.total_swap_out", cont.Mem.TotalPgpgOut, tags) - acc.Add("docker.total_page_fault", cont.Mem.TotalPgFault, tags) - acc.Add("docker.total_page_major_fault", cont.Mem.TotalPgMajFault, tags) - acc.Add("docker.total_inactive_anon", cont.Mem.TotalInactiveAnon, tags) - acc.Add("docker.total_active_anon", cont.Mem.TotalActiveAnon, tags) - acc.Add("docker.total_inactive_file", cont.Mem.TotalInactiveFile, tags) - acc.Add("docker.total_active_file", cont.Mem.TotalActiveFile, tags) - acc.Add("docker.total_unevictable", cont.Mem.TotalUnevictable, tags) + acc.Add("docker_cache", cont.Mem.Cache, tags) + acc.Add("docker_rss", cont.Mem.RSS, tags) + acc.Add("docker_rss_huge", cont.Mem.RSSHuge, tags) + acc.Add("docker_mapped_file", cont.Mem.MappedFile, tags) + acc.Add("docker_swap_in", cont.Mem.Pgpgin, tags) + acc.Add("docker_swap_out", cont.Mem.Pgpgout, tags) + acc.Add("docker_page_fault", cont.Mem.Pgfault, tags) + acc.Add("docker_page_major_fault", cont.Mem.Pgmajfault, tags) + acc.Add("docker_inactive_anon", cont.Mem.InactiveAnon, tags) + acc.Add("docker_active_anon", cont.Mem.ActiveAnon, tags) + acc.Add("docker_inactive_file", cont.Mem.InactiveFile, tags) + acc.Add("docker_active_file", cont.Mem.ActiveFile, tags) + acc.Add("docker_unevictable", cont.Mem.Unevictable, tags) + acc.Add("docker_memory_limit", cont.Mem.HierarchicalMemoryLimit, tags) + acc.Add("docker_total_cache", cont.Mem.TotalCache, tags) + acc.Add("docker_total_rss", cont.Mem.TotalRSS, tags) + acc.Add("docker_total_rss_huge", cont.Mem.TotalRSSHuge, tags) + acc.Add("docker_total_mapped_file", cont.Mem.TotalMappedFile, tags) + acc.Add("docker_total_swap_in", cont.Mem.TotalPgpgIn, tags) + acc.Add("docker_total_swap_out", cont.Mem.TotalPgpgOut, tags) + acc.Add("docker_total_page_fault", cont.Mem.TotalPgFault, tags) + acc.Add("docker_total_page_major_fault", cont.Mem.TotalPgMajFault, tags) + acc.Add("docker_total_inactive_anon", cont.Mem.TotalInactiveAnon, tags) + acc.Add("docker_total_active_anon", cont.Mem.TotalActiveAnon, tags) + acc.Add("docker_total_inactive_file", cont.Mem.TotalInactiveFile, tags) + acc.Add("docker_total_active_file", cont.Mem.TotalActiveFile, tags) + acc.Add("docker_total_unevictable", cont.Mem.TotalUnevictable, tags) } return nil diff --git a/plugins/system/system_test.go b/plugins/system/system_test.go index 025836f17..603f5b1df 100644 --- a/plugins/system/system_test.go +++ b/plugins/system/system_test.go @@ -166,127 +166,127 @@ func TestSystemStats_GenerateStats(t *testing.T) { err := ss.Gather(&acc) require.NoError(t, err) - assert.True(t, acc.CheckValue("system.load1", 0.3)) - assert.True(t, acc.CheckValue("system.load5", 1.5)) - assert.True(t, acc.CheckValue("system.load15", 0.8)) + assert.True(t, acc.CheckValue("system_load1", 0.3)) + assert.True(t, acc.CheckValue("system_load5", 1.5)) + assert.True(t, acc.CheckValue("system_load15", 0.8)) cputags := map[string]string{ "cpu": "cpu0", } - assert.True(t, acc.CheckTaggedValue("cpu.user", 3.1, cputags)) - assert.True(t, acc.CheckTaggedValue("cpu.system", 8.2, cputags)) - assert.True(t, acc.CheckTaggedValue("cpu.idle", 80.1, cputags)) - assert.True(t, acc.CheckTaggedValue("cpu.nice", 1.3, cputags)) - assert.True(t, acc.CheckTaggedValue("cpu.iowait", 0.2, cputags)) - assert.True(t, acc.CheckTaggedValue("cpu.irq", 0.1, cputags)) - assert.True(t, acc.CheckTaggedValue("cpu.softirq", 0.11, cputags)) - assert.True(t, acc.CheckTaggedValue("cpu.steal", 0.0001, cputags)) - assert.True(t, acc.CheckTaggedValue("cpu.guest", 8.1, cputags)) - assert.True(t, acc.CheckTaggedValue("cpu.guestNice", 0.324, cputags)) - assert.True(t, acc.CheckTaggedValue("cpu.stolen", 0.051, cputags)) + assert.True(t, acc.CheckTaggedValue("cpu_user", 3.1, cputags)) + assert.True(t, acc.CheckTaggedValue("cpu_system", 8.2, cputags)) + assert.True(t, acc.CheckTaggedValue("cpu_idle", 80.1, cputags)) + assert.True(t, acc.CheckTaggedValue("cpu_nice", 1.3, cputags)) + assert.True(t, acc.CheckTaggedValue("cpu_iowait", 0.2, cputags)) + assert.True(t, acc.CheckTaggedValue("cpu_irq", 0.1, cputags)) + assert.True(t, acc.CheckTaggedValue("cpu_softirq", 0.11, cputags)) + assert.True(t, acc.CheckTaggedValue("cpu_steal", 0.0001, cputags)) + assert.True(t, acc.CheckTaggedValue("cpu_guest", 8.1, cputags)) + assert.True(t, acc.CheckTaggedValue("cpu_guestNice", 0.324, cputags)) + assert.True(t, acc.CheckTaggedValue("cpu_stolen", 0.051, cputags)) tags := map[string]string{ "path": "/", } - assert.True(t, acc.CheckTaggedValue("disk.total", uint64(128), tags)) - assert.True(t, acc.CheckTaggedValue("disk.used", uint64(105), tags)) - assert.True(t, acc.CheckTaggedValue("disk.free", uint64(23), tags)) - assert.True(t, acc.CheckTaggedValue("disk.inodes_total", uint64(1234), tags)) - assert.True(t, acc.CheckTaggedValue("disk.inodes_free", uint64(234), tags)) - assert.True(t, acc.CheckTaggedValue("disk.inodes_used", uint64(1000), tags)) + assert.True(t, acc.CheckTaggedValue("disk_total", uint64(128), tags)) + assert.True(t, acc.CheckTaggedValue("disk_used", uint64(105), tags)) + assert.True(t, acc.CheckTaggedValue("disk_free", uint64(23), tags)) + assert.True(t, acc.CheckTaggedValue("disk_inodes_total", uint64(1234), tags)) + assert.True(t, acc.CheckTaggedValue("disk_inodes_free", uint64(234), tags)) + assert.True(t, acc.CheckTaggedValue("disk_inodes_used", uint64(1000), tags)) ntags := map[string]string{ "interface": "eth0", } - assert.True(t, acc.CheckTaggedValue("net.bytes_sent", uint64(1123), ntags)) - assert.True(t, acc.CheckTaggedValue("net.bytes_recv", uint64(8734422), ntags)) - assert.True(t, acc.CheckTaggedValue("net.packets_sent", uint64(781), ntags)) - assert.True(t, acc.CheckTaggedValue("net.packets_recv", uint64(23456), ntags)) - assert.True(t, acc.CheckTaggedValue("net.err_in", uint64(832), ntags)) - assert.True(t, acc.CheckTaggedValue("net.err_out", uint64(8), ntags)) - assert.True(t, acc.CheckTaggedValue("net.drop_in", uint64(7), ntags)) - assert.True(t, acc.CheckTaggedValue("net.drop_out", uint64(1), ntags)) + assert.True(t, acc.CheckTaggedValue("net_bytes_sent", uint64(1123), ntags)) + assert.True(t, acc.CheckTaggedValue("net_bytes_recv", uint64(8734422), ntags)) + assert.True(t, acc.CheckTaggedValue("net_packets_sent", uint64(781), ntags)) + assert.True(t, acc.CheckTaggedValue("net_packets_recv", uint64(23456), ntags)) + assert.True(t, acc.CheckTaggedValue("net_err_in", uint64(832), ntags)) + assert.True(t, acc.CheckTaggedValue("net_err_out", uint64(8), ntags)) + assert.True(t, acc.CheckTaggedValue("net_drop_in", uint64(7), ntags)) + assert.True(t, acc.CheckTaggedValue("net_drop_out", uint64(1), ntags)) dtags := map[string]string{ "name": "sda1", "serial": "ab-123-ad", } - assert.True(t, acc.CheckTaggedValue("io.reads", uint64(888), dtags)) - assert.True(t, acc.CheckTaggedValue("io.writes", uint64(5341), dtags)) - assert.True(t, acc.CheckTaggedValue("io.read_bytes", uint64(100000), dtags)) - assert.True(t, acc.CheckTaggedValue("io.write_bytes", uint64(200000), dtags)) - assert.True(t, acc.CheckTaggedValue("io.read_time", uint64(7123), dtags)) - assert.True(t, acc.CheckTaggedValue("io.write_time", uint64(9087), dtags)) - assert.True(t, acc.CheckTaggedValue("io.io_time", uint64(123552), dtags)) + assert.True(t, acc.CheckTaggedValue("io_reads", uint64(888), dtags)) + assert.True(t, acc.CheckTaggedValue("io_writes", uint64(5341), dtags)) + assert.True(t, acc.CheckTaggedValue("io_read_bytes", uint64(100000), dtags)) + assert.True(t, acc.CheckTaggedValue("io_write_bytes", uint64(200000), dtags)) + assert.True(t, acc.CheckTaggedValue("io_read_time", uint64(7123), dtags)) + assert.True(t, acc.CheckTaggedValue("io_write_time", uint64(9087), dtags)) + assert.True(t, acc.CheckTaggedValue("io_io_time", uint64(123552), dtags)) vmtags := map[string]string(nil) - assert.True(t, acc.CheckTaggedValue("mem.total", uint64(12400), vmtags)) - assert.True(t, acc.CheckTaggedValue("mem.available", uint64(7600), vmtags)) - assert.True(t, acc.CheckTaggedValue("mem.used", uint64(5000), vmtags)) - assert.True(t, acc.CheckTaggedValue("mem.used_prec", float64(47.1), vmtags)) - assert.True(t, acc.CheckTaggedValue("mem.free", uint64(1235), vmtags)) - assert.True(t, acc.CheckTaggedValue("mem.active", uint64(8134), vmtags)) - assert.True(t, acc.CheckTaggedValue("mem.inactive", uint64(1124), vmtags)) - assert.True(t, acc.CheckTaggedValue("mem.buffers", uint64(771), vmtags)) - assert.True(t, acc.CheckTaggedValue("mem.cached", uint64(4312), vmtags)) - assert.True(t, acc.CheckTaggedValue("mem.wired", uint64(134), vmtags)) - assert.True(t, acc.CheckTaggedValue("mem.shared", uint64(2142), vmtags)) + assert.True(t, acc.CheckTaggedValue("mem_total", uint64(12400), vmtags)) + assert.True(t, acc.CheckTaggedValue("mem_available", uint64(7600), vmtags)) + assert.True(t, acc.CheckTaggedValue("mem_used", uint64(5000), vmtags)) + assert.True(t, acc.CheckTaggedValue("mem_used_prec", float64(47.1), vmtags)) + assert.True(t, acc.CheckTaggedValue("mem_free", uint64(1235), vmtags)) + assert.True(t, acc.CheckTaggedValue("mem_active", uint64(8134), vmtags)) + assert.True(t, acc.CheckTaggedValue("mem_inactive", uint64(1124), vmtags)) + assert.True(t, acc.CheckTaggedValue("mem_buffers", uint64(771), vmtags)) + assert.True(t, acc.CheckTaggedValue("mem_cached", uint64(4312), vmtags)) + assert.True(t, acc.CheckTaggedValue("mem_wired", uint64(134), vmtags)) + assert.True(t, acc.CheckTaggedValue("mem_shared", uint64(2142), vmtags)) swaptags := map[string]string(nil) - assert.True(t, acc.CheckTaggedValue("swap.total", uint64(8123), swaptags)) - assert.True(t, acc.CheckTaggedValue("swap.used", uint64(1232), swaptags)) - assert.True(t, acc.CheckTaggedValue("swap.used_perc", float64(12.2), swaptags)) - assert.True(t, acc.CheckTaggedValue("swap.free", uint64(6412), swaptags)) - assert.True(t, acc.CheckTaggedValue("swap.swap_in", uint64(7), swaptags)) - assert.True(t, acc.CheckTaggedValue("swap.swap_out", uint64(830), swaptags)) + assert.True(t, acc.CheckTaggedValue("swap_total", uint64(8123), swaptags)) + assert.True(t, acc.CheckTaggedValue("swap_used", uint64(1232), swaptags)) + assert.True(t, acc.CheckTaggedValue("swap_used_perc", float64(12.2), swaptags)) + assert.True(t, acc.CheckTaggedValue("swap_free", uint64(6412), swaptags)) + assert.True(t, acc.CheckTaggedValue("swap_in", uint64(7), swaptags)) + assert.True(t, acc.CheckTaggedValue("swap_out", uint64(830), swaptags)) dockertags := map[string]string{ "id": "blah", } - assert.True(t, acc.CheckTaggedValue("docker.user", 3.1, dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.system", 8.2, dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.idle", 80.1, dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.nice", 1.3, dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.iowait", 0.2, dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.irq", 0.1, dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.softirq", 0.11, dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.steal", 0.0001, dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.guest", 8.1, dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.guestNice", 0.324, dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.stolen", 0.051, dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_user", 3.1, dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_system", 8.2, dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_idle", 80.1, dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_nice", 1.3, dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_iowait", 0.2, dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_irq", 0.1, dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_softirq", 0.11, dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_steal", 0.0001, dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_guest", 8.1, dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_guestNice", 0.324, dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_stolen", 0.051, dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.cache", uint64(1), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.rss", uint64(2), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.rss_huge", uint64(3), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.mapped_file", uint64(4), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.swap_in", uint64(5), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.swap_out", uint64(6), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.page_fault", uint64(7), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.page_major_fault", uint64(8), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.inactive_anon", uint64(9), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.active_anon", uint64(10), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.inactive_file", uint64(11), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.active_file", uint64(12), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.unevictable", uint64(13), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.memory_limit", uint64(14), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_cache", uint64(15), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_rss", uint64(16), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_rss_huge", uint64(17), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_mapped_file", uint64(18), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_swap_in", uint64(19), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_swap_out", uint64(20), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_page_fault", uint64(21), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_page_major_fault", uint64(22), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_inactive_anon", uint64(23), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_active_anon", uint64(24), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_inactive_file", uint64(25), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_active_file", uint64(26), dockertags)) - assert.True(t, acc.CheckTaggedValue("docker.total_unevictable", uint64(27), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_cache", uint64(1), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_rss", uint64(2), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_rss_huge", uint64(3), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_mapped_file", uint64(4), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_swap_in", uint64(5), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_swap_out", uint64(6), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_page_fault", uint64(7), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_page_major_fault", uint64(8), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_inactive_anon", uint64(9), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_active_anon", uint64(10), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_inactive_file", uint64(11), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_active_file", uint64(12), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_unevictable", uint64(13), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_memory_limit", uint64(14), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_cache", uint64(15), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_rss", uint64(16), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_rss_huge", uint64(17), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_mapped_file", uint64(18), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_swap_in", uint64(19), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_swap_out", uint64(20), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_page_fault", uint64(21), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_page_major_fault", uint64(22), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_inactive_anon", uint64(23), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_active_anon", uint64(24), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_inactive_file", uint64(25), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_active_file", uint64(26), dockertags)) + assert.True(t, acc.CheckTaggedValue("docker_total_unevictable", uint64(27), dockertags)) }