diff --git a/collectors/cpustatMetric.go b/collectors/cpustatMetric.go index cafb9e3..3e5bc03 100644 --- a/collectors/cpustatMetric.go +++ b/collectors/cpustatMetric.go @@ -13,7 +13,7 @@ import ( const CPUSTATFILE = `/proc/stat` type CpustatCollectorConfig struct { - ExcludeMetrics []string `json:"exclude_metrics, omitempty"` + ExcludeMetrics []string `json:"exclude_metrics,omitempty"` } type CpustatCollector struct { diff --git a/collectors/diskstatMetric.go b/collectors/diskstatMetric.go index d932fea..471099d 100644 --- a/collectors/diskstatMetric.go +++ b/collectors/diskstatMetric.go @@ -15,7 +15,7 @@ const DISKSTATFILE = `/proc/diskstats` const DISKSTAT_SYSFSPATH = `/sys/block` type DiskstatCollectorConfig struct { - ExcludeMetrics []string `json:"exclude_metrics, omitempty"` + ExcludeMetrics []string `json:"exclude_metrics,omitempty"` } type DiskstatCollector struct { diff --git a/collectors/infinibandMetric.go b/collectors/infinibandMetric.go index 70eaf04..ecb9524 100644 --- a/collectors/infinibandMetric.go +++ b/collectors/infinibandMetric.go @@ -22,7 +22,7 @@ const LIDFILE = `/sys/class/infiniband/mlx4_0/ports/1/lid` const PERFQUERY = `/usr/sbin/perfquery` type InfinibandCollectorConfig struct { - ExcludeDevices []string `json:"exclude_devices, omitempty"` + ExcludeDevices []string `json:"exclude_devices,omitempty"` PerfQueryPath string `json:"perfquery_path"` } diff --git a/collectors/loadavgMetric.go b/collectors/loadavgMetric.go index bb820b0..683514e 100644 --- a/collectors/loadavgMetric.go +++ b/collectors/loadavgMetric.go @@ -12,7 +12,7 @@ import ( const LOADAVGFILE = `/proc/loadavg` type LoadavgCollectorConfig struct { - ExcludeMetrics []string `json:"exclude_metrics, omitempty"` + ExcludeMetrics []string `json:"exclude_metrics,omitempty"` } type LoadavgCollector struct { diff --git a/collectors/nvidiaMetric.go b/collectors/nvidiaMetric.go index 1531f14..279ff45 100644 --- a/collectors/nvidiaMetric.go +++ b/collectors/nvidiaMetric.go @@ -11,8 +11,8 @@ import ( ) type NvidiaCollectorConfig struct { - ExcludeMetrics []string `json:"exclude_metrics, omitempty"` - ExcludeDevices []string `json:"exclude_devices, omitempty"` + ExcludeMetrics []string `json:"exclude_metrics,omitempty"` + ExcludeDevices []string `json:"exclude_devices,omitempty"` } type NvidiaCollector struct { diff --git a/metric-collector.go b/metric-collector.go index 68a5bb3..75ebcd5 100644 --- a/metric-collector.go +++ b/metric-collector.go @@ -54,11 +54,11 @@ import ( type CentralConfigFile struct { Interval int `json:"interval"` Duration int `json:"duration"` - Pidfile string `json:"pidfile", omitempty` + Pidfile string `json:"pidfile,omitempty"` CollectorConfigFile string `json:"collectors"` RouterConfigFile string `json:"router"` SinkConfigFile string `json:"sinks"` - ReceiverConfigFile string `json:"receivers", omitempty` + ReceiverConfigFile string `json:"receivers,omitempty"` } func LoadCentralConfiguration(file string, config *CentralConfigFile) error { diff --git a/receivers/metricReceiver.go b/receivers/metricReceiver.go index 05b8b65..2c74409 100644 --- a/receivers/metricReceiver.go +++ b/receivers/metricReceiver.go @@ -10,7 +10,7 @@ type ReceiverConfig struct { Addr string `json:"address"` Port string `json:"port"` Database string `json:"database"` - Organization string `json:"organization", omitempty` + Organization string `json:"organization,omitempty"` Type string `json:"type"` } diff --git a/sinks/metricSink.go b/sinks/metricSink.go index 37ffa8f..25f66bb 100644 --- a/sinks/metricSink.go +++ b/sinks/metricSink.go @@ -7,14 +7,14 @@ import ( type sinkConfig struct { Type string `json:"type"` - Host string `json:"host", omitempty` - Port string `json:"port", omitempty` - Database string `json:"database, omitempty"` - User string `json:"user, omitempty"` - Password string `json:"password", omitempty` - Organization string `json:"organization", omitempty` - SSL bool `json:"ssl", omitempty` - MetaAsTags bool `json:"meta_as_tags", omitempty` + Host string `json:"host,omitempty"` + Port string `json:"port,omitempty"` + Database string `json:"database,omitempty"` + User string `json:"user,omitempty"` + Password string `json:"password,omitempty"` + Organization string `json:"organization,omitempty"` + SSL bool `json:"ssl,omitempty"` + MetaAsTags bool `json:"meta_as_tags,omitempty"` } type sink struct {