diff --git a/data/telegraf_plugins.yml b/data/telegraf_plugins.yml
index 78dfcc091..d99f9ec7f 100644
--- a/data/telegraf_plugins.yml
+++ b/data/telegraf_plugins.yml
@@ -243,10 +243,16 @@ input:
   - name: Cisco GNMI Telemetry
     id: cisco_telemetry_gnmi
     description: |
-      Cisco GNMI Telemetry is an input plugin that consumes telemetry data similar to the GNMI specification.
+      > The `inputs.cisco_telementry_gnmi` plugin was renamed to `inputs.gmni`
+      in **Telegraf 1.15.0** to better reflect its general support for gNMI devices.
+      See the [gNMI plugin](#gnmi).
+
+      Cisco GNMI Telemetry input plugin consumes telemetry data similar to the GNMI specification.
       This GRPC-based protocol can utilize TLS for authentication and encryption.
       This plugin has been developed to support GNMI telemetry as produced by Cisco IOS XR (64-bit) version 6.5.1 and later.
     introduced: 1.11.0
+    deprecated: 1.14.5
+    link: https://github.com/influxdata/telegraf/tree/release-1.14/plugins/inputs/cisco_telemetry_gnmi
     tags: [linux, macos, windows, applications]
 
   - name: Cisco Model-driven Telemetry (MDT)
@@ -486,6 +492,20 @@ input:
     introduced: 1.11.0
     tags: [linux, macos, windows, applications]
 
+  - name: gNMI
+    id: gnmi
+    description: |
+      The gNMI plugin consumes consumes telemetry data based on the
+      [gNMI](https://github.com/openconfig/reference/blob/master/rpc/gnmi/gnmi-specification.md) `Subscribe` method.
+      The plugin supports TLS for authentication and encryption.
+      This input plugin is vendor-agnostic and is supported on any platform that supports the gNMI spec.
+
+      **For Cisco devices:**
+      The gNMI plugin is optimized to support gNMI telemetry as produced by
+      Cisco IOS XR (64-bit) version 6.5.1, Cisco NX-OS 9.3 and Cisco IOS XE 16.12 and later.
+    introduced: 1.15.0
+    tags: [linux, macos, windows, applications]
+
   - name: Google Cloud PubSub
     id: cloud_pubsub
     description: |