diff --git a/tactical_agents_telegraf.py b/tactical_agents_telegraf.py
index bc42e66..f1dff08 100644
--- a/tactical_agents_telegraf.py
+++ b/tactical_agents_telegraf.py
@@ -106,8 +106,11 @@ class Agent(object):
         for k, v in self.get_agent_metrics().items():
             telegraf_client_object.metric(str(k), v,
                                           tags={
-                                              'hdn': str(str(self.hostname) + '/' + str(self.client_name) + '/' + str(
-                                                  self.site_name))})
+                                              'hdn':
+                                                  str(str(self.hostname) + '/' + str(self.client_name) + '/' + str(
+                                                      self.site_name)),
+                                              'site_name': str(self.site_name),
+                                              'client_name': str(self.client_name)})
 
     def __str__(self):
         params = [self.agent_id, self.hostname, self.site_name, self.client_name, self.status]
@@ -120,4 +123,4 @@ telegraf_client = TelegrafClient(host=config['telegraf']['host'], port=config['t
 
 for agent in agent_list:
     a = Agent(agent, api)
-    a.send_agent_metrics(telegraf_client)
\ No newline at end of file
+    a.send_agent_metrics(telegraf_client)