netbox-plugin-dns 0.21.12__tar.gz → 0.21.14__tar.gz

{netbox_plugin_dns-0.21.12 → netbox_plugin_dns-0.21.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: netbox-plugin-dns
-Version: 0.21.12
+Version: 0.21.14
 Summary: NetBox DNS is a NetBox plugin for managing DNS data.
 Home-page: https://github.com/peteeckel/netbox-plugin-dns
 License: MIT
@@ -35,11 +35,11 @@ Description-Content-Type: text/markdown
 
 ## Features
 
-* Manage DNS name servers
-* Manage DNS zone information, automatically generating SOA and NS records
-* Manage DNS records
-* Automatically create and update PTR records for A and AAAA records
-* Optionally organize DNS zones in views to cater for split horizon DNS and multi-site deployments
+* Manage name servers, zones and records
+* Automatically generate SOA and NS records for zones
+* Automatically create and update PTR records for IPv4 and IPv6 records
+* Optionally organize DNS zones in views for split horizon DNS and multi-site deployments
+* Optionally maintain domain registrar and registrant information for zones
 
 NetBox DNS is using the standardized NetBox plugin interface, so it also takes advantage of the NetBox tagging and change log features.
 
@@ -57,7 +57,7 @@ $ source /opt/netbox/venv/bin/activate
 (venv) $ pip install netbox-plugin-dns
 ```
 
-### Configuration
+### NetBox Configuration
 
 Add the plugin to the NetBox config. `~/netbox/configuration.py`
 
@@ -67,7 +67,7 @@ PLUGINS = [
 ]
 ```
 
-To permanently mount the plugin when updating NetBox:
+To permanently keep the plugin installed when updating NetBox via `update.sh`:
 
 ```
 echo netbox-plugin-dns >> ~/netbox/local_requirements.txt
@@ -79,23 +79,16 @@ To add the required netbox_dns tables to your database run the following command
 ./manage.py migrate
 ```
 
-Full reference: [Using Plugins - NetBox Documentation](https://netbox.readthedocs.io/en/stable/plugins/)
-
-## Screenshots
-
-![Zones](https://raw.githubusercontent.com/peteeckel/netbox-plugin-dns/main/docs/images/ZoneList.png)
-
-![Zone Detail](https://raw.githubusercontent.com/peteeckel/netbox-plugin-dns/main/docs/images/ZoneDetail.png)
-
-![Records](https://raw.githubusercontent.com/peteeckel/netbox-plugin-dns/main/docs/images/RecordList.png)
-
-![Record Detail](https://raw.githubusercontent.com/peteeckel/netbox-plugin-dns/main/docs/images/RecordDetail.png)
+Full documentation on using plugins with NetBox: [Using Plugins - NetBox Documentation](https://netbox.readthedocs.io/en/stable/plugins/)
 
 ## Contribute
 
 Contributions are always welcome! Please see: [contributing guide](CONTRIBUTING.md)
 
+## Documentation
+
+For further information, please refer to the full documentation: [Using NetBox DNS](docs/using_netbox_dns.md)
+
 ## License
 
 MIT
-

{netbox_plugin_dns-0.21.12 → netbox_plugin_dns-0.21.14}/README.md

@@ -14,11 +14,11 @@
 
 ## Features
 
-* Manage DNS name servers
-* Manage DNS zone information, automatically generating SOA and NS records
-* Manage DNS records
-* Automatically create and update PTR records for A and AAAA records
-* Optionally organize DNS zones in views to cater for split horizon DNS and multi-site deployments
+* Manage name servers, zones and records
+* Automatically generate SOA and NS records for zones
+* Automatically create and update PTR records for IPv4 and IPv6 records
+* Optionally organize DNS zones in views for split horizon DNS and multi-site deployments
+* Optionally maintain domain registrar and registrant information for zones
 
 NetBox DNS is using the standardized NetBox plugin interface, so it also takes advantage of the NetBox tagging and change log features.
 
@@ -36,7 +36,7 @@ $ source /opt/netbox/venv/bin/activate
 (venv) $ pip install netbox-plugin-dns
 ```
 
-### Configuration
+### NetBox Configuration
 
 Add the plugin to the NetBox config. `~/netbox/configuration.py`
 
@@ -46,7 +46,7 @@ PLUGINS = [
 ]
 ```
 
-To permanently mount the plugin when updating NetBox:
+To permanently keep the plugin installed when updating NetBox via `update.sh`:
 
 ```
 echo netbox-plugin-dns >> ~/netbox/local_requirements.txt
@@ -58,22 +58,16 @@ To add the required netbox_dns tables to your database run the following command
 ./manage.py migrate
 ```
 
-Full reference: [Using Plugins - NetBox Documentation](https://netbox.readthedocs.io/en/stable/plugins/)
-
-## Screenshots
-
-![Zones](https://raw.githubusercontent.com/peteeckel/netbox-plugin-dns/main/docs/images/ZoneList.png)
-
-![Zone Detail](https://raw.githubusercontent.com/peteeckel/netbox-plugin-dns/main/docs/images/ZoneDetail.png)
-
-![Records](https://raw.githubusercontent.com/peteeckel/netbox-plugin-dns/main/docs/images/RecordList.png)
-
-![Record Detail](https://raw.githubusercontent.com/peteeckel/netbox-plugin-dns/main/docs/images/RecordDetail.png)
+Full documentation on using plugins with NetBox: [Using Plugins - NetBox Documentation](https://netbox.readthedocs.io/en/stable/plugins/)
 
 ## Contribute
 
 Contributions are always welcome! Please see: [contributing guide](CONTRIBUTING.md)
 
+## Documentation
+
+For further information, please refer to the full documentation: [Using NetBox DNS](docs/using_netbox_dns.md)
+
 ## License
 
-MIT
+MIT

{netbox_plugin_dns-0.21.12 → netbox_plugin_dns-0.21.14}/netbox_dns/__init__.py

@@ -9,7 +9,7 @@ except ImportError:
     # NetBox 3.5.8
     from extras.plugins.utils import get_plugin_config
 
-__version__ = "0.21.12"
+__version__ = "0.21.14"
 
 
 class DNSConfig(PluginConfig):

{netbox_plugin_dns-0.21.12 → netbox_plugin_dns-0.21.14}/netbox_dns/management/commands/setup_coupling.py

@@ -23,6 +23,7 @@ class Command(BaseCommand):
             for cf in (
                 "ipaddress_dns_record_name",
                 "ipaddress_dns_record_ttl",
+                "ipaddress_dns_record_disable_ptr",
                 "ipaddress_dns_zone_id",
             ):
                 try:
@@ -71,6 +72,25 @@ class Command(BaseCommand):
                 if options.get("verbose"):
                     self.stdout.write("Created custom field 'ipaddress_dns_record_ttl'")
 
+            if not CustomField.objects.filter(
+                name="ipaddress_dns_record_disable_ptr",
+                type=CustomFieldTypeChoices.TYPE_BOOLEAN,
+                content_types=ipaddress_object_type,
+            ).exists():
+                cf_disable_ptr = CustomField.objects.create(
+                    name="ipaddress_dns_record_disable_ptr",
+                    label="Disable PTR",
+                    type=CustomFieldTypeChoices.TYPE_BOOLEAN,
+                    required=False,
+                    default=False,
+                    group_name="DNS",
+                )
+                cf_disable_ptr.content_types.set([ipaddress_object_type])
+                if options.get("verbose"):
+                    self.stdout.write(
+                        "Created custom field 'ipaddress_dns_record_disable_ptr'"
+                    )
+
             if not CustomField.objects.filter(
                 name="ipaddress_dns_zone_id",
                 type=CustomFieldTypeChoices.TYPE_OBJECT,

{netbox_plugin_dns-0.21.12 → netbox_plugin_dns-0.21.14}/netbox_dns/migrations/0026_domain_registration.py

@@ -7,7 +7,7 @@ import utilities.json
 class Migration(migrations.Migration):
     dependencies = [
         ("netbox_dns", "0025_ipam_coupling_cf"),
-        ("extras", "0098_webhook_custom_field_data_webhook_tags"),
+        ("extras", "0092_delete_jobresult"),
     ]
 
     operations = [

{netbox_plugin_dns-0.21.12 → netbox_plugin_dns-0.21.14}/netbox_dns/signals/ipam_coupling.py

@@ -48,7 +48,7 @@ def ip_address_check_permissions_save(instance, **kwargs):
 
             record = get_address_record(instance)
             if record is not None:
-                name, ttl, zone_id = ipaddress_cf_data(instance)
+                name, ttl, disable_ptr, zone_id = ipaddress_cf_data(instance)
                 if zone_id is not None:
                     update_address_record(record, instance)
                     record.full_clean()
@@ -112,7 +112,7 @@ def ip_address_update_dns_information(instance, **kwargs):
     if not get_plugin_config("netbox_dns", "feature_ipam_coupling"):
         return
 
-    name, ttl, zone_id = ipaddress_cf_data(instance)
+    name, ttl, disable_ptr, zone_id = ipaddress_cf_data(instance)
 
     if zone_id is not None:
         instance.dns_name = f"{name}.{Zone.objects.get(pk=zone_id).name}"
@@ -120,6 +120,7 @@ def ip_address_update_dns_information(instance, **kwargs):
         instance.dns_name = ""
         instance.custom_field_data["ipaddress_dns_record_name"] = None
         instance.custom_field_data["ipaddress_dns_record_ttl"] = None
+        instance.custom_field_data["ipaddress_dns_record_disable_ptr"] = False
         instance.custom_field_data["ipaddress_dns_zone_id"] = None
 
 
@@ -131,7 +132,7 @@ def ip_address_update_address_record(instance, **kwargs):
     if not get_plugin_config("netbox_dns", "feature_ipam_coupling"):
         return
 
-    name, ttl, zone_id = ipaddress_cf_data(instance)
+    name, ttl, disable_ptr, zone_id = ipaddress_cf_data(instance)
 
     if zone_id is None:
         #

{netbox_plugin_dns-0.21.12 → netbox_plugin_dns-0.21.14}/netbox_dns/template_content.py

@@ -1,3 +1,6 @@
+from packaging import version
+from django.conf import settings
+
 try:
     # NetBox 3.5.0 - 3.5.7, 3.5.9+
     from extras.plugins import get_plugin_config
@@ -118,7 +121,11 @@ class RelatedDNSObjects(PluginTemplateExtension):
         )
 
 
-template_extensions = [RelatedDNSObjects]
+template_extensions = list()
+
+if version.parse(settings.VERSION) < version.parse("3.7.0"):
+    template_extensions.append(RelatedDNSObjects)
+
 if get_plugin_config("netbox_dns", "feature_ipam_coupling"):
     template_extensions.append(RelatedDNSRecords)
 elif get_plugin_config("netbox_dns", "feature_ipam_dns_info"):

{netbox_plugin_dns-0.21.12 → netbox_plugin_dns-0.21.14}/netbox_dns/templates/netbox_dns/record/related.html

@@ -2,9 +2,17 @@
 
 {% if perms.netbox_dns.view_record %}
 {% if related_address_records %}
+{% if related_address_records.rows|length == 1 %}
+{% include 'inc/panel_table.html' with table=related_address_records heading='Related DNS Address Record' %}
+{% else %}
 {% include 'inc/panel_table.html' with table=related_address_records heading='Related DNS Address Records' %}
 {% endif %}
+{% endif %}
 {% if related_pointer_records %}
+{% if related_pointer_records.rows|length == 1 %}
+{% include 'inc/panel_table.html' with table=related_pointer_records heading='Related DNS Pointer Record' %}
+{% else %}
 {% include 'inc/panel_table.html' with table=related_pointer_records heading='Related DNS Pointer Records' %}
 {% endif %}
 {% endif %}
+{% endif %}

{netbox_plugin_dns-0.21.12 → netbox_plugin_dns-0.21.14}/netbox_dns/templates/netbox_dns/record.html

@@ -80,7 +80,7 @@
                     {% endif %}
                     <tr>
                         <th scope="row">TTL</th>
-                        <td>{{ object.ttl }}</td>
+                        <td>{{ object.ttl|placeholder }}</td>
                     </tr>
                     {% if object.type == 'A' or object.type == 'AAAA' %}
                     <tr>

{netbox_plugin_dns-0.21.12 → netbox_plugin_dns-0.21.14}/netbox_dns/utilities/ipam_coupling.py

@@ -11,12 +11,15 @@ class DNSPermissionDenied(Exception):
 def ipaddress_cf_data(ip_address):
     name = ip_address.custom_field_data.get("ipaddress_dns_record_name")
     ttl = ip_address.custom_field_data.get("ipaddress_dns_record_ttl")
+    disable_ptr = ip_address.custom_field_data.get(
+        "ipaddress_dns_record_disable_ptr", False
+    )
     zone_id = ip_address.custom_field_data.get("ipaddress_dns_zone_id")
 
     if name is None or zone_id is None:
-        return None, None, None
+        return None, None, False, None
 
-    return name, ttl, zone_id
+    return name, ttl, disable_ptr, zone_id
 
 
 def address_record_type(ip_address):
@@ -36,7 +39,7 @@ def get_address_record(ip_address):
 
 
 def new_address_record(instance):
-    name, ttl, zone_id = ipaddress_cf_data(instance)
+    name, ttl, disable_ptr, zone_id = ipaddress_cf_data(instance)
 
     if zone_id is None:
         return None
@@ -45,6 +48,7 @@ def new_address_record(instance):
         name=name,
         zone_id=zone_id,
         ttl=ttl,
+        disable_ptr=disable_ptr,
         status=address_record_status(instance),
         type=address_record_type(instance),
         value=str(instance.address.ip),
@@ -54,10 +58,11 @@ def new_address_record(instance):
 
 
 def update_address_record(record, ip_address):
-    name, ttl, zone_id = ipaddress_cf_data(ip_address)
+    name, ttl, disable_ptr, zone_id = ipaddress_cf_data(ip_address)
 
     record.name = name
     record.ttl = ttl
+    record.disable_ptr = disable_ptr
     record.zone_id = zone_id
     record.status = address_record_status(ip_address)
     record.value = str(ip_address.address.ip)
@@ -86,6 +91,8 @@ def dns_changed(old, new):
             != new.custom_field_data.get("ipaddress_dns_record_name"),
             old.custom_field_data.get("ipaddress_dns_record_ttl")
             != new.custom_field_data.get("ipaddress_dns_record_ttl"),
+            old.custom_field_data.get("ipaddress_dns_record_disable_ptr")
+            != new.custom_field_data.get("ipaddress_dns_record_disable_ptr"),
             old.custom_field_data.get("ipaddress_dns_zone_id")
             != new.custom_field_data.get("ipaddress_dns_zone_id"),
         )

{netbox_plugin_dns-0.21.12 → netbox_plugin_dns-0.21.14}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "netbox-plugin-dns"
-version = "0.21.12"
+version = "0.21.14"
 description = "NetBox DNS is a NetBox plugin for managing DNS data."
 authors = ["Peter Eckel <pe-netbox-dns@hindenburgring.com>"]
 homepage = "https://github.com/peteeckel/netbox-plugin-dns"