netbox-docker-plugin 4.4.0__tar.gz → 4.5.1__tar.gz

{netbox_docker_plugin-4.4.0/netbox_docker_plugin.egg-info → netbox_docker_plugin-4.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-docker-plugin
-Version: 4.4.0
+Version: 4.5.1
 Summary: Manage Docker with Netbox & style.
 Author-email: Vincent Simonin <vincent@saashup.com>, David Delassus <david.jose.delassus@gmail.com>
 Project-URL: Homepage, https://github.com/SaaShup/netbox-docker-plugin
@@ -43,10 +43,18 @@ Once the plugin and webhooks are installed, you can:
    labels, mount volumes, set networks.
 4. Manage the container status, start, stop, restart.
 
-* adding a host with curl needs a specific **Origin** header to make it working. Example :
-```
-curl -X POST -H "Authorization: Token xxxxx" -H "Content-Type: application/json" -H "Origin: https://myhost" https://myhost/api/plugins/docker/hosts/ -d '{"name": "test-add", "endpoint": "[https://xxxx:xxxx@test.com:1990"}](https://xxxx:xxxx@test.com:1990%22%7D)'
-```
+
+> [!NOTE]  
+> Adding a host with curl needs a specific `Origin` HTTP header to make it working. Example :
+>
+> ```bash
+> curl \
+>     -H "Authorization: Token YOUR-NETBOX-APIKEY" \
+>     -H "Content-Type: application/json" \
+>     -H "Origin: https://YOUR-NETBOX-HOST" \
+>     -X POST https://YOUR-NETBOX-HOST/api/plugins/docker/hosts/ \
+>     -d '{"name": "YOUR-AGENT-NAME", "endpoint": "https://AGENT-USER:PASSWORD@YOUR-AGENT-HOST:PORT"}'
+> ```
 
 ## Installation
 
@@ -59,6 +67,7 @@ Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chos
 | 4.1.\*         | 3.\*                         |
 | 4.2.\*         | 4.\*                         |
 | 4.3.\*         | 4.\*                         |
+| >=4.3.7        | >=4.5.1                      |
 
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).

{netbox_docker_plugin-4.4.0 → netbox_docker_plugin-4.5.1}/README.md

@@ -29,10 +29,18 @@ Once the plugin and webhooks are installed, you can:
    labels, mount volumes, set networks.
 4. Manage the container status, start, stop, restart.
 
-* adding a host with curl needs a specific **Origin** header to make it working. Example :
-```
-curl -X POST -H "Authorization: Token xxxxx" -H "Content-Type: application/json" -H "Origin: https://myhost" https://myhost/api/plugins/docker/hosts/ -d '{"name": "test-add", "endpoint": "[https://xxxx:xxxx@test.com:1990"}](https://xxxx:xxxx@test.com:1990%22%7D)'
-```
+
+> [!NOTE]  
+> Adding a host with curl needs a specific `Origin` HTTP header to make it working. Example :
+>
+> ```bash
+> curl \
+>     -H "Authorization: Token YOUR-NETBOX-APIKEY" \
+>     -H "Content-Type: application/json" \
+>     -H "Origin: https://YOUR-NETBOX-HOST" \
+>     -X POST https://YOUR-NETBOX-HOST/api/plugins/docker/hosts/ \
+>     -d '{"name": "YOUR-AGENT-NAME", "endpoint": "https://AGENT-USER:PASSWORD@YOUR-AGENT-HOST:PORT"}'
+> ```
 
 ## Installation
 
@@ -45,6 +53,7 @@ Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chos
 | 4.1.\*         | 3.\*                         |
 | 4.2.\*         | 4.\*                         |
 | 4.3.\*         | 4.\*                         |
+| >=4.3.7        | >=4.5.1                      |
 
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).

{netbox_docker_plugin-4.4.0 → netbox_docker_plugin-4.5.1}/netbox_docker_plugin/__init__.py

