diff --git a/nbxsync/tests/jobs/test_synchost.py b/nbxsync/tests/jobs/test_synchost.py
index 57301928..38e9e154 100644
--- a/nbxsync/tests/jobs/test_synchost.py
+++ b/nbxsync/tests/jobs/test_synchost.py
@@ -4,7 +4,7 @@
from django.test import TestCase
from ipam.models import IPAddress
-from dcim.models import Device
+from dcim.models import Device, Site
from utilities.testing import create_test_device
from nbxsync.choices import ZabbixProxyTypeChoices, ZabbixTLSChoices
@@ -168,6 +168,12 @@ def side_effect(sync_class, *args, **kwargs):
mock_gao.return_value = {
'hostgroups': [],
'hostinterfaces': [self.hostinterface],
+ 'server_assignments': [self.zabbixserverassignment],
+ 'templates': [],
+ 'macros': [],
+ 'tags': [],
+ 'hostinventory': None,
+ 'configurationgroup': None,
}
job.run()
@@ -208,3 +214,73 @@ def test_run_skips_sync_when_both_assignment_and_zabbixserver_sync_disabled(self
job.run()
mock_safe_sync.assert_not_called()
+
+ def test_prepare_assignment_returns_original_for_direct(self):
+ job = SyncHostJob(instance=self.device)
+
+ prepared = job._prepare_assignment(self.zabbixserverassignment)
+
+ self.assertEqual(prepared.pk, self.zabbixserverassignment.pk)
+ self.assertFalse(getattr(prepared, '_is_inherited_copy', False))
+
+ def test_prepare_assignment_copies_inherited(self):
+ site = self.device.site
+ site_ct = ContentType.objects.get_for_model(Site)
+
+ site_assignment = ZabbixServerAssignment.objects.create(
+ zabbixserver=self.zabbixserver,
+ assigned_object_type=site_ct,
+ assigned_object_id=site.pk,
+ zabbixproxy=self.proxy,
+ )
+
+ job = SyncHostJob(instance=self.device)
+ prepared = job._prepare_assignment(site_assignment)
+
+ self.assertIsNone(prepared.pk)
+ self.assertTrue(getattr(prepared, '_is_inherited_copy', False))
+ # Original assignment is untouched
+ self.assertIsNotNone(site_assignment.pk)
+
+ @patch('nbxsync.jobs.synchost.safe_sync')
+ @patch.object(SyncHostJob, 'verify_hostinterfaces')
+ @patch.object(SyncHostJob, 'check_default_hostinterface')
+ def test_run_syncs_inherited_assignment_from_site(self, mock_check, mock_verify, mock_safe_sync):
+ site = self.device.site
+ site_ct = ContentType.objects.get_for_model(Site)
+
+ # Remove the direct assignment so only inherited remains
+ self.zabbixserverassignment.delete()
+
+ ZabbixServerAssignment.objects.create(
+ zabbixserver=self.zabbixserver,
+ assigned_object_type=site_ct,
+ assigned_object_id=site.pk,
+ zabbixproxy=self.proxy,
+ )
+
+ job = SyncHostJob(instance=self.device)
+ job.run()
+
+ # safe_sync should have been called (host groups, proxy, host, interfaces)
+ self.assertTrue(mock_safe_sync.called)
+
+ @patch('nbxsync.jobs.synchost.safe_sync')
+ def test_run_continues_when_assignment_sync_disabled(self, mock_safe_sync):
+ # Create two assignments: one disabled (site-level), one enabled (direct)
+ site = self.device.site
+ site_ct = ContentType.objects.get_for_model(Site)
+
+ ZabbixServerAssignment.objects.create(
+ zabbixserver=self.zabbixserver,
+ assigned_object_type=site_ct,
+ assigned_object_id=site.pk,
+ zabbixproxy=self.proxy,
+ sync_enabled=False,
+ )
+
+ job = SyncHostJob(instance=self.device)
+ job.run()
+
+ # Direct assignment is enabled, so safe_sync should still be called
+ self.assertTrue(mock_safe_sync.called)
diff --git a/nbxsync/tests/utils/test_get_assigned_zabbixobjects.py b/nbxsync/tests/utils/test_get_assigned_zabbixobjects.py
index 6ba98b4c..a2d83e2f 100644
--- a/nbxsync/tests/utils/test_get_assigned_zabbixobjects.py
+++ b/nbxsync/tests/utils/test_get_assigned_zabbixobjects.py
@@ -1,10 +1,11 @@
from django.contrib.contenttypes.models import ContentType
from django.test import TestCase
-from dcim.models import Device, DeviceType, Manufacturer
+from dcim.models import Device, DeviceType, Manufacturer, Site, SiteGroup
from utilities.testing import create_test_device
-from nbxsync.models import ZabbixHostgroup, ZabbixHostgroupAssignment, ZabbixMacro, ZabbixMacroAssignment, ZabbixServer, ZabbixTag, ZabbixTagAssignment, ZabbixTemplate, ZabbixTemplateAssignment
+from nbxsync.choices import ZabbixProxyTypeChoices
+from nbxsync.models import ZabbixHostgroup, ZabbixHostgroupAssignment, ZabbixHostInventory, ZabbixMacro, ZabbixMacroAssignment, ZabbixProxy, ZabbixServer, ZabbixServerAssignment, ZabbixTag, ZabbixTagAssignment, ZabbixTemplate, ZabbixTemplateAssignment
from nbxsync.utils.inheritance import get_assigned_zabbixobjects
@@ -16,6 +17,8 @@ def setUp(self):
self.device_ct = ContentType.objects.get_for_model(Device)
self.manufacturer_ct = ContentType.objects.get_for_model(Manufacturer)
+ self.site_ct = ContentType.objects.get_for_model(Site)
+ self.sitegroup_ct = ContentType.objects.get_for_model(SiteGroup)
self.server = ZabbixServer.objects.create(name='Zabbix1', url='http://localhost', token='abc123', validate_certs=True)
@@ -24,6 +27,19 @@ def setUp(self):
self.tag = ZabbixTag.objects.create(tag='env', value='prod')
self.group = ZabbixHostgroup.objects.create(name='ProdGroup', groupid=201, value='prod', zabbixserver=self.server)
+ self.site = self.device.site
+ self.sitegroup = SiteGroup.objects.create(name='Site Group 1', slug='site-group-1')
+ self.site.group = self.sitegroup
+ self.site.save()
+
+ self.proxy = ZabbixProxy.objects.create(
+ name='Proxy1',
+ zabbixserver=self.server,
+ operating_mode=ZabbixProxyTypeChoices.ACTIVE,
+ local_address='10.0.0.1',
+ local_port=10051,
+ )
+
def test_inherited_assignments(self):
self.template_assignment = ZabbixTemplateAssignment.objects.create(zabbixtemplate=self.template, assigned_object_type=self.manufacturer_ct, assigned_object_id=self.manufacturer.pk)
self.macro_assignment = ZabbixMacroAssignment.objects.create(zabbixmacro=self.macro, assigned_object_type=self.manufacturer_ct, assigned_object_id=self.manufacturer.pk, value='mval')
@@ -49,3 +65,88 @@ def test_direct_assignments(self):
self.assertEqual(len(result['macros']), 1)
self.assertEqual(len(result['tags']), 1)
self.assertEqual(len(result['hostgroups']), 1)
+
+ def test_inherited_server_assignment_from_site(self):
+ ZabbixServerAssignment.objects.create(
+ zabbixserver=self.server,
+ assigned_object_type=self.site_ct,
+ assigned_object_id=self.site.pk,
+ zabbixproxy=self.proxy,
+ )
+
+ result = get_assigned_zabbixobjects(self.device)
+
+ self.assertEqual(len(result['server_assignments']), 1)
+ sa = result['server_assignments'][0]
+ self.assertEqual(sa.zabbixserver, self.server)
+ self.assertEqual(sa.zabbixproxy, self.proxy)
+
+ def test_inherited_server_assignment_from_sitegroup(self):
+ ZabbixServerAssignment.objects.create(
+ zabbixserver=self.server,
+ assigned_object_type=self.sitegroup_ct,
+ assigned_object_id=self.sitegroup.pk,
+ zabbixproxy=self.proxy,
+ )
+
+ result = get_assigned_zabbixobjects(self.device)
+
+ self.assertEqual(len(result['server_assignments']), 1)
+ sa = result['server_assignments'][0]
+ self.assertEqual(sa.zabbixserver, self.server)
+ self.assertEqual(sa.zabbixproxy, self.proxy)
+
+ def test_direct_server_assignment_takes_priority_over_inherited(self):
+ proxy_direct = ZabbixProxy.objects.create(
+ name='Proxy2',
+ zabbixserver=self.server,
+ operating_mode=ZabbixProxyTypeChoices.ACTIVE,
+ local_address='10.0.0.2',
+ local_port=10051,
+ )
+
+ # Direct assignment on the device
+ ZabbixServerAssignment.objects.create(
+ zabbixserver=self.server,
+ assigned_object_type=self.device_ct,
+ assigned_object_id=self.device.pk,
+ zabbixproxy=proxy_direct,
+ )
+ # Inherited assignment on the site
+ ZabbixServerAssignment.objects.create(
+ zabbixserver=self.server,
+ assigned_object_type=self.site_ct,
+ assigned_object_id=self.site.pk,
+ zabbixproxy=self.proxy,
+ )
+
+ result = get_assigned_zabbixobjects(self.device)
+
+ # Both should be present (direct + inherited)
+ self.assertEqual(len(result['server_assignments']), 1)
+ sa = result['server_assignments'][0]
+ # Direct takes priority
+ self.assertEqual(sa.zabbixproxy, proxy_direct)
+
+ def test_inherited_hostinventory_from_manufacturer(self):
+ ZabbixHostInventory.objects.create(
+ assigned_object_type=self.manufacturer_ct,
+ assigned_object_id=self.manufacturer.pk,
+ inventory_mode=1,
+ )
+
+ result = get_assigned_zabbixobjects(self.device)
+
+ self.assertIsNotNone(result['hostinventory'])
+ self.assertEqual(result['hostinventory'].inventory_mode, 1)
+
+ def test_no_assignments_returns_empty(self):
+ result = get_assigned_zabbixobjects(self.device)
+
+ self.assertEqual(result['templates'], [])
+ self.assertEqual(result['macros'], [])
+ self.assertEqual(result['tags'], [])
+ self.assertEqual(result['hostgroups'], [])
+ self.assertEqual(result['server_assignments'], [])
+ self.assertIsNone(result['hostinventory'])
+ self.assertIsNone(result['configurationgroup'])
diff --git a/nbxsync/tests/utils/test_hostsync.py b/nbxsync/tests/utils/test_hostsync.py
index 5f2b193e..a7bc12af 100644
--- a/nbxsync/tests/utils/test_hostsync.py
+++ b/nbxsync/tests/utils/test_hostsync.py
@@ -467,7 +467,7 @@ class DummyHostInventory:
def __init__(self):
self.inventory_mode = 1
- def render_all_fields(self):
+ def render_all_fields(self, object=None):
return {
'serialnumber': ('ABC123', True),
'location': ('', True), # Empty, should be skipped
diff --git a/nbxsync/tests/utils/test_zabbixtemplaterule.py b/nbxsync/tests/utils/test_zabbixtemplaterule.py
new file mode 100644
index 00000000..85ceeaef
--- /dev/null
+++ b/nbxsync/tests/utils/test_zabbixtemplaterule.py
@@ -0,0 +1,167 @@
+from unittest.mock import patch
+
+from django.contrib.contenttypes.models import ContentType
+from django.test import TestCase
+
+from dcim.models import Platform
+from utilities.testing import create_test_device
+
+from nbxsync.models import ZabbixServer, ZabbixTemplate, ZabbixTemplateAssignment, ZabbixTemplateRule
+from nbxsync.utils.inheritance import get_assigned_zabbixobjects
+
+
+class ZabbixTemplateRuleTestCase(TestCase):
+ def setUp(self):
+ self.device = create_test_device(name='TestDev')
+ self.server = ZabbixServer.objects.create(name='Zabbix1', url='http://zabbix.local', token='abc123', validate_certs=True)
+ self.template_windows = ZabbixTemplate.objects.create(name='Windows by Zabbix agent', zabbixserver=self.server, templateid=10081)
+ self.template_linux = ZabbixTemplate.objects.create(name='Linux by Zabbix agent', zabbixserver=self.server, templateid=10001)
+ self.platform_ct = ContentType.objects.get_for_model(Platform)
+
+ @patch('nbxsync.utils.inheritance.get_plugin_settings')
+ def test_regex_rule_matches_platform_name(self, mock_settings):
+ mock_settings.return_value.inheritance_chain = []
+ platform = Platform.objects.create(name='Windows Server 2022 (Build 20348.5400)', slug='win-2022-5400')
+ self.device.platform = platform
+ self.device.save()
+
+ ZabbixTemplateRule.objects.create(
+ name='Windows',
+ pattern='Windows',
+ zabbixtemplate=self.template_windows,
+ )
+
+ result = get_assigned_zabbixobjects(self.device)
+
+ templates = result['templates']
+ self.assertEqual(len(templates), 1)
+ self.assertEqual(templates[0].zabbixtemplate, self.template_windows)
+
+ @patch('nbxsync.utils.inheritance.get_plugin_settings')
+ def test_regex_rule_does_not_match_wrong_platform(self, mock_settings):
+ mock_settings.return_value.inheritance_chain = []
+ platform = Platform.objects.create(name='Ubuntu 24.04 LTS', slug='ubuntu-2404')
+ self.device.platform = platform
+ self.device.save()
+
+ ZabbixTemplateRule.objects.create(
+ name='Windows',
+ pattern='Windows',
+ zabbixtemplate=self.template_windows,
+ )
+
+ result = get_assigned_zabbixobjects(self.device)
+
+ self.assertEqual(result['templates'], [])
+
+ @patch('nbxsync.utils.inheritance.get_plugin_settings')
+ def test_multiple_rules_match_correctly(self, mock_settings):
+ mock_settings.return_value.inheritance_chain = []
+ win_platform = Platform.objects.create(name='Windows Server 2019', slug='win2019')
+ linux_platform = Platform.objects.create(name='Ubuntu 22.04 LTS', slug='ubuntu2204')
+
+ ZabbixTemplateRule.objects.create(name='Windows', pattern='Windows', zabbixtemplate=self.template_windows)
+ ZabbixTemplateRule.objects.create(name='Linux', pattern='Ubuntu|Debian|Red Hat|CentOS', zabbixtemplate=self.template_linux)
+
+ # Windows device
+ self.device.platform = win_platform
+ self.device.save()
+ result = get_assigned_zabbixobjects(self.device)
+ self.assertEqual(len(result['templates']), 1)
+ self.assertEqual(result['templates'][0].zabbixtemplate, self.template_windows)
+
+ # Linux device
+ device2 = create_test_device(name='TestDev2')
+ device2.platform = linux_platform
+ device2.save()
+ result2 = get_assigned_zabbixobjects(device2)
+ self.assertEqual(len(result2['templates']), 1)
+ self.assertEqual(result2['templates'][0].zabbixtemplate, self.template_linux)
+
+ @patch('nbxsync.utils.inheritance.get_plugin_settings')
+ def test_direct_assignment_overrides_regex_rule(self, mock_settings):
+ mock_settings.return_value.inheritance_chain = []
+ platform = Platform.objects.create(name='Windows Server 2022', slug='win2022')
+ self.device.platform = platform
+ self.device.save()
+
+ # Direct assignment on the device
+ ZabbixTemplateAssignment.objects.create(
+ zabbixtemplate=self.template_linux,
+ assigned_object_type=ContentType.objects.get_for_model(type(self.device)),
+ assigned_object_id=self.device.pk,
+ )
+
+ # Regex rule that would match Windows
+ ZabbixTemplateRule.objects.create(name='Windows', pattern='Windows', zabbixtemplate=self.template_windows)
+
+ result = get_assigned_zabbixobjects(self.device)
+
+ # Direct assignment (template_linux) + regex rule (template_windows)
+ # Both should appear because they are different templates
+ # but direct assignment prevents the SAME template from being added by regex
+ templates = result['templates']
+ self.assertEqual(len(templates), 2)
+ template_ids = {t.zabbixtemplate_id for t in templates}
+ self.assertEqual(template_ids, {self.template_linux.id, self.template_windows.id})
+
+ @patch('nbxsync.utils.inheritance.get_plugin_settings')
+ def test_disabled_rule_ignored(self, mock_settings):
+ mock_settings.return_value.inheritance_chain = []
+ platform = Platform.objects.create(name='Windows Server 2022', slug='win2022')
+ self.device.platform = platform
+ self.device.save()
+
+ ZabbixTemplateRule.objects.create(
+ name='Windows',
+ pattern='Windows',
+ zabbixtemplate=self.template_windows,
+ enabled=False,
+ )
+
+ result = get_assigned_zabbixobjects(self.device)
+
+ self.assertEqual(result['templates'], [])
+
+ @patch('nbxsync.utils.inheritance.get_plugin_settings')
+ def test_case_insensitive_matching(self, mock_settings):
+ mock_settings.return_value.inheritance_chain = []
+ platform = Platform.objects.create(name='UBUNTU 24.04 LTS', slug='ubuntu-2404')
+ self.device.platform = platform
+ self.device.save()
+
+ ZabbixTemplateRule.objects.create(name='Linux', pattern='ubuntu', zabbixtemplate=self.template_linux)
+
+ result = get_assigned_zabbixobjects(self.device)
+
+ self.assertEqual(len(result['templates']), 1)
+ self.assertEqual(result['templates'][0].zabbixtemplate, self.template_linux)
+
+ @patch('nbxsync.utils.inheritance.get_plugin_settings')
+ def test_device_without_platform_no_rules(self, mock_settings):
+ mock_settings.return_value.inheritance_chain = []
+
+ ZabbixTemplateRule.objects.create(name='Windows', pattern='Windows', zabbixtemplate=self.template_windows)
+
+ result = get_assigned_zabbixobjects(self.device)
+
+ self.assertEqual(result['templates'], [])
+
+ @patch('nbxsync.utils.inheritance.get_plugin_settings')
+ def test_rule_priority_ordering(self, mock_settings):
+ mock_settings.return_value.inheritance_chain = []
+ platform = Platform.objects.create(name='Windows Ubuntu Hybrid', slug='hybrid')
+ self.device.platform = platform
+ self.device.save()
+
+ # Both rules match, but Windows has lower priority value (higher priority)
+ ZabbixTemplateRule.objects.create(name='Linux', pattern='Ubuntu', zabbixtemplate=self.template_linux, priority=200)
+ ZabbixTemplateRule.objects.create(name='Windows', pattern='Windows', zabbixtemplate=self.template_windows, priority=100)
+
+ result = get_assigned_zabbixobjects(self.device)
+
+ # Both should match (different templates)
+ templates = result['templates']
+ self.assertEqual(len(templates), 2)
+ template_ids = {t.zabbixtemplate_id for t in templates}
+ self.assertEqual(template_ids, {self.template_windows.id, self.template_linux.id})
diff --git a/nbxsync/urls.py b/nbxsync/urls.py
index c8674e6b..6000c268 100644
--- a/nbxsync/urls.py
+++ b/nbxsync/urls.py
@@ -197,6 +197,15 @@
path('zabbixconfigurationgroupassignment//edit/', ZabbixConfigurationGroupAssignmentEditView.as_view(), name='zabbixconfigurationgroupassignment_edit'),
path('zabbixconfigurationgroupassignment//delete/', ZabbixConfigurationGroupAssignmentDeleteView.as_view(), name='zabbixconfigurationgroupassignment_delete'),
path('zabbixconfigurationgroupassignment//changelog/', ObjectChangeLogView.as_view(), name='zabbixconfigurationgroupassignment_changelog', kwargs={'model': ZabbixConfigurationGroupAssignment}),
+ # Zabbix Template Rule
+ path('zabbixtemplaterule/', ZabbixTemplateRuleListView.as_view(), name='zabbixtemplaterule_list'),
+ path('zabbixtemplaterule/add/', ZabbixTemplateRuleEditView.as_view(), name='zabbixtemplaterule_add'),
+ path('zabbixtemplaterule/edit/', ZabbixTemplateRuleBulkEditView.as_view(), name='zabbixtemplaterule_bulk_edit'),
+ path('zabbixtemplaterule/delete/', ZabbixTemplateRuleBulkDeleteView.as_view(), name='zabbixtemplaterule_bulk_delete'),
+ path('zabbixtemplaterule//', ZabbixTemplateRuleView.as_view(), name='zabbixtemplaterule'),
+ path('zabbixtemplaterule//edit/', ZabbixTemplateRuleEditView.as_view(), name='zabbixtemplaterule_edit'),
+ path('zabbixtemplaterule//delete/', ZabbixTemplateRuleDeleteView.as_view(), name='zabbixtemplaterule_delete'),
+ path('zabbixtemplaterule//changelog/', ObjectChangeLogView.as_view(), name='zabbixtemplaterule_changelog', kwargs={'model': ZabbixTemplateRule}),
# Sync Device/VM Object
path('zabbixhost///sync', TriggerHostSyncJobView.as_view(), name='zabbixhost_sync'),
path('zabbixhost///sync-info/', ZabbixSyncInfoModalView.as_view(), name='zabbixhost_info'),
diff --git a/nbxsync/utils/inheritance.py b/nbxsync/utils/inheritance.py
index 133caa16..c57d7ebf 100644
--- a/nbxsync/utils/inheritance.py
+++ b/nbxsync/utils/inheritance.py
@@ -1,13 +1,14 @@
+import copy as _copy
from collections import OrderedDict
-from django.db.models import Model, QuerySet
-from django.db.models.manager import BaseManager
from django.contrib.contenttypes.models import ContentType
+from django.db.models import QuerySet
+from django.db.models.manager import BaseManager
from nbxsync.constants import PATH_LABELS
-from nbxsync.models import ZabbixHostgroupAssignment, ZabbixHostInterface, ZabbixHostInventory, ZabbixMacroAssignment, ZabbixTagAssignment, ZabbixTemplateAssignment, ZabbixConfigurationGroupAssignment
+from nbxsync.models import ZabbixConfigurationGroupAssignment, ZabbixHostgroupAssignment, ZabbixHostInterface, ZabbixHostInventory, ZabbixMacroAssignment, ZabbixServerAssignment, ZabbixTagAssignment, ZabbixTemplateAssignment, ZabbixTemplateRule
from nbxsync.settings import get_plugin_settings
-from nbxsync.tables import ZabbixHostgroupAssignmentObjectViewTable, ZabbixMacroAssignmentObjectViewTable, ZabbixTagAssignmentObjectViewTable, ZabbixTemplateAssignmentObjectViewTable
+from nbxsync.tables import ZabbixHostgroupAssignmentObjectViewTable, ZabbixMacroAssignmentObjectViewTable, ZabbixServerAssignmentObjectViewTable, ZabbixTagAssignmentObjectViewTable, ZabbixTemplateAssignmentObjectViewTable
def get_zabbixassignments_for_request(instance, request):
@@ -28,10 +29,13 @@ def table_or_none(data, table_cls, attach_instance=False):
return None
return {
+ 'zabbixserver_assignments_table': table_or_none(assignments.get('server_assignments'), ZabbixServerAssignmentObjectViewTable),
'zabbix_template_table': table_or_none(assignments['templates'], ZabbixTemplateAssignmentObjectViewTable),
'zabbix_macro_table': table_or_none(assignments['macros'], ZabbixMacroAssignmentObjectViewTable, attach_instance=True),
'zabbix_tag_table': table_or_none(assignments['tags'], ZabbixTagAssignmentObjectViewTable),
'zabbix_hostgroup_table': table_or_none(assignments['hostgroups'], ZabbixHostgroupAssignmentObjectViewTable),
+ 'hostinventory_assignment': assignments.get('hostinventory'),
+ 'configurationgroup_assignment': assignments.get('configurationgroup'),
'object': instance,
'content_type': content_type,
}
@@ -65,31 +69,103 @@ def get_assigned_zabbixobjects(instance, zabbixserver=None):
hostinterfaces_qs = ZabbixHostInterface.objects.filter(assigned_object_type=content_type, assigned_object_id=instance.id)
if zabbixserver:
hostinterfaces_qs = hostinterfaces_qs.filter(zabbixserver=zabbixserver)
- hostinterfaces = list(hostinterfaces_qs)
+ direct_hostinterfaces = list(hostinterfaces_qs)
+
+ direct_server_assignments = ZabbixServerAssignment.objects.filter(assigned_object_type=content_type, assigned_object_id=instance.id).select_related('zabbixproxy', 'zabbixproxygroup')
+ if zabbixserver:
+ direct_server_assignments = direct_server_assignments.filter(zabbixserver=zabbixserver)
+ direct_server_assignments = list(direct_server_assignments)
hostinventory = ZabbixHostInventory.objects.filter(assigned_object_type=content_type, assigned_object_id=instance.id).first()
- configurationgroup = ZabbixConfigurationGroupAssignment.objects.filter(assigned_object_type=content_type, assigned_object_id=instance.id).first()
+ direct_configurationgroup = ZabbixConfigurationGroupAssignment.objects.filter(assigned_object_type=content_type, assigned_object_id=instance.id).first()
inherited = resolve_inherited_zabbix_assignments(instance, zabbixserver)
+ if not hostinventory:
+ hostinventory = inherited.get('hostinventory')
+
+ configurationgroup = direct_configurationgroup or next(iter(inherited.get('configurationgroups', {}).values()), None)
+
def merge(direct, inherited_map, key):
direct_ids = {getattr(obj, key) for obj in direct}
inherited_filtered = [obj for obj in inherited_map.values() if getattr(obj, key) not in direct_ids]
return direct + inherited_filtered
+ # Merge direct + inherited (direct takes priority)
+ # ZabbixHostInterfaces assigned to SiteGroup/Role/Site are resolved
+ # naturally by the inheritance chain. If the interface lacks an IP,
+ # HostInterfaceSync.get_create_params() falls back to the device's
+ # primary IP automatically.
+ hostinterfaces = merge(direct_hostinterfaces, inherited.get('hostinterfaces', {}), 'id')
+ # Expand ConfigGroup-defined interfaces for this specific instance.
+ # When a ConfigGroup is assigned at Site/Platform level, the signal-based
+ # propagation cannot clone per-device interfaces (Site has no primary_ip).
+ # Resolve them here so HostSync and HostInterfaceSync get device-specific interfaces.
+ if configurationgroup:
+ cg_ct = ContentType.objects.get_for_model(configurationgroup.zabbixconfigurationgroup)
+ cg_interfaces = ZabbixHostInterface.objects.filter(
+ assigned_object_type=cg_ct,
+ assigned_object_id=configurationgroup.zabbixconfigurationgroup_id,
+ )
+ existing_types = {hi.type for hi in hostinterfaces}
+ primary_ip = getattr(instance, 'primary_ip4', None) or getattr(instance, 'primary_ip6', None)
+ for cg_iface in cg_interfaces:
+ if cg_iface.type not in existing_types:
+ # Clone the interface with the device's primary IP
+ child = _copy.copy(cg_iface)
+ child.pk = None
+ child._is_inherited_copy = True
+ child.assigned_object_type = content_type
+ child.assigned_object_id = instance.id
+ child.ip = primary_ip if primary_ip else None
+ hostinterfaces.append(child)
+
+ # Resolve regex-based template rules (matched against platform name)
+ # These are applied after direct + inherited, so explicit assignments always win
+ merged_templates = merge(direct_templates, inherited['templates'], 'zabbixtemplate_id')
+ resolved_template_ids = {getattr(obj, 'zabbixtemplate_id') for obj in merged_templates}
+ merged_hostgroups = merge(direct_hostgroups, inherited['hostgroups'], 'zabbixhostgroup_id')
+ merged_tags = merge(direct_tags, inherited['tags'], 'id')
+ platform = getattr(instance, 'platform', None)
+ if platform:
+ rules_qs = ZabbixTemplateRule.objects.filter(enabled=True).select_related('zabbixtemplate')
+ if zabbixserver:
+ rules_qs = rules_qs.filter(zabbixtemplate__zabbixserver=zabbixserver)
+ for rule in rules_qs.order_by('priority', 'name'):
+ if not rule.matches(platform.name):
+ continue
+ inherited_from = f'Regex: {rule.name}'
+ if rule.zabbixtemplate_id and rule.zabbixtemplate_id not in resolved_template_ids:
+ # Create an unsaved ZabbixTemplateAssignment wrapper so downstream
+ # code (table rendering, sync) sees the same interface as real assignments.
+ wrapper = ZabbixTemplateAssignment(
+ zabbixtemplate=rule.zabbixtemplate,
+ assigned_object_type=content_type,
+ assigned_object_id=instance.id,
+ )
+ wrapper.pk = None
+ wrapper._is_inherited_copy = True
+ wrapper._inherited_from = inherited_from
+ merged_templates.append(wrapper)
+ resolved_template_ids.add(rule.zabbixtemplate_id)
+
return {
- 'templates': merge(direct_templates, inherited['templates'], 'zabbixtemplate_id'),
+ 'templates': merged_templates,
'macros': merge(direct_macros, inherited['macros'], 'zabbixmacro_id'),
- 'tags': merge(direct_tags, inherited['tags'], 'id'),
- 'hostgroups': merge(direct_hostgroups, inherited['hostgroups'], 'zabbixhostgroup_id'),
+ 'tags': merged_tags,
+ 'hostgroups': merged_hostgroups,
'hostinterfaces': hostinterfaces,
'hostinventory': hostinventory,
'configurationgroup': configurationgroup,
+ 'server_assignments': merge(direct_server_assignments, inherited.get('server_assignments', {}), 'zabbixserver_id'),
}
def resolve_inherited_zabbix_assignments(assigned_object, zabbixserver=None):
resolved_templates = OrderedDict()
+ resolved_server_assignments = OrderedDict()
+ resolved_hostinterfaces = OrderedDict()
+ resolved_hostinventory = None
resolved_macros = OrderedDict()
resolved_tags = OrderedDict()
resolved_hostgroups = OrderedDict()
@@ -102,6 +178,7 @@ def resolve_inherited_zabbix_assignments(assigned_object, zabbixserver=None):
def resolve_path(obj, path):
cur = obj
+ seen = set()
for attr in path:
cur = getattr(cur, attr, None)
if cur is None:
@@ -112,6 +189,9 @@ def resolve_path(obj, path):
# If it's something that still isn't a model instance after collapsing, bail
if cur is None:
return None
+ if cur in seen:
+ return None # cycle detected
+ seen.add(cur)
return cur
pluginsettings = get_plugin_settings()
@@ -134,6 +214,13 @@ def resolve_path(obj, path):
templates = templates.filter(zabbixtemplate__zabbixserver=zabbixserver)
hostgroups = hostgroups.filter(zabbixhostgroup__zabbixserver=zabbixserver)
+ server_assignments = ZabbixServerAssignment.objects.filter(assigned_object_type=ct, assigned_object_id=related_obj.pk).select_related('zabbixproxy', 'zabbixproxygroup')
+ hostinterfaces = ZabbixHostInterface.objects.filter(assigned_object_type=ct, assigned_object_id=related_obj.pk)
+
+ if zabbixserver:
+ server_assignments = server_assignments.filter(zabbixserver=zabbixserver)
+ hostinterfaces = hostinterfaces.filter(zabbixserver=zabbixserver)
+ hostinventory = ZabbixHostInventory.objects.filter(assigned_object_type=ct, assigned_object_id=related_obj.pk).first()
# print(f'[Resolved from {label}] {related_obj}: inherited {len(templates)} templates, {len(macros)} macros, {len(tags)} tags, {len(hostgroups)} hostgroups, {len(configurationgroups)} configurationgroups,')
for template in templates:
@@ -141,6 +228,19 @@ def resolve_path(obj, path):
template._inherited_from = PATH_LABELS.get(path, '.'.join(path))
resolved_templates[template.zabbixtemplate_id] = template
seen_template_ids.add(template.zabbixtemplate_id)
+ for sa in server_assignments:
+ if sa.zabbixserver_id not in resolved_server_assignments:
+ sa._inherited_from = PATH_LABELS.get(path, '.'.join(path))
+ resolved_server_assignments[sa.zabbixserver_id] = sa
+
+ if hostinventory and not resolved_hostinventory:
+ hostinventory._inherited_from = PATH_LABELS.get(path, '.'.join(path))
+ resolved_hostinventory = hostinventory
+
+ for hi in hostinterfaces:
+ if hi.id not in resolved_hostinterfaces:
+ hi._inherited_from = PATH_LABELS.get(path, '.'.join(path))
+ resolved_hostinterfaces[hi.id] = hi
for macro in macros:
if macro.zabbixmacro_id not in seen_macro_ids:
@@ -167,6 +267,9 @@ def resolve_path(obj, path):
seen_configurationgroup_ids.add(configurationgroup.zabbixconfigurationgroup_id)
return {
+ 'server_assignments': resolved_server_assignments,
+ 'hostinterfaces': resolved_hostinterfaces,
+ 'hostinventory': resolved_hostinventory,
'templates': resolved_templates,
'macros': resolved_macros,
'tags': resolved_tags,
diff --git a/nbxsync/utils/sync/hostinterfacesync.py b/nbxsync/utils/sync/hostinterfacesync.py
index 93a8cf86..7aee173f 100644
--- a/nbxsync/utils/sync/hostinterfacesync.py
+++ b/nbxsync/utils/sync/hostinterfacesync.py
@@ -14,6 +14,12 @@ def api_object(self):
def get_name_value(self):
return self.obj.assigned_object.name
+ def find_by_name(self):
+ hostid = self.context.get('hostid', None)
+ if not hostid:
+ return []
+ return self.api_object().get(hostids=[hostid], filter={'type': str(self.obj.type)})
+
def get_create_params(self):
hostid = self.context.get('hostid', None)
zbxserverassignment = None
@@ -31,6 +37,13 @@ def get_create_params(self):
ipaddr = ''
if self.obj.ip_id:
ipaddr = IPAddress.objects.get(id=self.obj.ip_id).address.ip
+ elif self.context.get('_instance'):
+ # If the interface is inherited (e.g. from SiteGroup or Role)
+ # and has no IP assigned, fall back to the device's primary IP
+ instance = self.context.get('_instance')
+ primary_ip = getattr(instance, 'primary_ip4', None) or getattr(instance, 'primary_ip6', None)
+ if primary_ip:
+ ipaddr = primary_ip.address.ip
dns_name, _ = self.obj.render_dns()
result = {
diff --git a/nbxsync/utils/sync/hostsync.py b/nbxsync/utils/sync/hostsync.py
index b9efbdfe..a1c777f0 100644
--- a/nbxsync/utils/sync/hostsync.py
+++ b/nbxsync/utils/sync/hostsync.py
@@ -1,3 +1,4 @@
+import logging
import re
from datetime import datetime, timedelta
@@ -12,6 +13,8 @@
from nbxsync.models import ZabbixHostInterface, ZabbixMaintenance, ZabbixMaintenancePeriod, ZabbixMaintenanceObjectAssignment
from nbxsync.utils.sync.hostinterfacesync import HostInterfaceSync
+logger = logging.getLogger(__name__)
+
class HostSync(ZabbixSyncBase):
id_field = 'hostid'
@@ -20,27 +23,41 @@ class HostSync(ZabbixSyncBase):
def api_object(self):
return self.api.host
+ def _get_sync_target(self):
+ """Return the Device/VM being synced, falling back to the assignment's assigned_object.
+
+ When a ZabbixServerAssignment is inherited from a Site, Platform, etc.,
+ ``self.obj.assigned_object`` is that higher-level object, not the Device.
+ The sync engine passes the actual instance via ``all_objects['_instance']``
+ so that status, description, serial, and other device-level attributes
+ resolve correctly.
+ """
+ return self.context.get('all_objects', {}).get('_instance') or self.obj.assigned_object
+
def get_base_name(self):
# If the object has the "name" attribute, only return that (Device). If not (cornercase?), return the display string
- if hasattr(self.obj.assigned_object, 'name'):
- return self.obj.assigned_object.name
+ sync_target = self._get_sync_target()
+ if hasattr(sync_target, 'name'):
+ return sync_target.name
- return str(self.obj.assigned_object)
+ return str(sync_target)
def get_name_value(self):
+ sync_target = self._get_sync_target()
base_name = self.get_base_name()
cf_name = getattr(self.pluginsettings, 'custom_field_hostname', '')
- if cf_name and hasattr(self.obj.assigned_object, 'custom_field_data'):
- cf_value = self.obj.assigned_object.custom_field_data.get(cf_name)
+ if cf_name and hasattr(sync_target, 'custom_field_data'):
+ cf_value = sync_target.custom_field_data.get(cf_name)
if cf_value:
return str(cf_value)
return base_name
def get_display_name(self):
+ sync_target = self._get_sync_target()
base_name = self.get_base_name()
cf_name = getattr(self.pluginsettings, 'custom_field_display_name', '')
- if cf_name and hasattr(self.obj.assigned_object, 'custom_field_data'):
- cf_value = self.obj.assigned_object.custom_field_data.get(cf_name)
+ if cf_name and hasattr(sync_target, 'custom_field_data'):
+ cf_value = sync_target.custom_field_data.get(cf_name)
if cf_value:
return str(cf_value)
return base_name
@@ -49,8 +66,9 @@ def find_by_name(self):
return self.api_object().get(filter={'host': self.sanitize_string(input_str=str(self.get_name_value()))})
def get_create_params(self):
- status = self.obj.assigned_object.status
- object_type = self.obj.assigned_object._meta.model_name # "device" or "virtualmachine"
+ sync_target = self._get_sync_target()
+ status = sync_target.status
+ object_type = sync_target._meta.model_name # "device" or "virtualmachine"
status_mapping = getattr(self.pluginsettings.statusmapping, object_type, {})
zabbix_status = status_mapping.get(status)
@@ -65,7 +83,7 @@ def get_create_params(self):
'name': self.get_display_name(),
'groups': self.get_groups(),
'status': host_status,
- 'description': self.obj.assigned_object.description or '',
+ 'description': sync_target.description or '',
**self.get_proxy_or_proxygroup(),
**self.get_hostinterface_attributes(),
**self.get_tag_attributes(),
@@ -117,7 +135,7 @@ def get_proxy_or_proxygroup(self):
def get_defined_macros(self):
result = []
for macro in self.context.get('all_objects', {}).get('macros'):
- rendered_value, _ = macro.render(object=self.obj.assigned_object)
+ rendered_value, _ = macro.render(object=self._get_sync_target())
result.append(
{
'macro': str(macro),
@@ -308,8 +326,9 @@ def get_template_attributes(self):
return {'templates': result}
def get_tag_attributes(self):
- status = self.obj.assigned_object.status
- object_type = self.obj.assigned_object._meta.model_name # "device" or "virtualmachine"
+ sync_target = self._get_sync_target()
+ status = sync_target.status
+ object_type = sync_target._meta.model_name # "device" or "virtualmachine"
status_mapping = getattr(self.pluginsettings.statusmapping, object_type, {})
zabbix_status = status_mapping.get(status)
@@ -318,12 +337,25 @@ def get_tag_attributes(self):
value, _ = assigned_tag.render()
result.append({'tag': assigned_tag.zabbixtag.tag, 'value': value})
+ # Deduplicate tags by (tag, value). The same tag value can be
+ # resolved from multiple sources in the inheritance chain (e.g.
+ # environment=Production inherited from both a specific role
+ # and the parent Server role), which Zabbix rejects.
+ seen = set()
+ deduped = []
+ for tag in result:
+ key = (tag['tag'], tag['value'])
+ if key not in seen:
+ seen.add(key)
+ deduped.append(tag)
+ result = deduped
+
if zabbix_status == ZabbixHostStatus.ENABLED_NO_ALERTING:
result.append({'tag': self.pluginsettings.no_alerting_tag, 'value': str(self.pluginsettings.no_alerting_tag_value)})
if self.pluginsettings.attach_objtag:
- result.append({'tag': self.pluginsettings.objtag_type, 'value': str(type(self.obj.assigned_object).__name__).lower()})
- result.append({'tag': self.pluginsettings.objtag_id, 'value': str(self.obj.assigned_object.id)})
+ result.append({'tag': self.pluginsettings.objtag_type, 'value': str(type(sync_target).__name__).lower()})
+ result.append({'tag': self.pluginsettings.objtag_id, 'value': str(sync_target.id)})
return {'tags': result}
@@ -358,13 +390,15 @@ def get_groups(self):
def get_hostinventory(self):
hostinventory = self.context.get('all_objects', {}).get('hostinventory', None)
+ sync_target = self._get_sync_target()
inventory = {}
inventory_mode = 0
if hostinventory:
inventory_mode = hostinventory.inventory_mode or 0
- for field_name, (rendered_value, success) in hostinventory.render_all_fields().items():
+ # Override the context object with the actual device/VM for Jinja2 rendering
+ for field_name, (rendered_value, success) in hostinventory.render_all_fields(object=sync_target).items():
if success and rendered_value:
inventory[field_name] = rendered_value
@@ -375,13 +409,14 @@ def get_hostinventory(self):
return result
def verify_maintenancewindow(self):
- status = self.obj.assigned_object.status
- object_type = self.obj.assigned_object._meta.model_name # "device" or "virtualmachine"
+ sync_target = self._get_sync_target()
+ status = sync_target.status
+ object_type = sync_target._meta.model_name # "device" or "virtualmachine"
status_mapping = getattr(self.pluginsettings.statusmapping, object_type, {})
zabbix_status = status_mapping.get(status)
- object_ct = ContentType.objects.get_for_model(self.obj.assigned_object)
- mw_assignments = ZabbixMaintenanceObjectAssignment.objects.filter(assigned_object_type=object_ct, assigned_object_id=self.obj.assigned_object.id)
+ object_ct = ContentType.objects.get_for_model(sync_target)
+ mw_assignments = ZabbixMaintenanceObjectAssignment.objects.filter(assigned_object_type=object_ct, assigned_object_id=sync_target.id)
if zabbix_status != ZabbixHostStatus.ENABLED_IN_MAINTENANCE:
for assignment in mw_assignments:
@@ -401,11 +436,11 @@ def verify_maintenancewindow(self):
now = datetime.now()
end_date = now + timedelta(seconds=int(self.pluginsettings.maintenance_window_duration))
# Create the Maintenance object
- maintenance = ZabbixMaintenance(name=f'[AUTOMATIC] {str(self.obj.assigned_object)}', description='Automatically created maintenance object due to the object status', automatic=True, active_since=now, active_till=end_date, zabbixserver=self.obj.zabbixserver)
+ maintenance = ZabbixMaintenance(name=f'[AUTOMATIC] {str(sync_target)}', description='Automatically created maintenance object due to the object status', automatic=True, active_since=now, active_till=end_date, zabbixserver=self.obj.zabbixserver)
maintenance.save()
# Assign this host to the Maintenance object
- ZabbixMaintenanceObjectAssignment(zabbixmaintenance=maintenance, assigned_object_type=object_ct, assigned_object_id=self.obj.assigned_object.id).save()
+ ZabbixMaintenanceObjectAssignment(zabbixmaintenance=maintenance, assigned_object_type=object_ct, assigned_object_id=sync_target.id).save()
# And create the maintenance period
seconds_of_day = now.hour * 3600 + now.minute * 60 + now.second
ZabbixMaintenancePeriod(zabbixmaintenance=maintenance, start_date=now, start_time=seconds_of_day, period=int(self.pluginsettings.maintenance_window_duration)).save()
@@ -563,12 +598,25 @@ def verify_hostinterfaces(self):
# Extract the currently expected interfaces
expected_hostinterfaces = self.context.get('all_objects', {}).get('hostinterfaces', [])
- expected_ids = {int(expected_hostinterface.interfaceid) for expected_hostinterface in expected_hostinterfaces}
+ expected_ids = {int(expected_hostinterface.interfaceid) for expected_hostinterface in expected_hostinterfaces if expected_hostinterface.interfaceid}
# Get currently assigned hostinterface from Zabbix
current_hostinterfaces = self.api.hostinterface.get(output=['extend'], hostids=self.obj.hostid)
current_ids = {int(current_hostinterface['interfaceid']) for current_hostinterface in current_hostinterfaces}
+ # For expected interfaces without an interfaceid (e.g. inherited from a
+ # ConfigGroup), match by type to the Zabbix interfaces so they are not deleted.
+ expected_types = {int(hi.type) for hi in expected_hostinterfaces}
+ # Match by type so ConfigGroup-inherited interfaces (which have no
+ # persisted interfaceid) are not treated as stale and deleted.
+ # Since zabbix_utils wraps responses differently in worker vs shell,
+ # just don't delete any interfaces that might be linked to items.
+ # The ConfigGroup-expanded interface has interfaceid=None, so it's
+ # not in expected_ids — but trying to delete it fails when items are linked.
+ # Skip deletion entirely for inherited copies.
+ if getattr(self.obj, '_is_inherited_copy', False):
+ return
+
to_be_deleted = current_ids - expected_ids
for id_to_delete in to_be_deleted:
self.api.hostinterface.delete(id_to_delete)
diff --git a/nbxsync/utils/sync/syncbase.py b/nbxsync/utils/sync/syncbase.py
index 723a6d1f..86fcdeac 100644
--- a/nbxsync/utils/sync/syncbase.py
+++ b/nbxsync/utils/sync/syncbase.py
@@ -62,7 +62,7 @@ def sync(self):
self.sync_from_zabbix(found)
elif self.sot == SyncSOT.NETBOX:
self.sync_to_zabbix(object_id)
- self.obj.save()
+ if not getattr(self.obj, '_is_inherited_copy', False): self.obj.save()
logger.debug(f'Found and synced {self.__class__.__name__} ID: {object_id}')
else:
# Object not found: create in Zabbix, always
@@ -72,11 +72,13 @@ def sync(self):
raise RuntimeError(f'{self.__class__.__name__} creation returned no ID.')
except RuntimeError as err:
logger.warning(str(err))
- self.obj.update_sync_info(success=False, message=str(err))
+ if not getattr(self.obj, '_is_inherited_copy', False):
+ self.obj.update_sync_info(success=False, message=str(err))
raise
self.set_id(object_id)
- self.obj.save()
- self.obj.update_sync_info(success=True)
+ if not getattr(self.obj, '_is_inherited_copy', False):
+ self.obj.save()
+ self.obj.update_sync_info(success=True)
def try_create(self):
try:
@@ -116,8 +118,9 @@ def sync_from_zabbix(self, data):
def sync_to_zabbix(self, object_id):
self.set_id(object_id)
- self.obj.save()
- self.obj.update_sync_info(success=True)
+ if not getattr(self.obj, '_is_inherited_copy', False):
+ self.obj.save()
+ self.obj.update_sync_info(success=True)
self.update_in_zabbix(object_id=object_id)
def update_in_zabbix(self, **kwargs):
diff --git a/nbxsync/views/__init__.py b/nbxsync/views/__init__.py
index bdd0b29b..dbe39c9c 100644
--- a/nbxsync/views/__init__.py
+++ b/nbxsync/views/__init__.py
@@ -24,3 +24,4 @@
from .zabbixmaintenanceobjectassignment import *
from .zabbixmaintenancetagassignment import *
from .zabbixconfigurationgroupassignment import *
+from .zabbixtemplaterule import *
diff --git a/nbxsync/views/tabs.py b/nbxsync/views/tabs.py
index a3700e07..d79b962d 100644
--- a/nbxsync/views/tabs.py
+++ b/nbxsync/views/tabs.py
@@ -1,13 +1,14 @@
from django.contrib.contenttypes.models import ContentType
+from nbxsync.utils import get_assigned_zabbixobjects
from netbox.views.generic import ObjectChildrenView, ObjectView
from utilities.views import register_model_view, ViewTab
-from dcim.models import Device, VirtualDeviceContext, DeviceRole, DeviceType, Manufacturer, Platform
+from dcim.models import Device, VirtualDeviceContext, DeviceRole, DeviceType, Manufacturer, Platform, Site, SiteGroup, Region
from virtualization.models import Cluster, ClusterType, VirtualMachine
from nbxsync.filtersets import ZabbixTemplateFilterSet, ZabbixMacroFilterSet
from nbxsync.mixins import ZabbixTabMixin
-from nbxsync.models import ZabbixServer, ZabbixMacro, ZabbixHostInterface, ZabbixTemplate, ZabbixServerAssignment, ZabbixMaintenanceObjectAssignment, ZabbixHostInventory, ZabbixConfigurationGroupAssignment
+from nbxsync.models import ZabbixServer, ZabbixMacro, ZabbixTemplate, ZabbixServerAssignment, ZabbixMaintenanceObjectAssignment, ZabbixConfigurationGroupAssignment
from nbxsync.tables import ZabbixTemplateTable, ZabbixMacroTable, ZabbixHostInterfaceObjectViewTable, ZabbixServerAssignmentObjectViewTable, ZabbixMaintenanceObjectAssignmentDetailViewTable
@@ -76,6 +77,21 @@ class ZabbixPlatformTabView(ZabbixTabMixin, ObjectView):
queryset = Platform.objects.all()
+@register_model_view(Site, name='zabbix', path='zabbix')
+class ZabbixSiteTabView(ZabbixTabMixin, ObjectView):
+ queryset = Site.objects.all()
+
+
+@register_model_view(SiteGroup, name='zabbix', path='zabbix')
+class ZabbixSiteGroupTabView(ZabbixTabMixin, ObjectView):
+ queryset = SiteGroup.objects.all()
+
+
+@register_model_view(Region, name='zabbix', path='zabbix')
+class ZabbixRegionTabView(ZabbixTabMixin, ObjectView):
+ queryset = Region.objects.all()
+
+
@register_model_view(Cluster, name='zabbix', path='zabbix')
class ZabbixClusterTabView(ZabbixTabMixin, ObjectView):
queryset = Cluster.objects.all()
@@ -95,13 +111,14 @@ class ZabbixDeviceTabView(ZabbixTabMixin, ObjectView):
def get_extra_context(self, request, instance):
context = super().get_extra_context(request, instance)
- # Get all assignments where this template is used
object_ct = ContentType.objects.get_for_model(instance)
- hostinterface_assignments = ZabbixHostInterface.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).select_related('assigned_object_type')
- zabbixserver_assignments = ZabbixServerAssignment.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).select_related('assigned_object_type')
+ assigned = get_assigned_zabbixobjects(instance)
+
+ hostinterface_assignments = assigned.get('hostinterfaces') or []
+ zabbixserver_assignments = assigned.get('server_assignments') or []
maintenance_objectassignments = ZabbixMaintenanceObjectAssignment.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).select_related('assigned_object_type')
- hostinventory_assignment = ZabbixHostInventory.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).first()
- configurationgroup_assignment = ZabbixConfigurationGroupAssignment.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).first()
+ hostinventory_assignment = assigned.get('hostinventory')
+ configurationgroup_assignment = assigned.get('configurationgroup')
if hostinterface_assignments:
hostinterface_assignment_table = ZabbixHostInterfaceObjectViewTable(hostinterface_assignments)
@@ -138,13 +155,14 @@ class ZabbixVirtualMachineTabView(ZabbixTabMixin, ObjectView):
def get_extra_context(self, request, instance):
context = super().get_extra_context(request, instance)
- # Get all assignments where this template is used
object_ct = ContentType.objects.get_for_model(instance)
- hostinterface_assignments = ZabbixHostInterface.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).select_related('assigned_object_type')
- zabbixserver_assignments = ZabbixServerAssignment.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).select_related('assigned_object_type')
+ assigned = get_assigned_zabbixobjects(instance)
+
+ hostinterface_assignments = assigned.get('hostinterfaces') or []
+ zabbixserver_assignments = assigned.get('server_assignments') or []
maintenance_objectassignments = ZabbixMaintenanceObjectAssignment.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).select_related('assigned_object_type')
- hostinventory_assignment = ZabbixHostInventory.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).first()
- configurationgroup_assignment = ZabbixConfigurationGroupAssignment.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).first()
+ hostinventory_assignment = assigned.get('hostinventory')
+ configurationgroup_assignment = assigned.get('configurationgroup')
if hostinterface_assignments:
hostinterface_assignment_table = ZabbixHostInterfaceObjectViewTable(hostinterface_assignments)
@@ -182,13 +200,14 @@ class ZabbixVirtualDeviceContextTabView(ZabbixTabMixin, ObjectView):
def get_extra_context(self, request, instance):
context = super().get_extra_context(request, instance)
- # Get all assignments where this template is used
object_ct = ContentType.objects.get_for_model(instance)
- hostinterface_assignments = ZabbixHostInterface.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).select_related('assigned_object_type')
- zabbixserver_assignments = ZabbixServerAssignment.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).select_related('assigned_object_type')
+ assigned = get_assigned_zabbixobjects(instance)
+
+ hostinterface_assignments = assigned.get('hostinterfaces') or []
+ zabbixserver_assignments = assigned.get('server_assignments') or []
maintenance_objectassignments = ZabbixMaintenanceObjectAssignment.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).select_related('assigned_object_type')
- hostinventory_assignment = ZabbixHostInventory.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).first()
- configurationgroup_assignment = ZabbixConfigurationGroupAssignment.objects.filter(assigned_object_type=object_ct, assigned_object_id=instance.pk).first()
+ hostinventory_assignment = assigned.get('hostinventory')
+ configurationgroup_assignment = assigned.get('configurationgroup')
if hostinterface_assignments:
hostinterface_assignment_table = ZabbixHostInterfaceObjectViewTable(hostinterface_assignments)
diff --git a/nbxsync/views/zabbixtemplaterule.py b/nbxsync/views/zabbixtemplaterule.py
new file mode 100644
index 00000000..ab460504
--- /dev/null
+++ b/nbxsync/views/zabbixtemplaterule.py
@@ -0,0 +1,54 @@
+from netbox.views.generic import BulkDeleteView, BulkEditView, ObjectDeleteView, ObjectEditView, ObjectListView, ObjectView
+
+from utilities.views import register_model_view
+
+from nbxsync.filtersets import ZabbixTemplateRuleFilterSet
+from nbxsync.forms import ZabbixTemplateRuleBulkEditForm, ZabbixTemplateRuleFilterForm, ZabbixTemplateRuleForm
+from nbxsync.models import ZabbixTemplateRule
+from nbxsync.tables import ZabbixTemplateRuleTable
+
+__all__ = (
+ 'ZabbixTemplateRuleListView',
+ 'ZabbixTemplateRuleView',
+ 'ZabbixTemplateRuleEditView',
+ 'ZabbixTemplateRuleBulkEditView',
+ 'ZabbixTemplateRuleDeleteView',
+ 'ZabbixTemplateRuleBulkDeleteView',
+)
+
+
+@register_model_view(ZabbixTemplateRule, name='list')
+class ZabbixTemplateRuleListView(ObjectListView):
+ queryset = ZabbixTemplateRule.objects.all()
+ table = ZabbixTemplateRuleTable
+ filterset = ZabbixTemplateRuleFilterSet
+ filterset_form = ZabbixTemplateRuleFilterForm
+@register_model_view(ZabbixTemplateRule)
+class ZabbixTemplateRuleView(ObjectView):
+ queryset = ZabbixTemplateRule.objects.all()
+
+
+@register_model_view(ZabbixTemplateRule, 'edit')
+class ZabbixTemplateRuleEditView(ObjectEditView):
+ queryset = ZabbixTemplateRule.objects.all()
+ form = ZabbixTemplateRuleForm
+
+
+@register_model_view(ZabbixTemplateRule, 'bulk_edit')
+class ZabbixTemplateRuleBulkEditView(BulkEditView):
+ queryset = ZabbixTemplateRule.objects.all()
+ filterset = ZabbixTemplateRuleFilterSet
+ table = ZabbixTemplateRuleTable
+ form = ZabbixTemplateRuleBulkEditForm
+
+
+@register_model_view(ZabbixTemplateRule, 'delete')
+class ZabbixTemplateRuleDeleteView(ObjectDeleteView):
+ queryset = ZabbixTemplateRule.objects.all()
+
+
+@register_model_view(ZabbixTemplateRule, 'bulk_delete')
+class ZabbixTemplateRuleBulkDeleteView(BulkDeleteView):
+ queryset = ZabbixTemplateRule.objects.all()
+ filterset = ZabbixTemplateRuleFilterSet
+ table = ZabbixTemplateRuleTable