From bb57600f0f944722d3628235ab8d2250ce2337a4 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Fri, 27 Aug 2021 10:14:12 -0400
Subject: [PATCH 1/2] Fixes #7019: Enable searching VM interfaces by
 description

---
 docs/release-notes/version-2.11.md  | 8 ++++++++
 netbox/virtualization/filtersets.py | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md
index 73c3ad85e..3c718a954 100644
--- a/docs/release-notes/version-2.11.md
+++ b/docs/release-notes/version-2.11.md
@@ -1,5 +1,13 @@
 # NetBox v2.11
 
+## v2.11.13 (FUTURE)
+
+### Bug Fixes
+
+* [#7019](https://github.com/netbox-community/netbox/issues/7019) - Enable searching VM interfaces by description
+
+---
+
 ## v2.11.12 (2021-08-23)
 
 ### Enhancements
diff --git a/netbox/virtualization/filtersets.py b/netbox/virtualization/filtersets.py
index 6d930b69e..3fc1da8ea 100644
--- a/netbox/virtualization/filtersets.py
+++ b/netbox/virtualization/filtersets.py
@@ -275,5 +275,6 @@ class VMInterfaceFilterSet(PrimaryModelFilterSet):
         if not value.strip():
             return queryset
         return queryset.filter(
-            Q(name__icontains=value)
+            Q(name__icontains=value) |
+            Q(description__icontains=value)
         )

From 13e633778af792cf2dcf69a3a2333ae3ba493ae6 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Fri, 27 Aug 2021 10:36:06 -0400
Subject: [PATCH 2/2] Closes #7042: Show count of journal entries in tab under
 object view

---
 docs/release-notes/version-2.11.md   | 4 ++++
 netbox/templates/generic/object.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-2.11.md b/docs/release-notes/version-2.11.md
index 3c718a954..dee341912 100644
--- a/docs/release-notes/version-2.11.md
+++ b/docs/release-notes/version-2.11.md
@@ -2,6 +2,10 @@
 
 ## v2.11.13 (FUTURE)
 
+### Enhancements
+
+* [#7042](https://github.com/netbox-community/netbox/issues/7042) - Show count of journal entries in tab under object view
+
 ### Bug Fixes
 
 * [#7019](https://github.com/netbox-community/netbox/issues/7019) - Enable searching VM interfaces by description
diff --git a/netbox/templates/generic/object.html b/netbox/templates/generic/object.html
index e7424aa56..10db41af5 100644
--- a/netbox/templates/generic/object.html
+++ b/netbox/templates/generic/object.html
@@ -62,7 +62,7 @@
           {% url journal_viewname pk=object.pk as journal_url %}
           {% if journal_url %}
             <li role="presentation"{% if active_tab == 'journal' %} class="active"{% endif %}>
-              <a href="{{ journal_url }}">Journal</a>
+              <a href="{{ journal_url }}">Journal {% badge object.journal_entries.count %}</a>
             </li>
           {% endif %}
         {% endwith %}