@@ -11,9 +11,9 @@ class NetBoxDockerConfig(PluginConfig):
     name = "netbox_docker_plugin"
     verbose_name = " NetBox Docker Plugin"
     description = "Manage Docker"
-    version = "4.4.0"
+    version = "4.5.1"
     base_url = "docker"
-    min_version = "4.2.0"
+    min_version = "4.3.7"
     author = "Vincent Simonin <vincent@saashup.com>, David Delassus <david.jose.delassus@gmail.com>"
     author_email = "vincent@saashup.com, david.jose.delassus@gmail.com"
 

netbox_docker_plugin-4.5.1/netbox_docker_plugin/migrations/1040_alter_container_log_driver.py

@@ -0,0 +1,20 @@
+# pylint: disable=C0103
+"""Migration file"""
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    """Migration file"""
+
+    dependencies = [
+        ("netbox_docker_plugin", "1039_alter_port_public_port"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="container",
+            name="log_driver",
+            field=models.CharField(max_length=32, null=True, blank=True),
+        ),
+    ]

{netbox_docker_plugin-4.4.0 → netbox_docker_plugin-4.5.1}/netbox_docker_plugin/models/container.py

@@ -101,8 +101,6 @@ class ContainerCapAddChoices(ChoiceSet):
 class Container(NetBoxModel):
     """Container definition class"""
 
