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

refactor(naming): For master specific settings 

* This should help backwards compatibility when adding more features or
  supported Mesos components
This commit is contained in:
Sergio Jimenez 2016-02-11 01:06:51 +01:00 committed by Michele Fadda
parent 29f674fb82
commit 0c7bb5a8f4
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/inputs/mesos/mesos.go
View File

@ -18,8 +18,8 @@ import (
type Mesos struct { type Mesos struct {
Timeout int Timeout int
Servers []string Masters []string
MetricsCol []string `toml:"metrics_collection"` MasterCols []string `toml:"metrics_collection"`
} }
var defaultMetrics = []string{ var defaultMetrics = []string{
@ -33,10 +33,10 @@ var sampleConfig = `
# A list of Mesos masters. e.g. master1:5050, master2:5080, etc. # A list of Mesos masters. e.g. master1:5050, master2:5080, etc.
# The port can be skipped if using the default (5050) # The port can be skipped if using the default (5050)
# Default value is localhost:5050. # Default value is localhost:5050.
servers = ["localhost:5050"] masters = ["localhost:5050"]
# Metrics groups to be collected. # Metrics groups to be collected.
# Default, all enabled. # Default, all enabled.
metrics_collection = ["resources","master","system","slaves","frameworks","messages","evqueue","registrar"] master_collections = ["resources","master","system","slaves","frameworks","messages","evqueue","registrar"]
` `
// SampleConfig returns a sample configuration block // SampleConfig returns a sample configuration block
@ -54,13 +54,13 @@ func (m *Mesos) Gather(acc telegraf.Accumulator) error {
var wg sync.WaitGroup var wg sync.WaitGroup
var errorChannel chan error var errorChannel chan error
if len(m.Servers) == 0 { if len(m.Masters) == 0 {
m.Servers = []string{"localhost:5050"} m.Masters = []string{"localhost:5050"}
} }
errorChannel = make(chan error, len(m.Servers)*2) errorChannel = make(chan error, len(m.Masters)*2)
for _, v := range m.Servers { for _, v := range m.Masters {
wg.Add(1) wg.Add(1)
go func() { go func() {
errorChannel <- m.gatherMetrics(v, acc) errorChannel <- m.gatherMetrics(v, acc)
@ -253,7 +253,7 @@ func masterBlocks(g string) []string {
func (m *Mesos) removeGroup(j *map[string]interface{}) { func (m *Mesos) removeGroup(j *map[string]interface{}) {
var ok bool var ok bool
b := metricsDiff(m.MetricsCol) b := metricsDiff(m.MasterCols)
for _, k := range b { for _, k := range b {
for _, v := range masterBlocks(k) { for _, v := range masterBlocks(k) {

10
plugins/inputs/mesos/mesos_test.go
View File

@ -74,7 +74,7 @@ func TestMesosMaster(t *testing.T) {
var acc testutil.Accumulator var acc testutil.Accumulator
m := Mesos{ m := Mesos{
Servers: []string{ts.Listener.Addr().String()}, Masters: []string{ts.Listener.Addr().String()},
Timeout: 10, Timeout: 10,
} }
@ -91,7 +91,7 @@ func TestRemoveGroup(t *testing.T) {
generateMetrics() generateMetrics()
m := Mesos{ m := Mesos{
MetricsCol: []string{ MasterCols: []string{
"resources", "master", "registrar", "resources", "master", "registrar",
}, },
} }
@ -109,7 +109,7 @@ func TestRemoveGroup(t *testing.T) {
} }
} }
} }
for _, v := range m.MetricsCol { for _, v := range m.MasterCols {
for _, x := range masterBlocks(v) { for _, x := range masterBlocks(v) {
if _, ok := mesosMetrics[x]; !ok { if _, ok := mesosMetrics[x]; !ok {
t.Errorf("Didn't find key %s, it should present.", x) t.Errorf("Didn't find key %s, it should present.", x)
@ -135,10 +135,10 @@ func TestSampleConfig(t *testing.T) {
# A list of Mesos masters. e.g. master1:5050, master2:5080, etc. # A list of Mesos masters. e.g. master1:5050, master2:5080, etc.
# The port can be skipped if using the default (5050) # The port can be skipped if using the default (5050)
# Default value is localhost:5050. # Default value is localhost:5050.
servers = ["localhost:5050"] masters = ["localhost:5050"]
# Metrics groups to be collected. # Metrics groups to be collected.
# Default, all enabled. # Default, all enabled.
metrics_collection = ["resources","master","system","slaves","frameworks","messages","evqueue","registrar"] master_collections = ["resources","master","system","slaves","frameworks","messages","evqueue","registrar"]
` `
got := new(Mesos).SampleConfig() got := new(Mesos).SampleConfig()