Use _ as the namespace separator

This commit is contained in:
Evan Phoenix
2015-04-07 11:59:11 -07:00
parent 04b2bbd30b
commit 660285d764
2 changed files with 180 additions and 180 deletions

View File

@@ -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