Filter peer names before raplacing dots
Sven Mäder committed
Feb 13, 2018 at 21:51 UTC
cceb207c4ce6d29d17a045ec8ca3bb028d7d938c
1 file changed
+17
-13
python.d/ntp.chart.py
+17
-13
@@ -195,20 +195,22 @@ class Service(SocketService):
195
"""
196
if peer_ids:
197
peer_ids.sort()
198
- domain = None
198
200
- if self.peer_names:
201
- try:
202
- hostname = socket.gethostname()
203
- fqdn = socket.getfqdn()
204
- if fqdn.startswith(hostname):
205
- domain = fqdn[len(hostname):]
206
- except socket.error:
207
- self.error('Error getting local domain')
199
+ domain = None
200
+
201
+ # Get the local domain name
202
+ if self.peer_names:
203
+ try:
204
+ hostname = socket.gethostname()
205
+ fqdn = socket.getfqdn()
206
+ if fqdn.startswith(hostname):
207
+ domain = fqdn[len(hostname):]
208
+ except socket.error:
209
+ self.error('Error getting local domain')
210
209
- # Get peer data
211
peers = list()
212
213
+ # Get peer data
214
for peer_id in peer_ids:
215
request = self.get_header(peer_id, 'readvar')
216
self.request = request
@@ -232,15 +234,17 @@ class Service(SocketService):
234
if domain:
235
try:
236
name = socket.gethostbyaddr(name)[0]
237
+
238
+ match_peer_filter = self.regex_peer_filter.search(name)
239
+ if match_peer_filter:
240
+ continue
241
+
242
if len(name) > len(domain) and name.endswith(domain):
243
name = name[:-len(domain)]
244
except (IndexError, socket.error):
245
self.error('Failed to reverse lookup address')
246
247
name = name.replace('.', '-')
241
- match_peer_filter = self.regex_peer_filter.search(name)
242
- if match_peer_filter:
243
- continue
248
249
peers.append(Peer(peer_id, name, request))
250