ip address seems to be a problem

This commit is contained in:
Wolfgang Hottgenroth 2025-02-25 09:57:27 +01:00
parent 041108603c
commit 74c4177081

View File

@ -12,6 +12,7 @@ import logging.handlers
import pyagentx import pyagentx
LOGGING_LEVEL=logging.DEBUG
BASE_OID_ENTERPRISE = '1.3.6.1.4.1' BASE_OID_ENTERPRISE = '1.3.6.1.4.1'
BASE_OID_HOTTIS = BASE_OID_ENTERPRISE + '.9676' BASE_OID_HOTTIS = BASE_OID_ENTERPRISE + '.9676'
@ -68,9 +69,9 @@ LOCAL_SERVER_KEYS = [
] ]
PEER_KEYS = [ PEER_KEYS = [
['srcadr', pyagentx.TYPE_IPADDRESS, pass_value], ['srcadr', pyagentx.TYPE_OCTETSTRING, pass_value],
['srcport', pyagentx.TYPE_INTEGER, pass_value], ['srcport', pyagentx.TYPE_INTEGER, pass_value],
['dstadr', pyagentx.TYPE_IPADDRESS, pass_value], ['dstadr', pyagentx.TYPE_OCTETSTRING, pass_value],
['dstport', pyagentx.TYPE_INTEGER, pass_value], ['dstport', pyagentx.TYPE_INTEGER, pass_value],
['leap', pyagentx.TYPE_INTEGER, pass_value], ['leap', pyagentx.TYPE_INTEGER, pass_value],
['hmode', pyagentx.TYPE_INTEGER, pass_value], ['hmode', pyagentx.TYPE_INTEGER, pass_value],
@ -167,7 +168,7 @@ class NtpsecDataUpdater(pyagentx.Updater):
try: try:
for index, data_spec in enumerate(LOCAL_SERVER_KEYS, start=1): for index, data_spec in enumerate(LOCAL_SERVER_KEYS, start=1):
logger.debug(f"local: {index=} {data_spec=}") # logger.debug(f"local: {index=} {data_spec=}")
oid_prefix = f"{LOCAL_PREFIX}.{index}" oid_prefix = f"{LOCAL_PREFIX}.{index}"
self._data[oid_prefix] = { self._data[oid_prefix] = {
'name': oid_prefix, 'name': oid_prefix,
@ -175,7 +176,7 @@ class NtpsecDataUpdater(pyagentx.Updater):
'value': data_spec[2](ds.data['local'][data_spec[0]]) 'value': data_spec[2](ds.data['local'][data_spec[0]])
} }
number_of_peers = len(ds.data['peers']) number_of_peers = len(ds.data['peers'])
logger.debug(f"number of peers: {number_of_peers}") # logger.debug(f"number of peers: {number_of_peers}")
number_of_peers_oid_prefix = f"{NUMBER_OF_PEERS_PREFIX}" number_of_peers_oid_prefix = f"{NUMBER_OF_PEERS_PREFIX}"
self._data[number_of_peers_oid_prefix] = { self._data[number_of_peers_oid_prefix] = {
'name': number_of_peers_oid_prefix, 'name': number_of_peers_oid_prefix,
@ -183,7 +184,7 @@ class NtpsecDataUpdater(pyagentx.Updater):
'value': number_of_peers 'value': number_of_peers
} }
for peer_index, (associd, peer) in enumerate(ds.data['peers'].items(), start=1): for peer_index, (associd, peer) in enumerate(ds.data['peers'].items(), start=1):
logger.debug(f"peer: {peer}") # logger.debug(f"peer: {peer}")
index_oid_prefix = f"{TABLE_OF_PEERS_PREFIX}.1.{peer_index}" index_oid_prefix = f"{TABLE_OF_PEERS_PREFIX}.1.{peer_index}"
self._data[index_oid_prefix] = { self._data[index_oid_prefix] = {
'name': index_oid_prefix, 'name': index_oid_prefix,
@ -197,7 +198,7 @@ class NtpsecDataUpdater(pyagentx.Updater):
'value': associd 'value': associd
} }
for key_index, data_spec in enumerate(PEER_KEYS, start=3): for key_index, data_spec in enumerate(PEER_KEYS, start=3):
logger.debug(f"peer: {associd=} {key_index=} {data_spec=}") # logger.debug(f"peer: {associd=} {key_index=} {data_spec=}")
oid_prefix = f"{TABLE_OF_PEERS_PREFIX}.{key_index}.{peer_index}" oid_prefix = f"{TABLE_OF_PEERS_PREFIX}.{key_index}.{peer_index}"
self._data[oid_prefix] = { self._data[oid_prefix] = {
'name': oid_prefix, 'name': oid_prefix,
@ -211,11 +212,11 @@ class NtpsecDataUpdater(pyagentx.Updater):
class NtpsecAgent(pyagentx.Agent): class NtpsecAgent(pyagentx.Agent):
def __init__(self, agent_id='NtpsecAgent', socket_path=None): def __init__(self, agent_id='NtpsecAgent', socket_path=None):
logger.debug('Agent created') logger.info('Agent created')
super().__init__() super().__init__()
def setup(self): def setup(self):
logger.debug('Agent setup') logger.info('Agent setup')
self.register(BASE_OID_HOTTIS_NTPSEC, NtpsecDataUpdater, freq=1) self.register(BASE_OID_HOTTIS_NTPSEC, NtpsecDataUpdater, freq=1)
@ -263,7 +264,7 @@ def set_user_group(user, group):
if __name__ == '__main__': if __name__ == '__main__':
logging.basicConfig( logging.basicConfig(
level=logging.INFO, level=LOGGING_LEVEL,
format="%(name)s - %(levelname)s - %(message)s", format="%(name)s - %(levelname)s - %(message)s",
handlers=[logging.handlers.SysLogHandler(address='/dev/log')] handlers=[logging.handlers.SysLogHandler(address='/dev/log')]
) )