From 6016e1b15daade776be0d407c51ae53e707f7d6e Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Tue, 27 Sep 2022 09:55:35 -0400
Subject: [PATCH] Changelog & cleanup for #9892

---
 docs/models/ipam/fhrpgroup.md     | 4 ----
 docs/release-notes/version-3.4.md | 9 +++++++++
 netbox/ipam/tables/fhrp.py        | 8 +++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/docs/models/ipam/fhrpgroup.md b/docs/models/ipam/fhrpgroup.md
index ddb3010e266..de09fee298c 100644
--- a/docs/models/ipam/fhrpgroup.md
+++ b/docs/models/ipam/fhrpgroup.md
@@ -23,10 +23,6 @@ The group's numeric identifier.
 
 An optional name for the FHRP group.
 
-### Description
-
-A brief description of the FHRP group.
-
 ### Authentication Type
 
 The type of authentication employed by group nodes, if any.
diff --git a/docs/release-notes/version-3.4.md b/docs/release-notes/version-3.4.md
index 39c44f38ebc..257ffd6254c 100644
--- a/docs/release-notes/version-3.4.md
+++ b/docs/release-notes/version-3.4.md
@@ -3,6 +3,10 @@
 !!! warning "PostgreSQL 11 Required"
     NetBox v3.4 requires PostgreSQL 11 or later.
 
+### Enhancements
+
+* [#9892](https://github.com/netbox-community/netbox/issues/9892) - Add optional `name` field for FHRP groups
+
 ### Plugins API
 
 * [#10314](https://github.com/netbox-community/netbox/issues/10314) - Move `clone()` method from NetBoxModel to CloningMixin
@@ -10,3 +14,8 @@
 ### Other Changes
 
 * [#10358](https://github.com/netbox-community/netbox/issues/10358) - Raise minimum required PostgreSQL version from 10 to 11
+
+### REST API Changes
+
+* ipam.FHRPGroup
+    * Added optional `name` field
diff --git a/netbox/ipam/tables/fhrp.py b/netbox/ipam/tables/fhrp.py
index cfbfb036b1b..beffdd232f6 100644
--- a/netbox/ipam/tables/fhrp.py
+++ b/netbox/ipam/tables/fhrp.py
@@ -36,10 +36,12 @@ class FHRPGroupTable(NetBoxTable):
     class Meta(NetBoxTable.Meta):
         model = FHRPGroup
         fields = (
-            'pk', 'group_id', 'protocol', 'auth_type', 'auth_key', 'name', 'description', 'ip_addresses', 'member_count',
-            'tags', 'created', 'last_updated',
+            'pk', 'group_id', 'protocol', 'name', 'auth_type', 'auth_key', 'description', 'ip_addresses',
+            'member_count', 'tags', 'created', 'last_updated',
+        )
+        default_columns = (
+            'pk', 'group_id', 'protocol', 'name', 'auth_type', 'description', 'ip_addresses', 'member_count',
         )
-        default_columns = ('pk', 'group_id', 'protocol', 'auth_type', 'description', 'ip_addresses', 'member_count')
 
 
 class FHRPGroupAssignmentTable(NetBoxTable):