-    DEFAULT_LOG_DRIVER = "json-file"
-
     host = models.ForeignKey(Host, on_delete=models.CASCADE, related_name="containers")
     image = models.ForeignKey(
         Image, on_delete=models.RESTRICT, related_name="containers"
@@ -159,7 +157,8 @@ class Container(NetBoxModel):
     )
     log_driver = models.CharField(
         max_length=32,
-        default=DEFAULT_LOG_DRIVER,
+        null=True,
+        blank=True,
     )
     cmd = ArrayField(
         models.CharField(

{netbox_docker_plugin-4.4.0 → netbox_docker_plugin-4.5.1}/netbox_docker_plugin/views/host.py

@@ -2,7 +2,7 @@
 
 from users.models import Token
 from utilities.query import count_related
-from utilities.views import ViewTab, register_model_view
+from utilities.views import ViewTab, GetRelatedModelsMixin, register_model_view
 from netbox.views import generic
 from .. import tables, filtersets
 from ..forms import host
@@ -15,7 +15,7 @@ from ..models.registry import Registry
 
 
 @register_model_view(Host)
-class HostView(generic.ObjectView):
+class HostView(GetRelatedModelsMixin, generic.ObjectView):
     """Host view definition"""
 
     queryset = Host.objects.prefetch_related(
@@ -23,31 +23,13 @@ class HostView(generic.ObjectView):
     )
 
     def get_extra_context(self, request, instance):
-        related_models = (
-            (
-                Image.objects.filter(host=instance),
-                "host_id",
-            ),
-            (
-                Volume.objects.filter(host=instance),
-                "host_id",
-            ),
-            (
-                Network.objects.filter(host=instance),
-                "host_id",
-            ),
-            (
-                Container.objects.filter(host=instance),
-                "host_id",
-            ),
-            (
-                Registry.objects.filter(host=instance),
-                "host_id",
-            ),
-        )
-
         return {
-            "related_models": related_models,
+            "related_models": self.get_related_models(
+                request,
+                instance,
+                omit=(),
+                extra=(),
+            ),
         }
 
 

{netbox_docker_plugin-4.4.0 → netbox_docker_plugin-4.5.1}/netbox_docker_plugin/views/registry.py

@@ -1,6 +1,7 @@
 """Registry views definitions"""
 
 from utilities.query import count_related
+from utilities.views import GetRelatedModelsMixin
 from netbox.views import generic
 from .. import tables, filtersets
 from ..forms import registry
@@ -8,21 +9,19 @@ from ..models.image import Image
 from ..models.registry import Registry
 
 
-class RegistryView(generic.ObjectView):
+class RegistryView(GetRelatedModelsMixin, generic.ObjectView):
     """Registry view definition"""
 
     queryset = Registry.objects.prefetch_related("images")
 
     def get_extra_context(self, request, instance):
-        related_models = (
-            (
-                Image.objects.filter(registry=instance),
-                "registry_id",
-            ),
-        )
-
         return {
-            "related_models": related_models,
+            "related_models": self.get_related_models(
+                request,
+                instance,
+                omit=(),
+                extra=(),
+            ),
         }
 
 

{netbox_docker_plugin-4.4.0 → netbox_docker_plugin-4.5.1/netbox_docker_plugin.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netbox-docker-plugin
-Version: 4.4.0
+Version: 4.5.1
 Summary: Manage Docker with Netbox & style.
 Author-email: Vincent Simonin <vincent@saashup.com>, David Delassus <david.jose.delassus@gmail.com>
 Project-URL: Homepage, https://github.com/SaaShup/netbox-docker-plugin
@@ -43,10 +43,18 @@ Once the plugin and webhooks are installed, you can:
    labels, mount volumes, set networks.
 4. Manage the container status, start, stop, restart.
 
-* adding a host with curl needs a specific **Origin** header to make it working. Example :
-```
-curl -X POST -H "Authorization: Token xxxxx" -H "Content-Type: application/json" -H "Origin: https://myhost" https://myhost/api/plugins/docker/hosts/ -d '{"name": "test-add", "endpoint": "[https://xxxx:xxxx@test.com:1990"}](https://xxxx:xxxx@test.com:1990%22%7D)'
-```
+
+> [!NOTE]  
+> Adding a host with curl needs a specific `Origin` HTTP header to make it working. Example :
+>
+> ```bash
+> curl \
+>     -H "Authorization: Token YOUR-NETBOX-APIKEY" \
+>     -H "Content-Type: application/json" \
+>     -H "Origin: https://YOUR-NETBOX-HOST" \
+>     -X POST https://YOUR-NETBOX-HOST/api/plugins/docker/hosts/ \
+>     -d '{"name": "YOUR-AGENT-NAME", "endpoint": "https://AGENT-USER:PASSWORD@YOUR-AGENT-HOST:PORT"}'
+> ```
 
 ## Installation
 
@@ -59,6 +67,7 @@ Below the compatibility list of the Netbox Docker PLugin and Netbox. Please chos
 | 4.1.\*         | 3.\*                         |
 | 4.2.\*         | 4.\*                         |
 | 4.3.\*         | 4.\*                         |
+| >=4.3.7        | >=4.5.1                      |
 
 You can follow [the official plugins installation
 instructions](https://docs.netbox.dev/en/stable/plugins/#installing-plugins).

{netbox_docker_plugin-4.4.0 → netbox_docker_plugin-4.5.1}/netbox_docker_plugin.egg-info/SOURCES.txt

@@ -71,6 +71,7 @@ netbox_docker_plugin/migrations/0036_alter_container_log_driver.py
 netbox_docker_plugin/migrations/0037_alter_env_value.py
 netbox_docker_plugin/migrations/0038_container_cmd.py
 netbox_docker_plugin/migrations/1039_alter_port_public_port.py
+netbox_docker_plugin/migrations/1040_alter_container_log_driver.py
 netbox_docker_plugin/migrations/__init__.py
 netbox_docker_plugin/models/__init__.py
 netbox_docker_plugin/models/container.py

{netbox_docker_plugin-4.4.0 → netbox_docker_plugin-4.5.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "netbox-docker-plugin"
-version = "4.4.0"
+version = "4.5.1"
 authors = [
   { name="Vincent Simonin", email="vincent@saashup.com" },
   { name="David Delassus", email="david.jose.delassus@gmail.com" }