Merge branch 'develop' of github.com:TheNetworkGuy/netbox-zabbix-sync into develop

This commit is contained in:
TheNetworkGuy 2025-06-17 08:47:49 +02:00
commit a57b51870f
3 changed files with 7 additions and 5 deletions

View File

@ -185,10 +185,11 @@ used:
**Only for VMs** **Only for VMs**
| name | description | | name | description |
| ------------ | --------------- | | ------------ | --------------- |
| cluster | VM cluster name | | cluster | VM cluster name |
| device | parent device | | cluster_type | VM cluster type |
| device | parent device |
You can specify the value separated by a "/" like so: You can specify the value separated by a "/" like so:

View File

@ -85,6 +85,7 @@ class Hostgroup:
format_options["location"] = ( format_options["location"] = (
str(self.nb.location) if self.nb.location else None str(self.nb.location) if self.nb.location else None
) )
format_options["rack"] = self.nb.rack.name if self.nb.rack else None
# Variables only applicable for VM's # Variables only applicable for VM's
if self.type == "vm": if self.type == "vm":
# Check if a cluster is configured. Could also be configured in a site. # Check if a cluster is configured. Could also be configured in a site.

View File

@ -120,7 +120,7 @@ def verify_hg_format(hg_format, device_cfs=None, vm_cfs=None, hg_type="dev", log
"tenant_group", "tenant_group",
"platform", "platform",
"cluster"] "cluster"]
,"vm": ["location", ,"vm": ["cluster_type",
"role", "role",
"manufacturer", "manufacturer",
"region", "region",