Skip to content

Commit 6d014fb

Browse files
committed
fixed issue zabbix#30 by adding Hostname support to Sender and AsyncSender
1 parent 72bb5cf commit 6d014fb

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

examples/sender/asynchronous/agent_config_using.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ async def main():
2222

2323
# Send a value to a Zabbix server/proxy with specified parameters
2424
# Parameters: (host, key, value, clock)
25-
response = await sender.send_value('host', 'item.key', 'value', 1695713666)
25+
response = await sender.send_value(sender.host, 'item.key', 'value', 1695713666)
2626

2727
# Check if the value sending was successful
2828
if response.failed == 0:

examples/sender/synchronous/agent_config_using.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
# Send a value to a Zabbix server/proxy with specified parameters
1717
# Parameters: (host, key, value, clock)
18-
response = sender.send_value('host', 'item.key', 'value', 1695713666)
18+
response = sender.send_value(sender.host, 'item.key', 'value', 1695713666)
1919

2020
# Check if the value sending was successful
2121
if response.failed == 0:

zabbix_utils/aiosender.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ def __init__(self, server: Optional[str] = None, port: int = 10051,
6969
self.use_ipv6 = use_ipv6
7070
self.tls = {}
7171

72+
self.host = None
7273
self.source_ip = None
7374
self.chunk_size = chunk_size
7475
self.compression = compression
@@ -105,6 +106,7 @@ def __read_config(self, config: configparser.SectionProxy) -> None:
105106
for cluster in server_row.split(','):
106107
self.clusters.append(Cluster(cluster.strip().split(';')))
107108

109+
self.host = config.get('Hostname')
108110
if 'SourceIP' in config:
109111
self.source_ip = config.get('SourceIP')
110112

@@ -310,4 +312,4 @@ async def send_value(self, host: str, key: str,
310312
TrapperResponse: Response from Zabbix server/proxy.
311313
"""
312314

313-
return await self.send([ItemValue(host, key, value, clock, ns)])
315+
return await self.send([ItemValue(host or self.host or '', key, value, clock, ns)])

zabbix_utils/sender.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ def __init__(self, server: Optional[str] = None, port: int = 10051,
6666
self.use_ipv6 = use_ipv6
6767
self.tls = {}
6868

69+
self.host = None
6970
self.source_ip = None
7071
self.chunk_size = chunk_size
7172
self.compression = compression
@@ -102,6 +103,7 @@ def __read_config(self, config: configparser.SectionProxy) -> None:
102103
for cluster in server_row.split(','):
103104
self.clusters.append(Cluster(cluster.strip().split(';')))
104105

106+
self.host = config.get('Hostname')
105107
if 'SourceIP' in config:
106108
self.source_ip = config.get('SourceIP')
107109

@@ -218,7 +220,6 @@ def __send_to_cluster(self, cluster: Cluster, packet: bytes) -> Optional[Tuple[N
218220

219221
if response and response.get('response') != 'success':
220222
if response.get('redirect'):
221-
print(response)
222223
log.debug(
223224
'Packet was redirected from %s to %s. Proxy group revision: %s.',
224225
active_node,
@@ -312,4 +313,4 @@ def send_value(self, host: str, key: str,
312313
TrapperResponse: Response from Zabbix server/proxy.
313314
"""
314315

315-
return self.send([ItemValue(host, key, value, clock, ns)])
316+
return self.send([ItemValue(host or self.host or '', key, value, clock, ns)])

0 commit comments

Comments
 (0)