Merge pull request OpenTSDB#320 from phil-arista/fix-dedup-eos-agent

EOS tcollector agent improvements
anrs · May 25, 2016 · d92ae98 · d92ae98
2 parents 303ba46 + b924cb4
commit d92ae98
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/eos/tcollector_agent.py b/eos/tcollector_agent.py
@@ -234,6 +234,11 @@ def start(self):
               "--host", self._get_tsd_host(),
               "--port", str(self._get_tsd_port()),
               "--collector-dir=/usr/local/tcollector/collectors"]
+
+      if self.get_agent_mgr().agent_option("dedup-interval"):
+          args.append("--dedup-interval=%s" %
+                      self.get_agent_mgr().agent_option("dedup-interval"))
+
       tcollector.socket.socket = self._socket_at
       debug("Starting tcollector", args)
       options, args = tcollector.parse_cmdline(args)
@@ -260,8 +265,6 @@ def start(self):
          kwargs["http_username"] = self.get_agent_mgr().agent_option("username")
       if self.get_agent_mgr().agent_option("password"):
          kwargs["http_password"] = self.get_agent_mgr().agent_option("password")
-      if self.get_agent_mgr().agent_option("dedupinterval"):
-         kwargs["dedupinterval"] = self.get_agent_mgr().agent_option("dedupinterval")
       sender = tcollector.SenderThread(reader,
                                        options.dryrun,
                                        hosts,

diff --git a/rpm/tcollector.spec b/rpm/tcollector.spec
@@ -152,5 +152,6 @@ if [ $1 -eq 0 ] ; then
     rm -f %{tcollectordir}/collectors/0/agentcpu.sh
     rm -f %{tcollectordir}/collectors/0/agentmem.sh
     rm -f %{tcollectordir}/collectors/0/eos.py
-    rm -f %{py2_sitelib}/tcollector_agent.py
+    rm -f %{py2_sitelib}/tcollector_agent.py*
+
 fi