From f2616bd1b18a77c72412bff4bbe669b773a4af81 Mon Sep 17 00:00:00 2001
From: Eric Eisenhart <eric.eisenhart@sonic.com>
Date: Mon, 6 Nov 2023 16:52:28 -0800
Subject: [PATCH 1/2] Updated from Zabbix 4.x to Zabbix 6.x, and added a
 "failed devices" count and trigger.

Template wouldn't import as-is because it specified `trends` on TEXT items.

Since it's fairly common for us to have mdraid RAID1 with 3 drives (each
partition 2-active, 1-standby), we added a "Failed Devices" count, and a
trigger if that > 0.
---
 Template MD RAID.xml | 744 ++++++++++++++-----------------------------
 1 file changed, 231 insertions(+), 513 deletions(-)
 mode change 100644 => 100755 Template MD RAID.xml

diff --git a/Template MD RAID.xml b/Template MD RAID.xml
old mode 100644
new mode 100755
index 2a58af9..1d3e60e
--- a/Template MD RAID.xml	
+++ b/Template MD RAID.xml	
@@ -1,561 +1,279 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <zabbix_export>
-    <version>4.0</version>
-    <date>2019-01-16T08:56:24Z</date>
-    <groups>
-        <group>
+    <version>6.4</version>
+    <template_groups>
+        <template_group>
             <name>Templates</name>
-        </group>
-    </groups>
+        </template_group>
+    </template_groups>
     <templates>
         <template>
             <template>Template MD RAID</template>
             <name>Template MD RAID</name>
-            <description>Template for monitoring of Linux MD RAID (mdadm).</description>
             <groups>
                 <group>
                     <name>Templates</name>
                 </group>
             </groups>
-            <applications>
-                <application>
-                    <name>MD RAID</name>
-                </application>
-            </applications>
-            <items/>
             <discovery_rules>
                 <discovery_rule>
-                    <name>MD Raid discovery</name>
-                    <type>0</type>
-                    <snmp_community/>
-                    <snmp_oid/>
+                    <name>MD RAID Discovery</name>
                     <key>mdraid.discovery</key>
                     <delay>1h</delay>
-                    <status>0</status>
-                    <allowed_hosts/>
-                    <snmpv3_contextname/>
-                    <snmpv3_securityname/>
-                    <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                    <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                    <snmpv3_authpassphrase/>
-                    <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                    <snmpv3_privpassphrase/>
-                    <params/>
-                    <ipmi_sensor/>
-                    <authtype>0</authtype>
-                    <username/>
-                    <password/>
-                    <publickey/>
-                    <privatekey/>
-                    <port/>
-                    <filter>
-                        <evaltype>0</evaltype>
-                        <formula/>
-                        <conditions/>
-                    </filter>
-                    <lifetime>30d</lifetime>
-                    <description>Discover every Linux MD Raid</description>
+                    <lifetime>7d</lifetime>
                     <item_prototypes>
                         <item_prototype>
