From 36f9339942af9e7cb6e9dc996ac28dcee3f49957 Mon Sep 17 00:00:00 2001 From: Artem Kotik <miaow2@yandex.ru> Date: Wed, 18 Oct 2023 22:46:49 +0400 Subject: [PATCH 1/4] Add datefor 2.0.0 version in changelog --- docs/changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/changelog.md b/docs/changelog.md index d0145fb..4204b52 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -1,6 +1,6 @@ # Changelog -## 2.0.0 (2023-10-XX) +## 2.0.0 (2023-10-18) * [#25](https://github.com/miaow2/netbox-config-diff/issues/25) Add configuration management From 936db90c0f49f703d620e2aeb3fb2ef98e55cd5f Mon Sep 17 00:00:00 2001 From: Artem Kotik <miaow2@yandex.ru> Date: Wed, 18 Oct 2023 23:18:42 +0400 Subject: [PATCH 2/4] Fix Usage section in README --- README.md | 5 +++-- docs/index.md | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 414600b..e26e271 100644 --- a/README.md +++ b/README.md @@ -100,10 +100,11 @@ Restart NetBox service: systemctl restart netbox ``` <!--install-end--> - +<!--usage-start--> ## Usage -Read the [docs](https://miaow2.github.io/netbox-config-diff/usage) about how to use plugin. +Read this [doc](docs/colliecting-diffs.md) about collecting diffs, for configuration management read [this](docs/configuratiom-management.md) +<!--usage-end--> ## Screenshots diff --git a/docs/index.md b/docs/index.md index 319426c..a098706 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,6 +10,8 @@ end="<!--install-end-->" %} -## Usage - -Read this [doc](colliecting-diffs.md) about collecting diffs, for configuration management read [this](configuratiom-management.md) +{% + include-markdown "../README.md" + start="<!--usage-start-->" + end="<!--usage-end-->" +%} From 200321e7a456e5521902eaa045a5bb86ec504956 Mon Sep 17 00:00:00 2001 From: Artem Kotik <miaow2@yandex.ru> Date: Sun, 22 Oct 2023 14:25:14 +0400 Subject: [PATCH 3/4] Fix failing migrations on fresh database (#33) --- netbox_config_diff/views/configuration.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/netbox_config_diff/views/configuration.py b/netbox_config_diff/views/configuration.py index 70d86d9..ce8ba4f 100644 --- a/netbox_config_diff/views/configuration.py +++ b/netbox_config_diff/views/configuration.py @@ -6,7 +6,7 @@ from core.tables import JobTable from django.contrib import messages from django.contrib.auth.models import User -from django.contrib.contenttypes.models import ContentType +from django.db.models import Q from django.http import HttpResponseForbidden from django.shortcuts import get_object_or_404, redirect, render from netbox.constants import RQ_QUEUE_DEFAULT @@ -300,9 +300,7 @@ def post(self, request, pk): class JobListView(generic.ObjectListView): - queryset = Job.objects.filter( - object_type=ContentType.objects.get(app_label="netbox_config_diff", model="configurationrequest") - ) + queryset = Job.objects.filter(Q(name__contains="push_configs") | Q(name__contains="collect_diffs")) filterset = JobFilterSet filterset_form = JobFilterForm table = JobTable From 29b7e67e302a82f9f6f4bdcb27f3ffa5d5da5051 Mon Sep 17 00:00:00 2001 From: Artem Kotik <miaow2@yandex.ru> Date: Sun, 22 Oct 2023 14:33:00 +0400 Subject: [PATCH 4/4] Version 2.0.1 --- netbox_config_diff/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netbox_config_diff/__init__.py b/netbox_config_diff/__init__.py index 127940c..22a4b4b 100644 --- a/netbox_config_diff/__init__.py +++ b/netbox_config_diff/__init__.py @@ -2,7 +2,7 @@ __author__ = "Artem Kotik" __email__ = "miaow2@yandex.ru" -__version__ = "2.0.0" +__version__ = "2.0.1" class ConfigDiffConfig(PluginConfig):