Revert "added software field" - telegraf doesn't like it
This reverts commit a93edaf002.
This commit is contained in:
parent
a93edaf002
commit
500567a0b0
|
|
@ -34,11 +34,6 @@ class Api(object):
|
||||||
response = json.load(urllib.urlopen(self.get_request(url)))
|
response = json.load(urllib.urlopen(self.get_request(url)))
|
||||||
return response
|
return response
|
||||||
|
|
||||||
def get_software_list(self):
|
|
||||||
url = self.url + 'software'
|
|
||||||
response = json.load(urllib.urlopen(self.get_request(url)))
|
|
||||||
return response
|
|
||||||
|
|
||||||
|
|
||||||
class Agent(object):
|
class Agent(object):
|
||||||
|
|
||||||
|
|
@ -54,7 +49,6 @@ class Agent(object):
|
||||||
self.status = agent_json['status']
|
self.status = agent_json['status']
|
||||||
self.details = self.download_agent_details()
|
self.details = self.download_agent_details()
|
||||||
self.wmi_details = self.extract_wmi_details()
|
self.wmi_details = self.extract_wmi_details()
|
||||||
self.software = Software(self.agent_id,self.api).software_json
|
|
||||||
|
|
||||||
def download_agent_details(self):
|
def download_agent_details(self):
|
||||||
url = self.api.url + 'agents' + '/' + str(self.agent_id)
|
url = self.api.url + 'agents' + '/' + str(self.agent_id)
|
||||||
|
|
@ -83,7 +77,7 @@ class Agent(object):
|
||||||
|
|
||||||
def get_agent_metrics(self):
|
def get_agent_metrics(self):
|
||||||
new_values = {'agent_id': self.agent_id, 'hostname': self.hostname, 'site_name': self.site_name,
|
new_values = {'agent_id': self.agent_id, 'hostname': self.hostname, 'site_name': self.site_name,
|
||||||
'client_name': self.client_name, 'status': self.status, 'software': self.software}
|
'client_name': self.client_name, 'status': self.status}
|
||||||
agent_details = self.wmi_details
|
agent_details = self.wmi_details
|
||||||
agent_details['agent_info'] = new_values
|
agent_details['agent_info'] = new_values
|
||||||
new_dict = {}
|
new_dict = {}
|
||||||
|
|
@ -123,15 +117,6 @@ class Agent(object):
|
||||||
return str(params)
|
return str(params)
|
||||||
|
|
||||||
|
|
||||||
class Software(object):
|
|
||||||
def __init__(self, agent_id, api_object):
|
|
||||||
self.software_json = self.get_json(agent_id, api_object)
|
|
||||||
|
|
||||||
def get_json(self, agent_id, api_object):
|
|
||||||
url = api_object.url + '/' + 'software' + '/' + agent_id
|
|
||||||
response = urllib.urlopen(api_object.get_request(url))
|
|
||||||
return json.load(response)
|
|
||||||
|
|
||||||
api = Api(URL, TOKEN)
|
api = Api(URL, TOKEN)
|
||||||
agent_list = api.get_agent_list()
|
agent_list = api.get_agent_list()
|
||||||
telegraf_client = TelegrafClient(host=config['telegraf']['host'], port=config['telegraf']['port'])
|
telegraf_client = TelegrafClient(host=config['telegraf']['host'], port=config['telegraf']['port'])
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue