diff --git a/netbox/extras/choices.py b/netbox/extras/choices.py index 5d8d3f791e..6034ed50f1 100644 --- a/netbox/extras/choices.py +++ b/netbox/extras/choices.py @@ -155,24 +155,22 @@ class JournalEntryKindChoices(ChoiceSet): class LogLevelChoices(ChoiceSet): LOG_DEBUG = 'debug' - LOG_DEFAULT = 'default' LOG_INFO = 'info' LOG_SUCCESS = 'success' LOG_WARNING = 'warning' LOG_FAILURE = 'failure' CHOICES = ( - (LOG_DEFAULT, _('Default'), 'gray'), + (LOG_DEBUG, _('Debug'), 'teal'), (LOG_INFO, _('Info'), 'cyan'), (LOG_SUCCESS, _('Success'), 'green'), (LOG_WARNING, _('Warning'), 'yellow'), (LOG_FAILURE, _('Failure'), 'red'), - (LOG_DEBUG, _('Debug'), 'teal'), + ) SYSTEM_LEVELS = { LOG_DEBUG: logging.DEBUG, - LOG_DEFAULT: logging.INFO, LOG_INFO: logging.INFO, LOG_SUCCESS: logging.INFO, LOG_WARNING: logging.WARNING, diff --git a/netbox/extras/constants.py b/netbox/extras/constants.py index 994586aca1..e06885ff0c 100644 --- a/netbox/extras/constants.py +++ b/netbox/extras/constants.py @@ -138,9 +138,8 @@ LOG_LEVEL_RANK = { LogLevelChoices.LOG_DEBUG: 0, - LogLevelChoices.LOG_DEFAULT: 1, - LogLevelChoices.LOG_INFO: 2, - LogLevelChoices.LOG_SUCCESS: 3, - LogLevelChoices.LOG_WARNING: 4, - LogLevelChoices.LOG_FAILURE: 5, + LogLevelChoices.LOG_INFO: 1, + LogLevelChoices.LOG_SUCCESS: 2, + LogLevelChoices.LOG_WARNING: 3, + LogLevelChoices.LOG_FAILURE: 4, } diff --git a/netbox/extras/views.py b/netbox/extras/views.py index 7b4635b8d7..3672e5336a 100644 --- a/netbox/extras/views.py +++ b/netbox/extras/views.py @@ -1315,9 +1315,9 @@ def get_table(self, job, request, bulk_actions=True): index = 0 try: - log_threshold = LOG_LEVEL_RANK[request.GET.get('log_threshold', LogLevelChoices.LOG_DEFAULT)] + log_threshold = LOG_LEVEL_RANK[request.GET.get('log_threshold', LogLevelChoices.LOG_INFO)] except KeyError: - log_threshold = LOG_LEVEL_RANK[LogLevelChoices.LOG_DEFAULT] + log_threshold = LOG_LEVEL_RANK[LogLevelChoices.LOG_INFO] if job.data: if 'log' in job.data: @@ -1325,7 +1325,7 @@ def get_table(self, job, request, bulk_actions=True): tests = job.data['tests'] for log in job.data['log']: - log_level = LOG_LEVEL_RANK.get(log.get('status'), LogLevelChoices.LOG_DEFAULT) + log_level = LOG_LEVEL_RANK.get(log.get('status'), LogLevelChoices.LOG_INFO) if log_level >= log_threshold: index += 1 result = { @@ -1348,7 +1348,7 @@ def get_table(self, job, request, bulk_actions=True): for method, test_data in tests.items(): if 'log' in test_data: for time, status, obj, url, message in test_data['log']: - log_level = LOG_LEVEL_RANK.get(status, LogLevelChoices.LOG_DEFAULT) + log_level = LOG_LEVEL_RANK.get(status, LogLevelChoices.LOG_INFO) if log_level >= log_threshold: index += 1 result = { @@ -1374,9 +1374,9 @@ def get(self, request, **kwargs): if job.completed: table = self.get_table(job, request, bulk_actions=False) - log_threshold = request.GET.get('log_threshold', LogLevelChoices.LOG_DEFAULT) + log_threshold = request.GET.get('log_threshold', LogLevelChoices.LOG_INFO) if log_threshold not in LOG_LEVEL_RANK: - log_threshold = LogLevelChoices.LOG_DEFAULT + log_threshold = LogLevelChoices.LOG_INFO context = { 'script': job.object, diff --git a/netbox/templates/extras/script_result.html b/netbox/templates/extras/script_result.html index 6c437df230..4630640a74 100644 --- a/netbox/templates/extras/script_result.html +++ b/netbox/templates/extras/script_result.html @@ -53,7 +53,7 @@