From ddf8fb74ea06b8f928a731dc74c522f37b2710df Mon Sep 17 00:00:00 2001 From: Kelly Lyon Date: Wed, 19 Jul 2017 12:47:36 -0700 Subject: [PATCH] support for streaming plugins: - In getMetricsAndCollectors will get from both collectors and streaming-collectors - Fix in StreamMetrics() --- control/control.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/control/control.go b/control/control.go index c2ab57848..f01f03c10 100644 --- a/control/control.go +++ b/control/control.go @@ -817,7 +817,8 @@ func (p *pluginControl) getMetricsAndCollectors(requested []core.RequestedMetric mt.config = cfg // apply the defaults from the global (plugin) config - cfgNode := p.pluginManager.GetPluginConfig().getPluginConfigDataNode(core.CollectorPluginType, mt.Plugin.Name(), mt.Plugin.Version()) + plType, _ := core.ToPluginType(mt.Plugin.TypeName()) + cfgNode := p.pluginManager.GetPluginConfig().getPluginConfigDataNode(plType, mt.Plugin.Name(), mt.Plugin.Version()) cfg.ApplyDefaults(cfgNode.Table()) // apply defaults to the metric that may be present in the plugins @@ -1111,7 +1112,7 @@ func (p *pluginControl) StreamMetrics( if mt.Config() != nil { mt.Config().ReverseMergeInPlace( p.Config.Plugins.getPluginConfigDataNode( - core.CollectorPluginType, + core.StreamingCollectorPluginType, pmt.plugin.Name(), pmt.plugin.Version())) }