-                            <name>MD Raid {#MDNAME} degraded disks</name>
-                            <type>0</type>
-                            <snmp_community/>
-                            <snmp_oid/>
-                            <key>mdraid.degraded[{#MDNAME}]</key>
-                            <delay>300s</delay>
-                            <history>90d</history>
-                            <trends>365d</trends>
-                            <status>0</status>
-                            <value_type>3</value_type>
-                            <allowed_hosts/>
-                            <units/>
-                            <snmpv3_contextname/>
-                            <snmpv3_securityname/>
-                            <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                            <snmpv3_authpassphrase/>
-                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                            <snmpv3_privpassphrase/>
-                            <params/>
-                            <ipmi_sensor/>
-                            <authtype>0</authtype>
-                            <username/>
-                            <password/>
-                            <publickey/>
-                            <privatekey/>
-                            <port/>
-                            <description>Number of degraded disks in the array {#MDNAME}.</description>
-                            <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>MD RAID</name>
-                                </application>
-                            </applications>
-                            <valuemap/>
-                            <logtimefmt/>
-                            <preprocessing/>
-                            <jmx_endpoint/>
-                            <timeout>3s</timeout>
-                            <url/>
-                            <query_fields/>
-                            <posts/>
-                            <status_codes>200</status_codes>
-                            <follow_redirects>1</follow_redirects>
-                            <post_type>0</post_type>
-                            <http_proxy/>
-                            <headers/>
-                            <retrieve_mode>0</retrieve_mode>
-                            <request_method>0</request_method>
-                            <output_format>0</output_format>
-                            <allow_traps>0</allow_traps>
-                            <ssl_cert_file/>
-                            <ssl_key_file/>
-                            <ssl_key_password/>
-                            <verify_peer>0</verify_peer>
-                            <verify_host>0</verify_host>
-                            <application_prototypes/>
-                            <master_item/>
+                            <name>{#MD_DEVICE} Array device #$3</name>
+                            <key>mdraid[{#MD_DEVICE},d,0]</key>
+                            <delay>600</delay>
+                            <history>1d</history>
+                            <trends>0</trends>
+                            <value_type>TEXT</value_type>
+                            <tags>
+                                <tag>
+                                    <tag>Application</tag>
+                                    <value>MD_RAID</value>
+                                </tag>
+                            </tags>
+                        </item_prototype>
+                        <item_prototype>
+                            <name>{#MD_DEVICE} Array device #$3</name>
+                            <key>mdraid[{#MD_DEVICE},d,1]</key>
+                            <delay>600</delay>
+                            <history>1d</history>
+                            <trends>0</trends>
+                            <value_type>TEXT</value_type>
+                            <tags>
+                                <tag>
+                                    <tag>Application</tag>
+                                    <value>MD_RAID</value>
+                                </tag>
+                            </tags>
                         </item_prototype>
                         <item_prototype>
-                            <name>MD Raid {#MDNAME} array size</name>
-                            <type>0</type>
-                            <snmp_community/>
-                            <snmp_oid/>
-                            <key>mdraid.disks[{#MDNAME}]</key>
-                            <delay>1h</delay>
-                            <history>90d</history>
-                            <trends>365d</trends>
-                            <status>0</status>
-                            <value_type>3</value_type>
-                            <allowed_hosts/>
-                            <units>disks</units>
-                            <snmpv3_contextname/>
-                            <snmpv3_securityname/>
-                            <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                            <snmpv3_authpassphrase/>
-                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                            <snmpv3_privpassphrase/>
-                            <params/>
-                            <ipmi_sensor/>
-                            <authtype>0</authtype>
-                            <username/>
-                            <password/>
-                            <publickey/>
-                            <privatekey/>
-                            <port/>
-                            <description>Number of disks configured in the array {#MDNAME}.</description>
-                            <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>MD RAID</name>
-                                </application>
-                            </applications>
-                            <valuemap/>
-                            <logtimefmt/>
-                            <preprocessing/>
-                            <jmx_endpoint/>
-                            <timeout>3s</timeout>
-                            <url/>
-                            <query_fields/>
-                            <posts/>
-                            <status_codes>200</status_codes>
-                            <follow_redirects>1</follow_redirects>
-                            <post_type>0</post_type>
-                            <http_proxy/>
-                            <headers/>
-                            <retrieve_mode>0</retrieve_mode>
-                            <request_method>0</request_method>
-                            <output_format>0</output_format>
-                            <allow_traps>0</allow_traps>
-                            <ssl_cert_file/>
-                            <ssl_key_file/>
-                            <ssl_key_password/>
-                            <verify_peer>0</verify_peer>
-                            <verify_host>0</verify_host>
-                            <application_prototypes/>
-                            <master_item/>
+                            <name>{#MD_DEVICE} Number of Failed Devices</name>
+                            <key>mdraid[{#MD_DEVICE},e,&quot;Failed Devices&quot;]</key>
+                            <delay>300</delay>
+                            <history>1d</history>
+                            <trends>1d</trends>
+                            <tags>
+                                <tag>
+                                    <tag>Application</tag>
+                                    <value>MD_RAID</value>
+                                </tag>
+                            </tags>
+                            <trigger_prototypes>
+                                <trigger_prototype>
+                                    <expression>last(/Template MD RAID/mdraid[{#MD_DEVICE},e,&quot;Failed Devices&quot;])&gt;0</expression>
+                                    <name>{#MD_DEVICE} Number of Failed Devices</name>
+                                    <priority>AVERAGE</priority>
+                                    <description>There is a failed disk for a RAID array on this host.  Please investigate using https://wiki.noc.sonic.net/display/SD/RAID+array+failure#RAIDarrayfailure-Zabbix%22NumberofFailedDevices%22</description>
+                                </trigger_prototype>
+                            </trigger_prototypes>
                         </item_prototype>
                         <item_prototype>
-                            <name>MD Raid {#MDNAME} array level</name>
-                            <type>0</type>
-                            <snmp_community/>
-                            <snmp_oid/>
-                            <key>mdraid.level[{#MDNAME}]</key>
-                            <delay>1h</delay>
-                            <history>90d</history>
+                            <name>{#MD_DEVICE} Number of Devices</name>
+                            <key>mdraid[{#MD_DEVICE},e,&quot;Raid Devices&quot;]</key>
+                            <delay>300</delay>
+                            <history>1d</history>
+                            <trends>1d</trends>
+                            <tags>
+                                <tag>
+                                    <tag>Application</tag>
+                                    <value>MD_RAID</value>
+                                </tag>
+                            </tags>
+                        </item_prototype>
+                        <item_prototype>
+                            <name>{#MD_DEVICE} RAID Level</name>
+                            <key>mdraid[{#MD_DEVICE},e,&quot;Raid Level&quot;]</key>
+                            <delay>600</delay>
+                            <history>1d</history>
                             <trends>0</trends>
-                            <status>0</status>
-                            <value_type>1</value_type>
-                            <allowed_hosts/>
-                            <units/>
-                            <snmpv3_contextname/>
-                            <snmpv3_securityname/>
-                            <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                            <snmpv3_authpassphrase/>
-                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                            <snmpv3_privpassphrase/>
-                            <params/>
-                            <ipmi_sensor/>
-                            <authtype>0</authtype>
-                            <username/>
-                            <password/>
-                            <publickey/>
-                            <privatekey/>
-                            <port/>
-                            <description>Raid level for {#MDNAME} array.</description>
-                            <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>MD RAID</name>
-                                </application>
-                            </applications>
-                            <valuemap/>
-                            <logtimefmt/>
-                            <preprocessing/>
-                            <jmx_endpoint/>
-                            <timeout>3s</timeout>
-                            <url/>
-                            <query_fields/>
-                            <posts/>
-                            <status_codes>200</status_codes>
-                            <follow_redirects>1</follow_redirects>
-                            <post_type>0</post_type>
-                            <http_proxy/>
-                            <headers/>
-                            <retrieve_mode>0</retrieve_mode>
-                            <request_method>0</request_method>
-                            <output_format>0</output_format>
-                            <allow_traps>0</allow_traps>
-                            <ssl_cert_file/>
-                            <ssl_key_file/>
-                            <ssl_key_password/>
-                            <verify_peer>0</verify_peer>
-                            <verify_host>0</verify_host>
-                            <application_prototypes/>
-                            <master_item/>
+                            <value_type>TEXT</value_type>
+                            <tags>
+                                <tag>
+                                    <tag>Application</tag>
+                                    <value>MD_RAID</value>
+                                </tag>
+                            </tags>
                         </item_prototype>
                         <item_prototype>
-                            <name>MD Raid {#MDNAME} state</name>
-                            <type>0</type>
-                            <snmp_community/>
-                            <snmp_oid/>
-                            <key>mdraid.state[{#MDNAME}]</key>
-                            <delay>300s</delay>
-                            <history>90d</history>
+                            <name>{#MD_DEVICE} State</name>
+                            <key>mdraid[{#MD_DEVICE},e,&quot;State&quot;]</key>
+                            <delay>300</delay>
+                            <history>1d</history>
                             <trends>0</trends>
-                            <status>0</status>
-                            <value_type>1</value_type>
-                            <allowed_hosts/>
-                            <units/>
-                            <snmpv3_contextname/>
-                            <snmpv3_securityname/>
-                            <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                            <snmpv3_authpassphrase/>
-                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                            <snmpv3_privpassphrase/>
-                            <params/>
-                            <ipmi_sensor/>
-                            <authtype>0</authtype>
-                            <username/>
-                            <password/>
-                            <publickey/>
-                            <privatekey/>
-                            <port/>
-                            <description>MD Raid {#MDNAME} state :&#13;
-clear: No devices, no size, no level.&#13;
-inactive: Array is not active, all IO results in error.&#13;
-suspended: All IO requests will block. The array can be reconfigured.&#13;
-readonly: no resync can happen. no superblocks get written. Write requests fail.&#13;
-read-auto: like readonly, but behaves like clean on a write request.&#13;
-clean: no pending writes, but otherwise active.&#13;
-active: fully active: IO and resync can be happening.&#13;
-write-pending: clean, but writes are blocked waiting for active to be written.&#13;
-active-idle: like active, but no writes have been seen for a while.</description>
-                            <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>MD RAID</name>
-                                </application>
-                            </applications>
-                            <valuemap/>
-                            <logtimefmt/>
-                            <preprocessing/>
-                            <jmx_endpoint/>
-                            <timeout>3s</timeout>
-                            <url/>
-                            <query_fields/>
-                            <posts/>
-                            <status_codes>200</status_codes>
-                            <follow_redirects>1</follow_redirects>
-                            <post_type>0</post_type>
-                            <http_proxy/>
-                            <headers/>
-                            <retrieve_mode>0</retrieve_mode>
-                            <request_method>0</request_method>
-                            <output_format>0</output_format>
-                            <allow_traps>0</allow_traps>
-                            <ssl_cert_file/>
-                            <ssl_key_file/>
-                            <ssl_key_password/>
-                            <verify_peer>0</verify_peer>
-                            <verify_host>0</verify_host>
-                            <application_prototypes/>
-                            <master_item/>
+                            <value_type>TEXT</value_type>
+                            <tags>
+                                <tag>
+                                    <tag>Application</tag>
+                                    <value>MD_RAID</value>
+                                </tag>
+                            </tags>
+                            <trigger_prototypes>
+                                <trigger_prototype>
+                                    <expression>find(/Template MD RAID/mdraid[{#MD_DEVICE},e,&quot;State&quot;],,&quot;regexp&quot;,&quot;(degraded|resyncing|recovering|Not Started)&quot;)=1</expression>
+                                    <name>{#MD_DEVICE} RAID State</name>
+                                    <priority>AVERAGE</priority>
+                                </trigger_prototype>
+                            </trigger_prototypes>
                         </item_prototype>
                         <item_prototype>
-                            <name>MD Raid {#MDNAME} sync speed</name>
-                            <type>0</type>
-                            <snmp_community/>
-                            <snmp_oid/>
-                            <key>mdraid.sync_speed[{#MDNAME}]</key>
-                            <delay>300s</delay>
-                            <history>90d</history>
-                            <trends>365d</trends>
-                            <status>0</status>
-                            <value_type>3</value_type>
-                            <allowed_hosts/>
-                            <units>KiB/s</units>
-                            <snmpv3_contextname/>
-                            <snmpv3_securityname/>
-                            <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                            <snmpv3_authpassphrase/>
-                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                            <snmpv3_privpassphrase/>
-                            <params/>
-                            <ipmi_sensor/>
-                            <authtype>0</authtype>
-                            <username/>
-                            <password/>
-                            <publickey/>
-                            <privatekey/>
-                            <port/>
-                            <description>MD Raid {#MDNAME} sync speed in kibibytes-per-second.</description>
-                            <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>MD RAID</name>
-                                </application>
-                            </applications>
-                            <valuemap/>
-                            <logtimefmt/>
-                            <preprocessing/>
-                            <jmx_endpoint/>
-                            <timeout>3s</timeout>
-                            <url/>
-                            <query_fields/>
-                            <posts/>
-                            <status_codes>200</status_codes>
-                            <follow_redirects>1</follow_redirects>
-                            <post_type>0</post_type>
-                            <http_proxy/>
-                            <headers/>
-                            <retrieve_mode>0</retrieve_mode>
-                            <request_method>0</request_method>
-                            <output_format>0</output_format>
-                            <allow_traps>0</allow_traps>
-                            <ssl_cert_file/>
-                            <ssl_key_file/>
-                            <ssl_key_password/>
-                            <verify_peer>0</verify_peer>
-                            <verify_host>0</verify_host>
-                            <application_prototypes/>
-                            <master_item/>
+                            <name>{#MD_DEVICE} Array Size</name>
+                            <key>mdraid[{#MD_DEVICE},s,&quot;Array Size&quot;]</key>
+                            <delay>600</delay>
+                            <history>1d</history>
+                            <trends>1d</trends>
+                            <units>B</units>
+                            <preprocessing>
+                                <step>
+                                    <type>MULTIPLIER</type>
+                                    <parameters>
+                                        <parameter>1024</parameter>
+                                    </parameters>
+                                </step>
+                            </preprocessing>
+                            <tags>
+                                <tag>
+                                    <tag>Application</tag>
+                                    <value>MD_RAID</value>
+                                </tag>
+                            </tags>
                         </item_prototype>
                         <item_prototype>
-                            <name>MD Raid {#MDNAME} sync status</name>
-                            <type>0</type>
-                            <snmp_community/>
-                            <snmp_oid/>
-                            <key>mdraid.sync_status[{#MDNAME}]</key>
-                            <delay>300s</delay>
-                            <history>90d</history>
-                            <trends>0</trends>
-                            <status>0</status>
-                            <value_type>1</value_type>
-                            <allowed_hosts/>
-                            <units/>
-                            <snmpv3_contextname/>
-                            <snmpv3_securityname/>
-                            <snmpv3_securitylevel>0</snmpv3_securitylevel>
-                            <snmpv3_authprotocol>0</snmpv3_authprotocol>
-                            <snmpv3_authpassphrase/>
-                            <snmpv3_privprotocol>0</snmpv3_privprotocol>
-                            <snmpv3_privpassphrase/>
-                            <params/>
-                            <ipmi_sensor/>
-                            <authtype>0</authtype>
-                            <username/>
-                            <password/>
-                            <publickey/>
-                            <privatekey/>
-                            <port/>
-                            <description>MD Raid {#MDNAME} sync status :&#13;
-resync: redundancy is being recalculated after unclean shutdown or creation&#13;
-recover: a hot spare is being built to replace a failed/missing device&#13;
-idle: nothing is happening&#13;
-check: A full check of redundancy was requested and is happening. This reads all blocks and checks them. A repair may also happen for some raid levels.&#13;
-repair: A full check and repair is happening. This is similar to resync, but was requested by the user, and the write-intent bitmap is NOT used to optimise the process.</description>
-                            <inventory_link>0</inventory_link>
-                            <applications>
-                                <application>
-                                    <name>MD RAID</name>
-                                </application>
-                            </applications>
-                            <valuemap/>
-                            <logtimefmt/>
-                            <preprocessing/>
-                            <jmx_endpoint/>
-                            <timeout>3s</timeout>
-                            <url/>
-                            <query_fields/>
-                            <posts/>
-                            <status_codes>200</status_codes>
-                            <follow_redirects>1</follow_redirects>
-                            <post_type>0</post_type>
-                            <http_proxy/>
-                            <headers/>
-                            <retrieve_mode>0</retrieve_mode>
-                            <request_method>0</request_method>
-                            <output_format>0</output_format>
-                            <allow_traps>0</allow_traps>
-                            <ssl_cert_file/>
-                            <ssl_key_file/>
-                            <ssl_key_password/>
-                            <verify_peer>0</verify_peer>
-                            <verify_host>0</verify_host>
-                            <application_prototypes/>
-                            <master_item/>
+                            <name>{#MD_DEVICE} read operation speed</name>
+                            <key>vfs.dev.read[{#MD_DEVICE},operations]</key>
+                            <delay>60</delay>
+                            <value_type>FLOAT</value_type>
+                            <units>ops</units>
+                            <preprocessing>
+                                <step>
+                                    <type>CHANGE_PER_SECOND</type>
+                                    <parameters>
+                                        <parameter/>
+                                    </parameters>
+                                </step>
+                            </preprocessing>
+                            <tags>
+                                <tag>
+                                    <tag>Application</tag>
+                                    <value>MD_RAID</value>
+                                </tag>
+                            </tags>
+                        </item_prototype>
+                        <item_prototype>
+                            <name>{#MD_DEVICE} data read speed</name>
+                            <key>vfs.dev.read[{#MD_DEVICE},sectors]</key>
+                            <delay>60</delay>
+                            <value_type>FLOAT</value_type>
+                            <units>sps</units>
+                            <preprocessing>
+                                <step>
+                                    <type>CHANGE_PER_SECOND</type>
+                                    <parameters>
+                                        <parameter/>
+                                    </parameters>
+                                </step>
+                            </preprocessing>
+                            <tags>
+                                <tag>
+                                    <tag>Application</tag>
+                                    <value>MD_RAID</value>
+                                </tag>
+                            </tags>
+                        </item_prototype>
+                        <item_prototype>
+                            <name>{#MD_DEVICE} write operation speed</name>
+                            <key>vfs.dev.write[{#MD_DEVICE},operations]</key>
+                            <delay>60</delay>
+                            <value_type>FLOAT</value_type>
+                            <units>ops</units>
+                            <preprocessing>
+                                <step>
+                                    <type>CHANGE_PER_SECOND</type>
+                                    <parameters>
+                                        <parameter/>
+                                    </parameters>
+                                </step>
+                            </preprocessing>
+                            <tags>
+                                <tag>
+                                    <tag>Application</tag>
+                                    <value>MD_RAID</value>
+                                </tag>
+                            </tags>
+                        </item_prototype>
+                        <item_prototype>
+                            <name>{#MD_DEVICE} data write speed</name>
+                            <key>vfs.dev.write[{#MD_DEVICE},sectors]</key>
+                            <delay>60</delay>
+                            <value_type>FLOAT</value_type>
+                            <units>sps</units>
+                            <preprocessing>
+                                <step>
+                                    <type>CHANGE_PER_SECOND</type>
+                                    <parameters>
+                                        <parameter/>
+                                    </parameters>
+                                </step>
+                            </preprocessing>
+                            <tags>
+                                <tag>
+                                    <tag>Application</tag>
+                                    <value>MD_RAID</value>
+                                </tag>
+                            </tags>
                         </item_prototype>
                     </item_prototypes>
-                    <trigger_prototypes>
-                        <trigger_prototype>
-                            <expression>{Template MD RAID:mdraid.degraded[{#MDNAME}].last()}&gt;0</expression>
-                            <recovery_mode>0</recovery_mode>
-                            <recovery_expression/>
-                            <name>MD Raid array {#MDNAME} is degraded on {HOST.NAME}</name>
-                            <correlation_mode>0</correlation_mode>
-                            <correlation_tag/>
-                            <url/>
-                            <status>0</status>
-                            <priority>4</priority>
-                            <description>One or more failing disk in array.</description>
-                            <type>0</type>
-                            <manual_close>0</manual_close>
-                            <dependencies/>
-                            <tags/>
-                        </trigger_prototype>
-                        <trigger_prototype>
-                            <expression>{Template MD RAID:mdraid.sync_status[{#MDNAME}].str(recover)}=1</expression>
-                            <recovery_mode>0</recovery_mode>
-                            <recovery_expression/>
-                            <name>MD Raid array {#MDNAME} is in recovery mode on {HOST.NAME}</name>
-                            <correlation_mode>0</correlation_mode>
-                            <correlation_tag/>
-                            <url/>
-                            <status>0</status>
-                            <priority>1</priority>
-                            <description>This means a hot spare is being built to replace a failed/missing device.</description>
-                            <type>0</type>
-                            <manual_close>0</manual_close>
-                            <dependencies/>
-                            <tags/>
-                        </trigger_prototype>
-                        <trigger_prototype>
-                            <expression>{Template MD RAID:mdraid.sync_status[{#MDNAME}].str(resync)}=1</expression>
-                            <recovery_mode>0</recovery_mode>
-                            <recovery_expression/>
-                            <name>MD Raid array {#MDNAME} is syncing on {HOST.NAME}</name>
-                            <correlation_mode>0</correlation_mode>
-                            <correlation_tag/>
-                            <url/>
-                            <status>0</status>
-                            <priority>1</priority>
-                            <description>This means redundancy is being recalculated after unclean shutdown.</description>
-                            <type>0</type>
-                            <manual_close>0</manual_close>
-                            <dependencies/>
-                            <tags/>
-                        </trigger_prototype>
-                        <trigger_prototype>
-                            <expression>{Template MD RAID:mdraid.disks[{#MDNAME}].diff()}&lt;&gt;0</expression>
-                            <recovery_mode>0</recovery_mode>
-                            <recovery_expression/>
-                            <name>Number of disks in MD Raid array {#MDNAME} changed on {HOST.NAME}</name>
-                            <correlation_mode>0</correlation_mode>
-                            <correlation_tag/>
-                            <url/>
-                            <status>0</status>
-                            <priority>2</priority>
-                            <description>A disk was either removed or added.</description>
-                            <type>0</type>
-                            <manual_close>0</manual_close>
-                            <dependencies/>
-                            <tags/>
-                        </trigger_prototype>
-                    </trigger_prototypes>
                     <graph_prototypes>
                         <graph_prototype>
-                            <name>MD Raid {#MDNAME} degraded disks</name>
-                            <width>900</width>
-                            <height>200</height>
-                            <yaxismin>0.0000</yaxismin>
-                            <yaxismax>100.0000</yaxismax>
-                            <show_work_period>1</show_work_period>
-                            <show_triggers>1</show_triggers>
-                            <type>0</type>
-                            <show_legend>1</show_legend>
-                            <show_3d>0</show_3d>
-                            <percent_left>0.0000</percent_left>
-                            <percent_right>0.0000</percent_right>
-                            <ymin_type_1>0</ymin_type_1>
-                            <ymax_type_1>0</ymax_type_1>
-                            <ymin_item_1>0</ymin_item_1>
-                            <ymax_item_1>0</ymax_item_1>
+                            <name>{#MD_DEVICE} Array IO Performance</name>
+                            <width>400</width>
+                            <ymin_type_1>FIXED</ymin_type_1>
                             <graph_items>
                                 <graph_item>
-                                    <sortorder>0</sortorder>
-                                    <drawtype>0</drawtype>
-                                    <color>1A7C11</color>
-                                    <yaxisside>0</yaxisside>
-                                    <calc_fnc>2</calc_fnc>
-                                    <type>0</type>
+                                    <drawtype>FILLED_REGION</drawtype>
+                                    <color>FF9999</color>
+                                    <item>
+                                        <host>Template MD RAID</host>
+                                        <key>vfs.dev.read[{#MD_DEVICE},sectors]</key>
+                                    </item>
+                                </graph_item>
+                                <graph_item>
+                                    <sortorder>1</sortorder>
+                                    <drawtype>FILLED_REGION</drawtype>
+                                    <color>CCFFCC</color>
+                                    <item>
+                                        <host>Template MD RAID</host>
+                                        <key>vfs.dev.write[{#MD_DEVICE},sectors]</key>
+                                    </item>
+                                </graph_item>
+                                <graph_item>
+                                    <sortorder>2</sortorder>
+                                    <drawtype>BOLD_LINE</drawtype>
+                                    <color>FF3333</color>
+                                    <yaxisside>RIGHT</yaxisside>
+                                    <item>
+                                        <host>Template MD RAID</host>
+                                        <key>vfs.dev.read[{#MD_DEVICE},operations]</key>
+                                    </item>
+                                </graph_item>
+                                <graph_item>
+                                    <sortorder>3</sortorder>
+                                    <drawtype>BOLD_LINE</drawtype>
+                                    <color>00DD00</color>
+                                    <yaxisside>RIGHT</yaxisside>
                                     <item>
                                         <host>Template MD RAID</host>
-                                        <key>mdraid.degraded[{#MDNAME}]</key>
+                                        <key>vfs.dev.write[{#MD_DEVICE},operations]</key>
                                     </item>
                                 </graph_item>
                             </graph_items>
                         </graph_prototype>
                     </graph_prototypes>
-                    <host_prototypes/>
-                    <jmx_endpoint/>
-                    <timeout>3s</timeout>
-                    <url/>
-                    <query_fields/>
-                    <posts/>
-                    <status_codes>200</status_codes>
-                    <follow_redirects>1</follow_redirects>
-                    <post_type>0</post_type>
-                    <http_proxy/>
-                    <headers/>
-                    <retrieve_mode>0</retrieve_mode>
-                    <request_method>0</request_method>
-                    <allow_traps>0</allow_traps>
-                    <ssl_cert_file/>
-                    <ssl_key_file/>
-                    <ssl_key_password/>
-                    <verify_peer>0</verify_peer>
-                    <verify_host>0</verify_host>
                 </discovery_rule>
             </discovery_rules>
-            <httptests/>
-            <macros/>
-            <templates/>
-            <screens/>
         </template>
     </templates>
 </zabbix_export>

From a4574ecfbbb09c8c9ea86f8464497070d9d20b91 Mon Sep 17 00:00:00 2001
From: Eric Eisenhart <1577595+eric-eisenhart@users.noreply.github.com>
Date: Tue, 7 Nov 2023 09:54:29 -0800
Subject: [PATCH 2/2] Update Template MD RAID.xml

Remove internal wiki reference
---
 Template MD RAID.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Template MD RAID.xml b/Template MD RAID.xml
index 1d3e60e..7eeee3b 100755
--- a/Template MD RAID.xml	
+++ b/Template MD RAID.xml	
@@ -67,7 +67,7 @@
                                     <expression>last(/Template MD RAID/mdraid[{#MD_DEVICE},e,&quot;Failed Devices&quot;])&gt;0</expression>
                                     <name>{#MD_DEVICE} Number of Failed Devices</name>
                                     <priority>AVERAGE</priority>
-                                    <description>There is a failed disk for a RAID array on this host.  Please investigate using https://wiki.noc.sonic.net/display/SD/RAID+array+failure#RAIDarrayfailure-Zabbix%22NumberofFailedDevices%22</description>
+                                    <description>There is a failed disk for a RAID array on this host.</description>
                                 </trigger_prototype>
                             </trigger_prototypes>
                         </item_prototype>