[service_discovery][jmx] fix yaml parsing

sjenriquez · sjenriquez · commit 78a9053d2212 · 2017-01-24T14:00:57.000-05:00
diff --git a/config.py b/config.py
@@ -1141,7 +1141,7 @@ def generate_jmx_configs(agentConfig, hostname, checknames=None):
         if check_name in checknames and check_name in JMX_CHECKS:
             log.debug('Generating JMX config for: %s' % check_name)
 
-            sd_init_config, sd_instances = service_disco_check_config
+            _, (sd_init_config, sd_instances) = service_disco_check_config
 
             check_config = {'init_config': sd_init_config,
                             'instances': sd_instances}
diff --git a/tests/core/test_service_discovery.py b/tests/core/test_service_discovery.py
@@ -150,11 +150,11 @@ class TestServiceDiscovery(unittest.TestCase):
     }
 
     jmx_sd_configs = {
-        'tomcat': ({}, [{"host": "localhost", "port": "9012"}]),
-        'solr': ({}, [
+        'tomcat': ('auto-configuration', ({}, [{"host": "localhost", "port": "9012"}])),
+        'solr': ('auto-configuration', ({}, [
             {"host": "localhost", "port": "9999", "username": "foo", "password": "bar"},
             {"host": "remotehost", "port": "5555", "username": "haz", "password": "bar"},
-        ]),
+        ])),
     }
 
     def setUp(self):

Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,11 @@ class TestServiceDiscovery(unittest.TestCase):`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`jmx_sd_configs = {`
`153`		`- 'tomcat': ({}, [{"host": "localhost", "port": "9012"}]),`
`154`		`- 'solr': ({}, [`
	`153`	`+ 'tomcat': ('auto-configuration', ({}, [{"host": "localhost", "port": "9012"}])),`
	`154`	`+ 'solr': ('auto-configuration', ({}, [`
`155`	`155`	`{"host": "localhost", "port": "9999", "username": "foo", "password": "bar"},`
`156`	`156`	`{"host": "remotehost", "port": "5555", "username": "haz", "password": "bar"},`
`157`		`- ]),`
	`157`	`+ ])),`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`def setUp(self):`