diff options
| -rw-r--r-- | doc/plugin-roles | 1 | ||||
| -rw-r--r-- | src/lib/Server/Plugins/Probes.py | 29 |
2 files changed, 13 insertions, 17 deletions
diff --git a/doc/plugin-roles b/doc/plugin-roles index c23b2a236..03207fd4f 100644 --- a/doc/plugin-roles +++ b/doc/plugin-roles @@ -82,5 +82,4 @@ Statistics (if used) should be listed in the plugins line of bcfg2.conf. 5) Notes -* Need to fix host specific probe behavior (with basenames) * Need to ensure bundle accumulation occurs with connector groups
\ No newline at end of file diff --git a/src/lib/Server/Plugins/Probes.py b/src/lib/Server/Plugins/Probes.py index 7b82183ea..6c7590da0 100644 --- a/src/lib/Server/Plugins/Probes.py +++ b/src/lib/Server/Plugins/Probes.py @@ -1,6 +1,7 @@ import Bcfg2.Server.Plugin, lxml.etree, re -probe_matcher = re.compile("(?P<basename>\S+)(.(?P<mode>[GH])_\S+)?") +specific_probe_matcher = re.compile("(.*/)?(?P<basename>\S+)(.(?P<mode>[GH])_\S+)") +probe_matcher = re.compile("(.*/)?(?P<basename>\S+)") class ProbeSet(Bcfg2.Server.Plugin.EntrySet): ignore = re.compile("^(\.#.*|.*~|\\..*\\.(tmp|sw[px])|probed\\.xml)$") @@ -19,22 +20,18 @@ class ProbeSet(Bcfg2.Server.Plugin.EntrySet): def get_probe_data(self, metadata): ret = [] + build = dict() candidates = self.get_matching(metadata) - temp = {} - for cand in candidates: - if cand.specific.all: - if cand.name not in temp: - temp[cand.name] = (cand, 0) - continue - mdata = probe_matcher.match(cand.name).groupdict() - if mdata['basename'] in temp: - if mdata['mode'] > temp[mdata['basename']][1]: - temp[mdata['basename']] = (cand, mdata['mode']) - else: - temp[mdata['basename']] = (cand, mdata['mode']) - - for (name, data) in temp.iteritems(): - entry, prio = data + candidates.sort(lambda x,y: cmp(x.specific, y.specific)) + for entry in candidates: + rem = specific_probe_matcher.match(entry.name) + if not rem: + rem = probe_matcher.match(entry.name) + pname = rem.group('basename') + if pname not in build: + build[pname] = entry + + for (name, entry) in build.iteritems(): probe = lxml.etree.Element('probe') probe.set('name', name.split('/')[-1]) probe.set('source', self.plugin_name) |