From 039b9defabe2fba35c9d3a4dbf7edc3fad812227 Mon Sep 17 00:00:00 2001 From: James Cunningham Date: Fri, 5 Dec 2014 16:57:56 +0000 Subject: [PATCH] Unified all structs json tags to snake_case --- cpu.go | 10 +++++----- disk.go | 26 +++++++++++++------------- docker_linux.go | 2 +- host.go | 14 +++++++------- mem.go | 4 ++-- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cpu.go b/cpu.go index c6703e7..6b49e99 100644 --- a/cpu.go +++ b/cpu.go @@ -23,16 +23,16 @@ type CPUTimesStat struct { type CPUInfoStat struct { CPU int32 `json:"cpu"` - VendorID string `json:"vendorId"` + VendorID string `json:"vendor_id"` Family string `json:"family"` Model string `json:"model"` Stepping int32 `json:"stepping"` - PhysicalID string `json:"physicalId"` - CoreID string `json:"coreId"` + PhysicalID string `json:"physical_id"` + CoreID string `json:"core_id"` Cores int32 `json:"cores"` - ModelName string `json:"modelName"` + ModelName string `json:"model_name"` Mhz float64 `json:"mhz"` - CacheSize int32 `json:"cacheSize"` + CacheSize int32 `json:"cache_size"` Flags []string `json:"flags"` } diff --git a/disk.go b/disk.go index d94caf7..9800bea 100644 --- a/disk.go +++ b/disk.go @@ -9,11 +9,11 @@ type DiskUsageStat struct { Total uint64 `json:"total"` Free uint64 `json:"free"` Used uint64 `json:"used"` - UsedPercent float64 `json:"usedPercent"` - InodesTotal uint64 `json:"inodesTotal"` - InodesUsed uint64 `json:"inodesUsed"` - InodesFree uint64 `json:"inodesFree"` - InodesUsedPercent float64 `json:"inodesUsedPercent"` + UsedPercent float64 `json:"used_percent"` + InodesTotal uint64 `json:"inodes_total"` + InodesUsed uint64 `json:"inodes_used"` + InodesFree uint64 `json:"inodes_free"` + InodesUsedPercent float64 `json:"inodes_used_percent"` } type DiskPartitionStat struct { @@ -24,15 +24,15 @@ type DiskPartitionStat struct { } type DiskIOCountersStat struct { - ReadCount uint64 `json:"readCount"` - WriteCount uint64 `json:"writeCount"` - ReadBytes uint64 `json:"readBytes"` - WriteBytes uint64 `json:"writeBytes"` - ReadTime uint64 `json:"readTime"` - WriteTime uint64 `json:"writeTime"` + ReadCount uint64 `json:"read_count"` + WriteCount uint64 `json:"write_count"` + ReadBytes uint64 `json:"read_bytes"` + WriteBytes uint64 `json:"write_bytes"` + ReadTime uint64 `json:"read_time"` + WriteTime uint64 `json:"write_time"` Name string `json:"name"` - IoTime uint64 `json:"ioTime"` - SerialNumber string `json:"serialNumber"` + IoTime uint64 `json:"io_time"` + SerialNumber string `json:"serial_number"` } func (d DiskUsageStat) String() string { diff --git a/docker_linux.go b/docker_linux.go index 5320c31..7f00b2a 100644 --- a/docker_linux.go +++ b/docker_linux.go @@ -11,7 +11,7 @@ import ( ) type CgroupMemStat struct { - ContainerID string `json:"containerid"` + ContainerID string `json:"container_id"` Cache uint64 `json:"cache"` RSS uint64 `json:"rss"` RSSHuge uint64 `json:"rss_huge"` diff --git a/host.go b/host.go index a204231..229c6ef 100644 --- a/host.go +++ b/host.go @@ -9,13 +9,13 @@ import ( type HostInfoStat struct { Hostname string `json:"hostname"` Uptime uint64 `json:"uptime"` - Procs uint64 `json:"procs"` // number of processes - OS string `json:"os"` // ex: freebsd, linux - Platform string `json:"platform"` // ex: ubuntu, linuxmint - PlatformFamily string `json:"platformFamily"` // ex: debian, rhel - PlatformVersion string `json:"platformVersion"` - VirtualizationSystem string `json:"virtualizationSystem"` - VirtualizationRole string `json:"virtualizationRole"` // guest or host + Procs uint64 `json:"procs"` // number of processes + OS string `json:"os"` // ex: freebsd, linux + Platform string `json:"platform"` // ex: ubuntu, linuxmint + PlatformFamily string `json:"platform_family"` // ex: debian, rhel + PlatformVersion string `json:"platform_version"` + VirtualizationSystem string `json:"virtualization_system"` + VirtualizationRole string `json:"virtualization_role"` // guest or host } diff --git a/mem.go b/mem.go index 6f2e293..63cfad4 100644 --- a/mem.go +++ b/mem.go @@ -8,7 +8,7 @@ type VirtualMemoryStat struct { Total uint64 `json:"total"` Available uint64 `json:"available"` Used uint64 `json:"used"` - UsedPercent float64 `json:"usedPercent"` + UsedPercent float64 `json:"used_percent"` Free uint64 `json:"free"` Active uint64 `json:"active"` Inactive uint64 `json:"inactive"` @@ -22,7 +22,7 @@ type SwapMemoryStat struct { Total uint64 `json:"total"` Used uint64 `json:"used"` Free uint64 `json:"free"` - UsedPercent float64 `json:"usedPercent"` + UsedPercent float64 `json:"used_percent"` Sin uint64 `json:"sin"` Sout uint64 `json:"sout"` }