From bf17485290b364a8a68fe16cfd004f03a2c26206 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 1 Aug 2024 09:36:23 -0400 Subject: [PATCH] Fix export of system data & include plugins --- netbox/core/views.py | 3 +++ netbox/utilities/release.py | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/netbox/core/views.py b/netbox/core/views.py index 616cbb60e..61f0dbd9b 100644 --- a/netbox/core/views.py +++ b/netbox/core/views.py @@ -2,6 +2,7 @@ import json import platform from django import __version__ as DJANGO_VERSION +from django.apps import apps from django.conf import settings from django.contrib import messages from django.contrib.auth.mixins import UserPassesTestMixin @@ -630,9 +631,11 @@ class SystemView(UserPassesTestMixin, View): # Raw data export if 'export' in request.GET: + stats['netbox_release'] = stats['netbox_release'].asdict() params = [param.name for param in PARAMS] data = { **stats, + 'plugins': settings.PLUGINS, 'config': { k: getattr(config, k) for k in sorted(params) }, diff --git a/netbox/utilities/release.py b/netbox/utilities/release.py index 5eb22807e..256588b0b 100644 --- a/netbox/utilities/release.py +++ b/netbox/utilities/release.py @@ -1,7 +1,7 @@ import datetime import os import yaml -from dataclasses import dataclass, field +from dataclasses import asdict, dataclass, field from typing import List, Union from django.core.exceptions import ImproperlyConfigured @@ -42,6 +42,9 @@ class ReleaseInfo: def name(self): return f"NetBox {self.edition} v{self.full_version}" + def asdict(self): + return asdict(self) + def load_release_data(): """