@@ -15,16 +15,16 @@
## Known Issues
-- WARNING: This plugin is only tested with a single Netbox version at this time.
+- WARNING: This plugin is only tested with a single NetBox version at this time.
- CSV/Bulk imports for SoftwareProduct, Version and Installation are currently broken (WIP)
## Installation Guide
-When using the Docker version of Netbox, first follow the netbox-docker [quickstart](https://github.com/netbox-community/netbox-docker#quickstart) instructions to clone the netbox-docker repo and set up the ``docker-compose.override.yml``.
+When using the Docker version of NetBox, first follow the netbox-docker [quickstart](https://github.com/netbox-community/netbox-docker#quickstart) instructions to clone the netbox-docker repo and set up the ``docker-compose.override.yml``.
-Next, follow these instructions (based on the Netbox docker variant
+Next, follow these instructions (based on the NetBox docker variant
[instructions](https://github.com/netbox-community/netbox-docker/wiki/Configuration#custom-configuration-files))
-to install the Netbox SLM plugin:
+to install the NetBox SLM plugin:
1. Add ``netbox_slm`` to the ``PLUGINS`` list in
``configuration/plugins.py``.
@@ -59,7 +59,7 @@ to install the Netbox SLM plugin:
Now, build the image: ``docker compose build --no-cache``
-And finally, run Netbox with the SLM plugin: ``docker compose up``
+And finally, run NetBox with the SLM plugin: ``docker compose up``
## Releasing Guide
@@ -84,8 +84,8 @@ netbox_slm plugin in developer mode*
### Setup
-The goal below is to run all Netbox components in Docker and run a local
-Netbox Django copy with auto-reload to develop the plugin pointing to
+The goal below is to run all NetBox components in Docker and run a local
+NetBox Django copy with auto-reload to develop the plugin pointing to
the Dockerized postgres and redis instances, basically ignoring the
netbox docker runtime server.
@@ -116,7 +116,7 @@ netbox docker runtime server.
]
```
-The Netbox installation above will be used to run Django management
+The NetBox installation above will be used to run Django management
commands like runserver, makemigrations and migrate, which will be
explained in the next steps below;
@@ -128,7 +128,7 @@ explained in the next steps below;
$ ./start-netbox.sh
```
-This will start Netbox locally (requires Docker) and forward the redis
+This will start NetBox locally (requires Docker) and forward the redis
and postgres ports to the localhost (make sure there’s no processes
using these ports or change the dockerfiles accordingly)
@@ -220,3 +220,8 @@ Now you can run commands from the netbox repository like this;
Visit http://127.0.0.1:8001 in the browser to see the auto reloading
version of the netbox UI. Port 8000 is taken by the docker ran variant.
+
+
+## Get in touch
+
+Point of contact for this repository is [Mart Visser](https://github.com/MartVisser), who can be reached by [opening a new issue in this repository's issue tracker](https://github.com/ICTU/netbox_slm/issues/new).
diff --git a/SECURITY.md b/SECURITY.md
index b713346..5a6ef58 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,13 +1,16 @@
-# Security Policy
+# NetBox SLM Security Policy
## Current status
-Netbox SLM is a plugin for Netbox with mostly default configuration. We advise to monitor Netbox security findings and update accordingly.
+NetBox SLM is a plugin for [NetBox](https://github.com/netbox-community/netbox/) with mostly default configuration.
+In order to stay up to date, monitor NetBox security findings and update accordingly.
## Supported Versions
-Only the latest version of Netbox SLM is currently being supported with security updates. We aim to keep the plugin compatible with the latest Netbox version, but have no incentive to patch older tags at this point.
+Only the latest version of NetBox SLM is currently being supported with security updates.
+The intention is to keep the plugin compatible with the most recent NetBox version(s), there is no incentive to patch older tags.
## Reporting a Vulnerability
-Please report security vulnerabilities by opening a ticket. The aim is to get back to you within 24 hours with a confirmation of the issue and a brief action plan or a request for more information.
+You can privately [report a vulnerability issue in this repository's issue tracker](https://github.com/ICTU/netbox_slm/security/advisories/new).
+The aim is to get back to you within 24 hours, with a confirmation of the issue and a brief action plan or a request for more information.
diff --git a/ci/Dockerfile b/ci/Dockerfile
index 0c7a21e..fd82aa7 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -11,7 +11,7 @@ RUN pip install -U .[build]
RUN python -m build
RUN pip install --no-index /build
-FROM netboxcommunity/netbox:v3.6.1
+FROM netboxcommunity/netbox:v3.7.2
ARG PYTHON_VERSION=3.10
COPY --from=compile-image /opt/netbox/venv/lib/python${PYTHON_VERSION}/site-packages/netbox_slm /opt/netbox/venv/lib/python${PYTHON_VERSION}/site-packages/netbox_slm
diff --git a/ci/Dockerfile-CI b/ci/Dockerfile-CI
index fe7e75b..7be4eeb 100644
--- a/ci/Dockerfile-CI
+++ b/ci/Dockerfile-CI
@@ -1,4 +1,4 @@
-FROM netboxcommunity/netbox:v3.6.1
+FROM netboxcommunity/netbox:v3.7.2
RUN mkdir /ci && chmod go+w /ci
COPY ../ci/requirements_ci.txt /ci/
diff --git a/ci/docker-compose.yml b/ci/docker-compose.yml
index f30dedf..67ffe55 100644
--- a/ci/docker-compose.yml
+++ b/ci/docker-compose.yml
@@ -1,7 +1,7 @@
version: '3.7'
services:
netbox: &netbox
- image: netboxcommunity/netbox:${VERSION-v3.6.1}
+ image: netboxcommunity/netbox:${VERSION-v3.7.2}
depends_on:
- postgres
- redis
diff --git a/netbox_slm/__init__.py b/netbox_slm/__init__.py
index 1a3bb72..127d809 100644
--- a/netbox_slm/__init__.py
+++ b/netbox_slm/__init__.py
@@ -1,6 +1,6 @@
from extras.plugins import PluginConfig
-__version__ = "1.5"
+__version__ = "1.6.0"
class SLMConfig(PluginConfig):
diff --git a/netbox_slm/api/serializers.py b/netbox_slm/api/serializers.py
index da53a06..7b2f508 100644
--- a/netbox_slm/api/serializers.py
+++ b/netbox_slm/api/serializers.py
@@ -4,47 +4,61 @@
from netbox_slm.models import SoftwareProduct, SoftwareProductVersion, SoftwareProductInstallation, SoftwareLicense
-class SoftwareProductSerializer(NetBoxModelSerializer):
+class SoftwareLicenseSerializer(NetBoxModelSerializer):
display = serializers.SerializerMethodField()
- url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_slm-api:softwareproduct-detail")
+ url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_slm-api:softwarelicense-detail")
class Meta:
- model = SoftwareProduct
+ model = SoftwareLicense
fields = [
"id",
"display",
"url",
"name",
+ "description",
+ "type",
+ "stored_location",
+ "stored_location_url",
+ "start_date",
+ "expiration_date",
+ "support",
+ "license_amount",
+ "software_product",
+ "version",
+ "installation",
"tags",
+ "comments",
"custom_field_data",
"created",
"last_updated",
]
def get_display(self, obj):
- return f"{obj.manufacturer} - {obj}"
+ return f"{obj}"
-class SoftwareProductVersionSerializer(NetBoxModelSerializer):
+class SoftwareProductSerializer(NetBoxModelSerializer):
display = serializers.SerializerMethodField()
- url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_slm-api:softwareproductversion-detail")
+ url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_slm-api:softwareproduct-detail")
class Meta:
- model = SoftwareProductVersion
+ model = SoftwareProduct
fields = [
"id",
"display",
"url",
"name",
- "software_product",
+ "manufacturer",
+ "description",
"tags",
+ "comments",
"custom_field_data",
"created",
"last_updated",
]
def get_display(self, obj):
- return f"{obj}"
+ return f"{obj.manufacturer} - {obj}"
class SoftwareProductInstallationSerializer(NetBoxModelSerializer):
@@ -65,6 +79,7 @@ class Meta:
"software_product",
"version",
"tags",
+ "comments",
"custom_field_data",
"created",
"last_updated",
@@ -74,26 +89,27 @@ def get_display(self, obj):
return f"{obj}"
-class SoftwareLicenseSerializer(NetBoxModelSerializer):
+class SoftwareProductVersionSerializer(NetBoxModelSerializer):
display = serializers.SerializerMethodField()
- url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_slm-api:softwarelicense-detail")
+ url = serializers.HyperlinkedIdentityField(view_name="plugins-api:netbox_slm-api:softwareproductversion-detail")
class Meta:
- model = SoftwareLicense
+ model = SoftwareProductVersion
fields = [
"id",
"display",
"url",
"name",
- "description",
- "type",
- "stored_location",
- "start_date",
- "expiration_date",
+ "release_date",
+ "documentation_url",
+ "end_of_support",
+ "filename",
+ "file_checksum",
+ "file_link",
+ "release_type",
"software_product",
- "version",
- "installation",
"tags",
+ "comments",
"custom_field_data",
"created",
"last_updated",
diff --git a/netbox_slm/filtersets.py b/netbox_slm/filtersets.py
index aee4a03..f116a2e 100644
--- a/netbox_slm/filtersets.py
+++ b/netbox_slm/filtersets.py
@@ -15,7 +15,12 @@ def search(self, queryset, name, value):
"""Perform the filtered search."""
if not value.strip():
return queryset
- qs_filter = Q(name__icontains=value) | Q(manufacturer__name__icontains=value)
+ qs_filter = (
+ Q(name__icontains=value)
+ | Q(description__icontains=value)
+ | Q(manufacturer__name__icontains=value)
+ | Q(comments__icontains=value)
+ )
return queryset.filter(qs_filter)
@@ -34,6 +39,7 @@ def search(self, queryset, name, value):
Q(name__icontains=value)
| Q(software_product__name__icontains=value)
| Q(software_product__manufacturer__name__icontains=value)
+ | Q(comments__icontains=value)
)
return queryset.filter(qs_filter)
@@ -53,6 +59,7 @@ def search(self, queryset, name, value):
Q(software_product__name__icontains=value)
| Q(software_product__manufacturer__name__icontains=value)
| Q(version__name__icontains=value)
+ | Q(comments__icontains=value)
)
return queryset.filter(qs_filter)
@@ -75,5 +82,6 @@ def search(self, queryset, name, value):
| Q(installation__device__name__icontains=value)
| Q(installation__virtualmachine__name__icontains=value)
| Q(installation__cluster__name__icontains=value)
+ | Q(comments__icontains=value)
)
return queryset.filter(qs_filter)
diff --git a/netbox_slm/forms/software_license.py b/netbox_slm/forms/software_license.py
index 7805b9d..1c35d00 100644
--- a/netbox_slm/forms/software_license.py
+++ b/netbox_slm/forms/software_license.py
@@ -1,16 +1,17 @@
from django.forms import DateField
from django.urls import reverse_lazy
-from django.utils.translation import gettext_lazy as _
from netbox.forms import NetBoxModelForm, NetBoxModelImportForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm
from netbox_slm.models import SoftwareProduct, SoftwareProductVersion, SoftwareProductInstallation, SoftwareLicense
-from utilities.forms.fields import DynamicModelChoiceField, TagFilterField, LaxURLField
+from utilities.forms.fields import CommentField, DynamicModelChoiceField, TagFilterField, LaxURLField
from utilities.forms.widgets import APISelect, DatePicker
class SoftwareLicenseForm(NetBoxModelForm):
"""Form for creating a new SoftwareLicense object."""
+ comments = CommentField()
+
stored_location_url = LaxURLField(required=False)
software_product = DynamicModelChoiceField(
@@ -36,8 +37,8 @@ class SoftwareLicenseForm(NetBoxModelForm):
"software_product": "$software_product",
},
)
- start_date = DateField(label=_("Start date"), required=False, widget=DatePicker())
- expiration_date = DateField(label=_("Expiration date"), required=False, widget=DatePicker())
+ start_date = DateField(required=False, widget=DatePicker())
+ expiration_date = DateField(required=False, widget=DatePicker())
class Meta:
model = SoftwareLicense
@@ -49,25 +50,19 @@ class Meta:
"stored_location_url",
"start_date",
"expiration_date",
+ "support",
+ "license_amount",
"software_product",
"version",
"installation",
"tags",
+ "comments",
)
class SoftwareLicenseFilterForm(NetBoxModelFilterSetForm):
model = SoftwareLicense
- fieldsets = (
- (
- None,
- (
- "q",
- "tag",
- ),
- ),
- )
-
+ fieldsets = ((None, ("q", "tag")),)
tag = TagFilterField(model)
diff --git a/netbox_slm/forms/software_product.py b/netbox_slm/forms/software_product.py
index 086e0be..8705344 100644
--- a/netbox_slm/forms/software_product.py
+++ b/netbox_slm/forms/software_product.py
@@ -3,12 +3,14 @@
from dcim.models import Manufacturer
from netbox.forms import NetBoxModelForm, NetBoxModelImportForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm
from netbox_slm.models import SoftwareProduct
-from utilities.forms.fields import DynamicModelChoiceField, TagFilterField
+from utilities.forms.fields import CommentField, DynamicModelChoiceField, TagFilterField
class SoftwareProductForm(NetBoxModelForm):
"""Form for creating a new SoftwareProduct object."""
+ comments = CommentField()
+
manufacturer = DynamicModelChoiceField(
queryset=Manufacturer.objects.all(),
required=True,
@@ -16,13 +18,18 @@ class SoftwareProductForm(NetBoxModelForm):
class Meta:
model = SoftwareProduct
- fields = ("name", "manufacturer", "description", "tags")
+ fields = (
+ "name",
+ "description",
+ "manufacturer",
+ "tags",
+ "comments",
+ )
class SoftwareProductFilterForm(NetBoxModelFilterSetForm):
model = SoftwareProduct
fieldsets = ((None, ("q", "tag")),)
-
tag = TagFilterField(model)
@@ -31,6 +38,7 @@ class Meta:
model = SoftwareProduct
fields = (
"name",
+ "description",
"manufacturer",
)
diff --git a/netbox_slm/forms/software_product_installation.py b/netbox_slm/forms/software_product_installation.py
index 5e32d0a..24c2546 100644
--- a/netbox_slm/forms/software_product_installation.py
+++ b/netbox_slm/forms/software_product_installation.py
@@ -1,11 +1,10 @@
from django import forms
from django.urls import reverse_lazy
-from django.utils.translation import gettext as _
from dcim.models import Device
from netbox.forms import NetBoxModelForm, NetBoxModelImportForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm
from netbox_slm.models import SoftwareProductInstallation, SoftwareProduct, SoftwareProductVersion
-from utilities.forms.fields import DynamicModelChoiceField, TagFilterField
+from utilities.forms.fields import CommentField, DynamicModelChoiceField, TagFilterField
from utilities.forms.widgets import APISelect
from virtualization.models import VirtualMachine, Cluster
@@ -13,6 +12,8 @@
class SoftwareProductInstallationForm(NetBoxModelForm):
"""Form for creating a new SoftwareProductInstallation object."""
+ comments = CommentField()
+
device = DynamicModelChoiceField(queryset=Device.objects.all(), required=False)
virtualmachine = DynamicModelChoiceField(queryset=VirtualMachine.objects.all(), required=False)
cluster = DynamicModelChoiceField(queryset=Cluster.objects.all(), required=False)
@@ -32,33 +33,30 @@ class SoftwareProductInstallationForm(NetBoxModelForm):
class Meta:
model = SoftwareProductInstallation
- fields = ("device", "virtualmachine", "cluster", "software_product", "version", "tags")
+ fields = (
+ "device",
+ "virtualmachine",
+ "cluster",
+ "software_product",
+ "version",
+ "tags",
+ "comments",
+ )
def clean_version(self):
version = self.cleaned_data["version"]
software_product = self.cleaned_data["software_product"]
if version not in software_product.softwareproductversion_set.all():
raise forms.ValidationError(
- _(
- f"Version `{version}` doesn't exist on {software_product}, make sure you've "
- f"selected a compatible version or first select the software product."
- )
+ f"Version '{version}' doesn't exist on {software_product}, make sure you've "
+ f"selected a compatible version or first select the software product."
)
return version
class SoftwareProductInstallationFilterForm(NetBoxModelFilterSetForm):
model = SoftwareProductInstallation
- fieldsets = (
- (
- None,
- (
- "q",
- "tag",
- ),
- ),
- )
-
+ fieldsets = ((None, ("q", "tag")),)
tag = TagFilterField(model)
diff --git a/netbox_slm/forms/software_product_version.py b/netbox_slm/forms/software_product_version.py
index 138f5c2..34ff1f4 100644
--- a/netbox_slm/forms/software_product_version.py
+++ b/netbox_slm/forms/software_product_version.py
@@ -1,17 +1,19 @@
from django import forms
from django.urls import reverse_lazy
-from django.utils.translation import gettext as _
from netbox.forms import NetBoxModelForm, NetBoxModelImportForm, NetBoxModelBulkEditForm, NetBoxModelFilterSetForm
from netbox_slm.models import SoftwareProduct, SoftwareProductVersion
-from utilities.forms.fields import DynamicModelChoiceField, TagFilterField
-from utilities.forms.widgets import APISelect
+from utilities.forms.fields import CommentField, DynamicModelChoiceField, TagFilterField
+from utilities.forms.widgets import APISelect, DatePicker
class SoftwareProductVersionForm(NetBoxModelForm):
"""Form for creating a new SoftwareProductVersion object."""
- name = forms.CharField(label=_("Version"))
+ comments = CommentField()
+
+ release_date = forms.DateField(required=False, widget=DatePicker())
+ end_of_support = forms.DateField(required=False, widget=DatePicker())
software_product = DynamicModelChoiceField(
queryset=SoftwareProduct.objects.all(),
@@ -20,13 +22,24 @@ class SoftwareProductVersionForm(NetBoxModelForm):
class Meta:
model = SoftwareProductVersion
- fields = ("name", "software_product", "tags")
+ fields = (
+ "name",
+ "release_date",
+ "documentation_url",
+ "end_of_support",
+ "filename",
+ "file_checksum",
+ "file_link",
+ "release_type",
+ "software_product",
+ "tags",
+ "comments",
+ )
class SoftwareProductVersionFilterForm(NetBoxModelFilterSetForm):
model = SoftwareProductVersion
fieldsets = ((None, ("q", "tag")),)
-
tag = TagFilterField(model)
diff --git a/netbox_slm/migrations/0008_software_release_types_and_more.py b/netbox_slm/migrations/0008_software_release_types_and_more.py
new file mode 100644
index 0000000..068d7c9
--- /dev/null
+++ b/netbox_slm/migrations/0008_software_release_types_and_more.py
@@ -0,0 +1,79 @@
+# Generated by Django 4.2.9 on 2024-02-07 21:01
+
+from django.db import migrations, models
+import netbox_slm.models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('netbox_slm', '0007_softwareproductinstallation_cluster'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='softwarelicense',
+ name='comments',
+ field=models.TextField(blank=True),
+ ),
+ migrations.AddField(
+ model_name='softwarelicense',
+ name='license_amount',
+ field=models.PositiveIntegerField(blank=True, default=None, null=True),
+ ),
+ migrations.AddField(
+ model_name='softwarelicense',
+ name='support',
+ field=models.BooleanField(blank=True, default=None, null=True),
+ ),
+ migrations.AddField(
+ model_name='softwareproduct',
+ name='comments',
+ field=models.TextField(blank=True),
+ ),
+ migrations.AddField(
+ model_name='softwareproductinstallation',
+ name='comments',
+ field=models.TextField(blank=True),
+ ),
+ migrations.AddField(
+ model_name='softwareproductversion',
+ name='comments',
+ field=models.TextField(blank=True),
+ ),
+ migrations.AddField(
+ model_name='softwareproductversion',
+ name='documentation_url',
+ field=netbox_slm.models.LaxURLField(blank=True, max_length=1024, null=True),
+ ),
+ migrations.AddField(
+ model_name='softwareproductversion',
+ name='end_of_support',
+ field=models.DateField(blank=True, null=True),
+ ),
+ migrations.AddField(
+ model_name='softwareproductversion',
+ name='file_checksum',
+ field=models.CharField(blank=True, max_length=128, null=True),
+ ),
+ migrations.AddField(
+ model_name='softwareproductversion',
+ name='file_link',
+ field=netbox_slm.models.LaxURLField(blank=True, max_length=1024, null=True),
+ ),
+ migrations.AddField(
+ model_name='softwareproductversion',
+ name='filename',
+ field=models.CharField(blank=True, max_length=64, null=True),
+ ),
+ migrations.AddField(
+ model_name='softwareproductversion',
+ name='release_date',
+ field=models.DateField(blank=True, null=True),
+ ),
+ migrations.AddField(
+ model_name='softwareproductversion',
+ name='release_type',
+ field=models.CharField(default='S', max_length=3),
+ ),
+ ]
diff --git a/netbox_slm/models.py b/netbox_slm/models.py
index 47a0abd..ac0d36c 100644
--- a/netbox_slm/models.py
+++ b/netbox_slm/models.py
@@ -18,8 +18,9 @@ class LaxURLField(models.URLField):
class SoftwareProduct(NetBoxModel):
name = models.CharField(max_length=128)
- description = models.CharField(max_length=255, null=True, blank=True)
+ comments = models.TextField(blank=True)
+ description = models.CharField(max_length=255, null=True, blank=True)
manufacturer = models.ForeignKey(to="dcim.Manufacturer", on_delete=models.PROTECT, null=True, blank=True)
objects = RestrictedQuerySet.as_manager()
@@ -44,8 +45,29 @@ def get_installation_count(self):
)
+class SoftwareReleaseTypes(models.TextChoices):
+ ALPHA = "A", "Alpha"
+ BETA = "B", "Beta"
+ RELEASE_CANDIDATE = "RC", "Release candidate"
+ STABLE = "S", "Stable release"
+
+
class SoftwareProductVersion(NetBoxModel):
name = models.CharField(max_length=64)
+ comments = models.TextField(blank=True)
+
+ release_date = models.DateField(null=True, blank=True)
+ documentation_url = LaxURLField(max_length=1024, null=True, blank=True)
+ end_of_support = models.DateField(null=True, blank=True)
+ filename = models.CharField(max_length=64, null=True, blank=True)
+ file_checksum = models.CharField(max_length=128, null=True, blank=True)
+ file_link = LaxURLField(max_length=1024, null=True, blank=True)
+
+ release_type = models.CharField(
+ max_length=3,
+ choices=SoftwareReleaseTypes.choices,
+ default=SoftwareReleaseTypes.STABLE,
+ )
software_product = models.ForeignKey(
to="netbox_slm.SoftwareProduct",
@@ -75,6 +97,8 @@ def get_installation_count(self):
class SoftwareProductInstallation(NetBoxModel):
+ comments = models.TextField(blank=True)
+
device = models.ForeignKey(to="dcim.Device", on_delete=models.PROTECT, null=True, blank=True)
virtualmachine = models.ForeignKey(
to="virtualization.VirtualMachine", on_delete=models.PROTECT, null=True, blank=True
@@ -118,13 +142,16 @@ def render_type(self):
class SoftwareLicense(NetBoxModel):
name = models.CharField(max_length=128)
+ comments = models.TextField(blank=True)
+
description = models.CharField(max_length=255, null=True, blank=True)
type = models.CharField(max_length=128)
-
stored_location = models.CharField(max_length=255, null=True, blank=True)
stored_location_url = LaxURLField(max_length=1024, null=True, blank=True)
start_date = models.DateField(null=True, blank=True)
expiration_date = models.DateField(null=True, blank=True)
+ support = models.BooleanField(default=None, null=True, blank=True)
+ license_amount = models.PositiveIntegerField(default=None, null=True, blank=True)
software_product = models.ForeignKey(to="netbox_slm.SoftwareProduct", on_delete=models.PROTECT)
version = models.ForeignKey(to="netbox_slm.SoftwareProductVersion", on_delete=models.PROTECT, null=True, blank=True)
diff --git a/netbox_slm/tables.py b/netbox_slm/tables.py
index e49afdc..df81a6e 100644
--- a/netbox_slm/tables.py
+++ b/netbox_slm/tables.py
@@ -11,7 +11,7 @@ class SoftwareProductTable(NetBoxTable):
pk = ToggleColumn()
name = tables.LinkColumn()
manufacturer = tables.Column(accessor="manufacturer", linkify=True)
- installations = tables.Column(accessor="get_installation_count", verbose_name="Installations")
+ installations = tables.Column(accessor="get_installation_count")
tags = columns.TagColumn(url_name="plugins:netbox_slm:softwareproduct_list")
@@ -51,10 +51,10 @@ class SoftwareProductVersionTable(NetBoxTable):
"""Table for displaying SoftwareProductVersion objects."""
pk = ToggleColumn()
- name = tables.LinkColumn(verbose_name="Version")
+ name = tables.LinkColumn()
software_product = tables.Column(accessor="software_product", linkify=True)
manufacturer = tables.Column(accessor="software_product__manufacturer", linkify=True)
- installations = tables.Column(accessor="get_installation_count", verbose_name="Installations")
+ installations = tables.Column(accessor="get_installation_count")
tags = columns.TagColumn(url_name="plugins:netbox_slm:softwareproductversion_list")
@@ -65,6 +65,9 @@ class Meta(NetBoxTable.Meta):
"name",
"software_product",
"manufacturer",
+ "release_date",
+ "end_of_support",
+ "release_type",
"installations",
"tags",
)
@@ -73,6 +76,7 @@ class Meta(NetBoxTable.Meta):
"name",
"software_product",
"manufacturer",
+ "release_date",
"installations",
"tags",
)
@@ -172,6 +176,8 @@ class Meta(NetBoxTable.Meta):
"software_product",
"version",
"installation",
+ "support",
+ "license_amount",
"tags",
)
default_columns = (
diff --git a/netbox_slm/templates/netbox_slm/softwarelicense.html b/netbox_slm/templates/netbox_slm/softwarelicense.html
index ad1ab42..372c713 100644
--- a/netbox_slm/templates/netbox_slm/softwarelicense.html
+++ b/netbox_slm/templates/netbox_slm/softwarelicense.html
@@ -49,6 +49,14 @@
{% include 'inc/panels/custom_fields.html' %}
{% include 'inc/panels/tags.html' %}
+ {% include 'inc/panels/comments.html' %}
{% plugin_left_page object %}