From d846d0fb62fe9af942fee01d5910d9030ce8f5ab Mon Sep 17 00:00:00 2001 From: Tikhon Uskov Date: Mon, 7 Sep 2020 09:46:57 +0300 Subject: .........T [ZBX-13384] fixed minor template issues to follow guidelines --- templates/net/arista_snmp/template_net_arista_snmp.xml | 2 +- .../net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.xml | 2 +- templates/net/cisco_snmp/template_net_cisco_snmp.xml | 10 +++++----- templates/net/extreme_snmp/template_net_extreme_snmp.xml | 4 ++-- .../template_net_intel_qlogic_infiniband_snmp.xml | 6 +++--- templates/net/mellanox_snmp/template_net_mellanox_snmp.xml | 2 +- templates/net/netgear_snmp/template_net_netgear_snmp.xml | 6 +++--- 7 files changed, 16 insertions(+), 16 deletions(-) (limited to 'templates/net') diff --git a/templates/net/arista_snmp/template_net_arista_snmp.xml b/templates/net/arista_snmp/template_net_arista_snmp.xml index 05dffc03b5a..c22a0977fdf 100644 --- a/templates/net/arista_snmp/template_net_arista_snmp.xml +++ b/templates/net/arista_snmp/template_net_arista_snmp.xml @@ -325,7 +325,7 @@ entPhySensorScale, and entPhySensorPrecision objects must also be examined. {Template Net Arista SNMP:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""} or -{Template Net Arista SNMP:sensor.temp.status[entPhySensorOperStatus.{#SNMPINDEX}].last(0)}={$TEMP_WARN_STATUS} +{Template Net Arista SNMP:sensor.temp.status[entPhySensorOperStatus.{#SNMPINDEX}].last()}={$TEMP_WARN_STATUS} RECOVERY_EXPRESSION {Template Net Arista SNMP:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3 {#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""} diff --git a/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.xml b/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.xml index ef43e026b7c..5eb35e38558 100644 --- a/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.xml +++ b/templates/net/brocade_fc_sw_snmp/template_net_brocade_fc_sw_snmp.xml @@ -430,7 +430,7 @@ Temperature readings of testpoint: {#SENSOR_INFO} {Template Net Brocade FC SNMP:sensor.temp.value[swSensorValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""} or -{Template Net Brocade FC SNMP:sensor.temp.status[swSensorStatus.{#SNMPINDEX}].last(0)}={$TEMP_WARN_STATUS} +{Template Net Brocade FC SNMP:sensor.temp.status[swSensorStatus.{#SNMPINDEX}].last()}={$TEMP_WARN_STATUS} RECOVERY_EXPRESSION {Template Net Brocade FC SNMP:sensor.temp.value[swSensorValue.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3 {#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""} diff --git a/templates/net/cisco_snmp/template_net_cisco_snmp.xml b/templates/net/cisco_snmp/template_net_cisco_snmp.xml index 5c1e37f9830..42a2a3dbbfa 100644 --- a/templates/net/cisco_snmp/template_net_cisco_snmp.xml +++ b/templates/net/cisco_snmp/template_net_cisco_snmp.xml @@ -196,9 +196,9 @@ The current measurement of the test point being instrumented. {Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.value[ciscoEnvMonTemperatureValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"{#SNMPVALUE}"} or -{Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}].last(0)}={$TEMP_CRIT_STATUS} +{Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}].last()}={$TEMP_CRIT_STATUS} or -{Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}].last(0)}={$TEMP_DISASTER_STATUS} +{Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}].last()}={$TEMP_DISASTER_STATUS} RECOVERY_EXPRESSION {Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.value[ciscoEnvMonTemperatureValue.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"{#SNMPVALUE}"}-3 {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"} @@ -209,7 +209,7 @@ or {Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.value[ciscoEnvMonTemperatureValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:"{#SNMPVALUE}"} or -{Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}].last(0)}={$TEMP_WARN_STATUS} +{Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}].last()}={$TEMP_WARN_STATUS} RECOVERY_EXPRESSION {Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.value[ciscoEnvMonTemperatureValue.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:"{#SNMPVALUE}"}-3 {#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:"{#SNMPVALUE}"} @@ -221,9 +221,9 @@ or {#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:"{#SNMPVALUE}"} {Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.value[ciscoEnvMonTemperatureValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:"{#SNMPVALUE}"} or -{Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}].last(0)}={$TEMP_CRIT_STATUS} +{Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}].last()}={$TEMP_CRIT_STATUS} or -{Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}].last(0)}={$TEMP_DISASTER_STATUS} +{Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.status[ciscoEnvMonTemperatureState.{#SNMPINDEX}].last()}={$TEMP_DISASTER_STATUS} {Template Module Cisco CISCO-ENVMON-MIB SNMP:sensor.temp.value[ciscoEnvMonTemperatureValue.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:"{#SNMPVALUE}"}-3 diff --git a/templates/net/extreme_snmp/template_net_extreme_snmp.xml b/templates/net/extreme_snmp/template_net_extreme_snmp.xml index 88d019fd4c9..57c15966675 100644 --- a/templates/net/extreme_snmp/template_net_extreme_snmp.xml +++ b/templates/net/extreme_snmp/template_net_extreme_snmp.xml @@ -105,7 +105,7 @@ Reference: https://gtacknowledge.extremenetworks.com/articles/Q_A/Does-EXOS-supp Device: Temperature is above critical threshold: >{$TEMP_CRIT:""} {Template Net Extreme EXOS SNMP:sensor.temp.value[extremeCurrentTemperature.0].avg(5m)}>{$TEMP_CRIT:""} or -{Template Net Extreme EXOS SNMP:sensor.temp.status[extremeOverTemperatureAlarm.0].last(0)}={$TEMP_CRIT_STATUS} +{Template Net Extreme EXOS SNMP:sensor.temp.status[extremeOverTemperatureAlarm.0].last()}={$TEMP_CRIT_STATUS} {Template Net Extreme EXOS SNMP:sensor.temp.value[extremeCurrentTemperature.0].max(5m)}<{$TEMP_CRIT:""}-3 @@ -536,7 +536,7 @@ Status of the power supply {#SNMPVALUE} {Template Net Extreme EXOS SNMP:sensor.temp.value[extremeCurrentTemperature.0].avg(5m)}>{$TEMP_CRIT:""} or -{Template Net Extreme EXOS SNMP:sensor.temp.status[extremeOverTemperatureAlarm.0].last(0)}={$TEMP_CRIT_STATUS} +{Template Net Extreme EXOS SNMP:sensor.temp.status[extremeOverTemperatureAlarm.0].last()}={$TEMP_CRIT_STATUS} RECOVERY_EXPRESSION {Template Net Extreme EXOS SNMP:sensor.temp.value[extremeCurrentTemperature.0].max(5m)}<{$TEMP_CRIT:""}-3 Device: Temperature is above critical threshold: >{$TEMP_CRIT:""} diff --git a/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.xml b/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.xml index 345f876a496..cc8f9e7af34 100644 --- a/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.xml +++ b/templates/net/intel_qlogic_infiniband_snmp/template_net_intel_qlogic_infiniband_snmp.xml @@ -277,7 +277,7 @@ The current value read from the sensor. {Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""} or -{Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}].last(0)}={$TEMP_CRIT_STATUS} +{Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}].last()}={$TEMP_CRIT_STATUS} RECOVERY_EXPRESSION {Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3 {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""} @@ -288,7 +288,7 @@ or {Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""} or -{Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}].last(0)}={$TEMP_WARN_STATUS} +{Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}].last()}={$TEMP_WARN_STATUS} RECOVERY_EXPRESSION {Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3 {#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""} @@ -300,7 +300,7 @@ or {#SENSOR_INFO}: Temperature is above critical threshold: >{$TEMP_CRIT:""} {Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""} or -{Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}].last(0)}={$TEMP_CRIT_STATUS} +{Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.status[icsChassisSensorSlotOperStatus.{#SNMPINDEX}].last()}={$TEMP_CRIT_STATUS} {Template Net Intel_Qlogic Infiniband SNMP:sensor.temp.value[icsChassisSensorSlotValue.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3 diff --git a/templates/net/mellanox_snmp/template_net_mellanox_snmp.xml b/templates/net/mellanox_snmp/template_net_mellanox_snmp.xml index 650f3024399..88287e28144 100644 --- a/templates/net/mellanox_snmp/template_net_mellanox_snmp.xml +++ b/templates/net/mellanox_snmp/template_net_mellanox_snmp.xml @@ -322,7 +322,7 @@ entPhySensorScale, and entPhySensorPrecision objects must also be examined. {Template Net Mellanox SNMP:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""} or -{Template Net Mellanox SNMP:sensor.temp.status[entPhySensorOperStatus.{#SNMPINDEX}].last(0)}={$TEMP_WARN_STATUS} +{Template Net Mellanox SNMP:sensor.temp.status[entPhySensorOperStatus.{#SNMPINDEX}].last()}={$TEMP_WARN_STATUS} RECOVERY_EXPRESSION {Template Net Mellanox SNMP:sensor.temp.value[entPhySensorValue.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3 {#SENSOR_INFO}: Temperature is above warning threshold: >{$TEMP_WARN:""} diff --git a/templates/net/netgear_snmp/template_net_netgear_snmp.xml b/templates/net/netgear_snmp/template_net_netgear_snmp.xml index c1f2875a232..5b7365cd682 100644 --- a/templates/net/netgear_snmp/template_net_netgear_snmp.xml +++ b/templates/net/netgear_snmp/template_net_netgear_snmp.xml @@ -363,7 +363,7 @@ The temperature value reported by sensor {Template Net Netgear Fastpath SNMP:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""} or -{Template Net Netgear Fastpath SNMP:sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}].last(0)}={$TEMP_CRIT_STATUS} +{Template Net Netgear Fastpath SNMP:sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}].last()}={$TEMP_CRIT_STATUS} RECOVERY_EXPRESSION {Template Net Netgear Fastpath SNMP:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3 #{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} @@ -374,7 +374,7 @@ or {Template Net Netgear Fastpath SNMP:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_WARN:""} or -{Template Net Netgear Fastpath SNMP:sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}].last(0)}={$TEMP_WARN_STATUS} +{Template Net Netgear Fastpath SNMP:sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}].last()}={$TEMP_WARN_STATUS} RECOVERY_EXPRESSION {Template Net Netgear Fastpath SNMP:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_WARN:""}-3 #{#SNMPVALUE}: Temperature is above warning threshold: >{$TEMP_WARN:""} @@ -386,7 +386,7 @@ or #{#SNMPVALUE}: Temperature is above critical threshold: >{$TEMP_CRIT:""} {Template Net Netgear Fastpath SNMP:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].avg(5m)}>{$TEMP_CRIT:""} or -{Template Net Netgear Fastpath SNMP:sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}].last(0)}={$TEMP_CRIT_STATUS} +{Template Net Netgear Fastpath SNMP:sensor.temp.status[boxServicesTempSensorState.{#SNMPINDEX}].last()}={$TEMP_CRIT_STATUS} {Template Net Netgear Fastpath SNMP:sensor.temp.value[boxServicesTempSensorTemperature.{#SNMPINDEX}].max(5m)}<{$TEMP_CRIT:""}-3 -- cgit v1.2.3