Merge branch 'develop' into feature

Author: jeremystretch

docs/release-notes/version-2.11.md

@@ -1,5 +1,17 @@
 # NetBox v2.11
 
+## 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
+
+---
+
 ## v2.11.12 (2021-08-23)
 
 ### Enhancements

netbox/templates/generic/object.html

@@ -65,7 +65,9 @@
         {% url journal_viewname pk=object.pk as journal_url %}
         {% if journal_url %}
           <li role="presentation" class="nav-item">
-            <a href="{{ journal_url }}" class="nav-link{% if active_tab == 'journal'%} active{% endif %}">Journal</a>
+            <a href="{{ journal_url }}" class="nav-link{% if active_tab == 'journal'%} active{% endif %}">
+              Journal {% badge object.journal_entries.count %}
+            </a>
           </li>
         {% endif %}
       {% endwith %}

netbox/virtualization/filtersets.py

@@ -275,5 +275,6 @@ def search(self, queryset, name, value):
         if not value.strip():
             return queryset
         return queryset.filter(
-            Q(name__icontains=value)
+            Q(name__icontains=value) |
+            Q(description__icontains=value)
         )