From d05739d18eadeb9699d8726a50530f5d80d9aea9 Mon Sep 17 00:00:00 2001 From: bashmak Date: Mon, 9 Apr 2018 15:02:46 +0300 Subject: [PATCH] Change export to nagios filter --- devapp/views.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/devapp/views.py b/devapp/views.py index 0e9e226..17d5e5d 100644 --- a/devapp/views.py +++ b/devapp/views.py @@ -595,8 +595,9 @@ def nagios_objects_conf(request): def norm_name(name: str, replreg=re.compile(r'\W{1,255}', re.IGNORECASE)): return replreg.sub('', name) - for dev in Device.objects.exclude(devtype='On', ip_address='127.0.0.1').select_related('parent_dev').only( - 'ip_address', 'comment', 'parent_dev'): + for dev in Device.objects.exclude(Q(ip_address=None) | Q(ip_address='127.0.0.1'))\ + .select_related('parent_dev')\ + .only('ip_address', 'comment', 'parent_dev'): conf = templ(host_name=norm_name("%d%s" % (dev.pk, translit(dev.comment, language_code='ru', reversed=True))), host_addr=dev.ip_address, parent_host_name=norm_name("%d%s" % (dev.parent_dev.pk,