diff options
53 files changed, 100 insertions, 100 deletions
diff --git a/create/src/templates.tmpl b/create/src/templates.tmpl index f5df727f28f..cafc1f5086e 100644 --- a/create/src/templates.tmpl +++ b/create/src/templates.tmpl @@ -88,7 +88,7 @@ ROW |10231 |NULL |Template Net Juniper SNMPv2 ROW |10233 |NULL |Template Net Mikrotik SNMPv2 |3 |-1 |2 | | |Template Net Mikrotik SNMPv2 |0 |NULL |Template Net Mikrotik version: 0.15&eol;MIBs used:&eol;HOST-RESOURCES-MIB&eol;MIKROTIK-MIB&eol;Known Issues:&eol;description : Doesn't have ifHighSpeed filled. fixed in more recent versions&eol;version : RotuerOS 6.28 or lower&eol;device : &eol;description : Doesn't have any temperature sensors&eol;version : RotuerOS 6.38.5&eol;device : Mikrotik 941-2nD, Mikrotik 951G-2HnD |1 |1 | | | | | |1 | ROW |10234 |NULL |Template Net Netgear Fastpath SNMPv2 |3 |-1 |2 | | |Template Net Netgear Fastpath SNMPv2 |0 |NULL |Template Net Netgear Fastpath version: 0.15&eol;Overview: https://kb.netgear.com/24352/MIBs-for-Smart-switches&eol;MIBs used:&eol;FASTPATH-SWITCHING-MIB&eol;FASTPATH-BOXSERVICES-PRIVATE-MIB |1 |1 | | | | | |1 | ROW |10235 |NULL |Template Net QTech QSW SNMPv2 |3 |-1 |2 | | |Template Net QTech QSW SNMPv2 |0 |NULL |Template Net QTech QSW version: 0.15&eol;MIBs used:&eol;QTECH-MIB&eol;ENTITY-MIB |1 |1 | | | | | |1 | -ROW |10236 |NULL |Template Net TP-LINK SNMPv2 |3 |-1 |2 | | |Template Net TP-LINK SNMPv2 |0 |NULL |Template Net TP-LINK JetStream version: 0.15&eol;Overview: Link to MIBs: http://www.tp-linkru.com/download/T2600G-28TS.html#MIBs_Files&eol;Sample device overview page: http://www.tp-linkru.com/products/details/cat-39_T2600G-28TS.html#overview&eol;emulation page(web): http://www.tp-linkru.com/resources/simulator/T2600G-28TS(UN)_1.0/Index.htm&eol;MIBs used:&eol;TPLINK-SYSINFO-MIB&eol;TPLINK-SYSMONITOR-MIB&eol;Known Issues:&eol;description : default sysLocation, sysName and sysContact is not filled with proper data. Real hostname and location can be found only in private branch(TPLINK-SYSINFO-MIB). Please check whether this problem exists in the latest firware: http://www.tp-linkru.com/download/T2600G-28TS.html#Firmware&eol;version : 2.0.0 Build 20170628 Rel.55184(Beta)&eol;device : T2600G-28TS 2.0&eol;description : The Serial number of the product(tpSysInfoSerialNum) is missing in HW versions prior to V2_170323&eol;version : prior to version V2_170323&eol;device : T2600G-28TS 2.0|1 |1 | | | | | |1 | +ROW |10236 |NULL |Template Net TP-LINK SNMPv2 |3 |-1 |2 | | |Template Net TP-LINK SNMPv2 |0 |NULL |Template Net TP-LINK JetStream version: 0.15&eol;Overview: Link to MIBs: http://www.tp-linkru.com/download/T2600G-28TS.html#MIBs_Files&eol;Sample device overview page: http://www.tp-linkru.com/products/details/cat-39_T2600G-28TS.html#overview&eol;emulation page(web): http://www.tp-linkru.com/resources/simulator/T2600G-28TS(UN)_1.0/Index.htm&eol;MIBs used:&eol;TPLINK-SYSINFO-MIB&eol;TPLINK-SYSMONITOR-MIB&eol;Known Issues:&eol;description : default sysLocation, sysName and sysContact is not filled with proper data. Real hostname and location can be found only in private branch(TPLINK-SYSINFO-MIB). Please check whether this problem exists in the latest firmware: http://www.tp-linkru.com/download/T2600G-28TS.html#Firmware&eol;version : 2.0.0 Build 20170628 Rel.55184(Beta)&eol;device : T2600G-28TS 2.0&eol;description : The Serial number of the product(tpSysInfoSerialNum) is missing in HW versions prior to V2_170323&eol;version : prior to version V2_170323&eol;device : T2600G-28TS 2.0|1 |1 | | | | | |1 | ROW |10237 |NULL |Template Net Ubiquiti AirOS SNMPv1 |3 |-1 |2 | | |Template Net Ubiquiti AirOS SNMPv1 |0 |NULL |Template Net Ubiquiti AirOS version: 0.15&eol;MIBs used:&eol;IEEE802dot11-MIB&eol;FROGFOOT-RESOURCES-MIB&eol;Known Issues:&eol;description : UBNT unifi reports speed: like IF-MIB::ifSpeed.1 = Gauge32: 4294967295 for all interfaces&eol;version : Firmware: BZ.ar7240.v3.7.51.6230.170322.1513&eol;device : UBNT UAP-LR&eol;description : UBNT AirMax(NanoStation, NanoBridge etc) reports ifSpeed: as 0 for VLAN and wireless(ath0) interfaces&eol;version : Firmware: XW.ar934x.v5.6-beta4.22359.140521.1836&eol;device : NanoStation M5&eol;description : UBNT AirMax(NanoStation, NanoBridge etc) reports always return ifType: as ethernet(6) even for wifi,vlans and other types&eol;version : Firmware: XW.ar934x.v5.6-beta4.22359.140521.1836&eol;device : NanoStation M5&eol;description : ifXTable is not provided in IF-MIB. So Interfaces Simple Template is used instead&eol;version : all above&eol;device : NanoStation, UAP-LR |1 |1 | | | | | |1 | ROW |10248 |NULL |Template OS Linux SNMPv2 |3 |-1 |2 | | |Template OS Linux SNMPv2 |0 |NULL |Template OS Linux version: 0.15 |1 |1 | | | | | |1 | ROW |10249 |NULL |Template OS Windows SNMPv2 |3 |-1 |2 | | |Template OS Windows SNMPv2 |0 |NULL |Template OS Windows version: 0.15&eol;Known Issues:&eol;description : Doesn't support In/Out 64 bit counters even thoug1h IfxTable is present:&eol;Currently, Windows gets it’s interface status from MIB-2. Since these 64bit SNMP counters (ifHCInOctets, ifHCOutOctets, etc.) are defined as an extension to IF-MIB, Microsoft has not implemented it.&eol;https://social.technet.microsoft.com/Forums/windowsserver/en-US/07b62ff0-94f6-40ca-a99d-d129c1b33d70/windows-2008-r2-snmp-64bit-counters-support?forum=winservergen&eol;&eol;version : Win2008, Win2012R2&eol;device : &eol;description : Doesn't support ifXTable at all&eol;version : WindowsXP&eol;device : &eol;description : EtherLike MIB is not supported&eol;version : *&eol;device : * |1 |1 | | | | | |1 | @@ -1401,7 +1401,7 @@ ROW |27311 |4 |{$SNMP_COMMUNITY}|discovery[{#SNMPVALUE},1.3.6.1.4.1.1991.1.1 ROW |27312 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.1991.1.1.1.2.1.1.3.{#SNMPINDEX} |10210 |PSU {#PSU_INDEX}: Power supply status |sensor.psu.status[snChasPwrSupplyOperStatus.{#SNMPINDEX}] |3m |2w |0d |0 |3 | | | |0 | | | | |NULL |26 | | |0 | | | | |2 |NULL | |MIB: FOUNDRY-SN-AGENT-MIB |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | ROW |27313 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.1991.1.1.1.3.1.1.3.{#SNMPINDEX} |10210 |Fan {#FAN_INDEX}: Fan status |sensor.fan.status[snChasFanOperStatus.{#SNMPINDEX}] |3m |2w |0d |0 |3 | | | |0 | | | | |NULL |27 | | |0 | | | | |2 |NULL | |MIB: FOUNDRY-SN-AGENT-MIB |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | ROW |27314 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.1991.1.1.2.13.1.1.4.{#SNMPINDEX} |10210 |{#SENSOR_DESCR}: Temperature |sensor.temp.value[snAgentTempValue.{#SNMPINDEX}] |3m |30d |365d |0 |0 | |°C | |0 | | | | |NULL |NULL | | |0 | | | | |2 |NULL | |MIB: FOUNDRY-SN-AGENT-MIB&eol;Temperature of the sensor represented by this row. Each unit is 0.5 degrees Celsius. |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | -ROW |27315 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.1991.1.1.1.1.18.{#SNMPINDEX} |10210 |Temperature |sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}] |3m |30d |365d |0 |0 | |°C | |0 | | | | |NULL |NULL | | |0 | | | | |2 |NULL | |MIB: FOUNDRY-SN-AGENT-MIB&eol;Temperature of the chassis. Each unit is 0.5 degrees Celcius.&eol;Only management module built with temperature sensor hardware is applicable.&eol;For those non-applicable management module, it returns no-such-name. |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | +ROW |27315 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.1991.1.1.1.1.18.{#SNMPINDEX} |10210 |Temperature |sensor.temp.value[snChasActualTemperature.{#SNMPINDEX}] |3m |30d |365d |0 |0 | |°C | |0 | | | | |NULL |NULL | | |0 | | | | |2 |NULL | |MIB: FOUNDRY-SN-AGENT-MIB&eol;Temperature of the chassis. Each unit is 0.5 degrees Celsius.&eol;Only management module built with temperature sensor hardware is applicable.&eol;For those non-applicable management module, it returns no-such-name. |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | ROW |27316 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.1991.1.1.1.2.2.1.4.{#SNMPINDEX} |10211 |Unit {#PSU_UNIT} PSU {#PSU_INDEX}: Power supply status |sensor.psu.status[snChasPwrSupply2OperStatus.{#SNMPINDEX}] |3m |2w |0d |0 |3 | | | |0 | | | | |NULL |26 | | |0 | | | | |2 |NULL | |MIB: FOUNDRY-SN-AGENT-MIB |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | ROW |27317 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.1991.1.1.1.3.2.1.4.{#SNMPINDEX} |10211 |Unit {#FAN_UNIT} Fan {#FAN_INDEX}: Fan status |sensor.fan.status[snChasFan2OperStatus.{#SNMPINDEX}] |3m |2w |0d |0 |3 | | | |0 | | | | |NULL |27 | | |0 | | | | |2 |NULL | |MIB: FOUNDRY-SN-AGENT-MIB |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | ROW |27318 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.1991.1.1.2.13.3.1.5.{#SNMPINDEX} |10211 |{#SENSOR_DESCR}: Temperature |sensor.temp.value[snAgentTemp2Value.{#SNMPINDEX}] |3m |30d |365d |0 |0 | |°C | |0 | | | | |NULL |NULL | | |0 | | | | |2 |NULL | |MIB: FOUNDRY-SN-AGENT-MIB&eol;Temperature of the sensor represented by this row. Each unit is 0.5 degrees Celsius. |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | @@ -1679,7 +1679,7 @@ ROW |28369 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.674.10892.5.5.1.20.140.1.1.30.{ ROW |28370 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.674.10892.5.5.1.20.140.1.1.11.{#SNMPINDEX} |10255 |Disk {#SNMPVALUE}({#DISK_NAME}): Read policy |system.hw.virtualdisk.readpolicy[virtualDiskReadPolicy.{#SNMPINDEX}] |1h |2w |365d |0 |3 | | | |0 | | | | |NULL |NULL | | |0 | | | | |2 |NULL | |MIB: IDRAC-MIB-SMIv2&eol;The read policy used by the controller for read operations on this virtual disk.&eol;Possible values:&eol;1: No Read Ahead.&eol;2: Read Ahead.&eol;3: Adaptive Read Ahead. |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | ROW |28371 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.674.10892.5.5.1.20.140.1.1.10.{#SNMPINDEX} |10255 |Disk {#SNMPVALUE}({#DISK_NAME}): Write policy |system.hw.virtualdisk.writepolicy[virtualDiskWritePolicy.{#SNMPINDEX}] |1h |2w |365d |0 |3 | | | |0 | | | | |NULL |67 | | |0 | | | | |2 |NULL | |MIB: IDRAC-MIB-SMIv2&eol;The write policy used by the controller for write operations on this virtual disk.&eol;Possible values:&eol;1: Write Through.&eol;2: Write Back.&eol;3: Force Write Back. |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | ROW |28372 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.674.10892.5.5.1.20.140.1.1.6.{#SNMPINDEX} |10255 |Disk {#SNMPVALUE}({#DISK_NAME}): Disk size |system.hw.virtualdisk.size[virtualDiskSizeInMB.{#SNMPINDEX}] |1h |2w |0d |0 |3 | |B | |0 | | | | |NULL |NULL | | |0 | | | | |2 |NULL | |MIB: IDRAC-MIB-SMIv2&eol;The size of the virtual disk in megabytes. |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | -ROW |28373 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.674.10892.5.5.1.20.140.1.1.4.{#SNMPINDEX} |10255 |Disk {#SNMPVALUE}({#DISK_NAME}): Status |system.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}] |3m |2w |365d |0 |3 | | | |0 | | | | |NULL |69 | | |0 | | | | |2 |NULL | |MIB: IDRAC-MIB-SMIv2&eol;The current state of this virtual disk (which includes any member physical disks.)&eol;Possible states:&eol;1: The current state could not be determined.&eol;2: The virtual disk is operating normally or optimally.&eol;3: The virtual disk has encountered a failure. The data on disk is lost or is about to be lost.&eol;4: The virtual disk encounterd a failure with one or all of the constituent redundant physical disks.&eol;The data on the virtual disk might no longer be fault tolerant. |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | +ROW |28373 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.674.10892.5.5.1.20.140.1.1.4.{#SNMPINDEX} |10255 |Disk {#SNMPVALUE}({#DISK_NAME}): Status |system.hw.virtualdisk.status[virtualDiskState.{#SNMPINDEX}] |3m |2w |365d |0 |3 | | | |0 | | | | |NULL |69 | | |0 | | | | |2 |NULL | |MIB: IDRAC-MIB-SMIv2&eol;The current state of this virtual disk (which includes any member physical disks.)&eol;Possible states:&eol;1: The current state could not be determined.&eol;2: The virtual disk is operating normally or optimally.&eol;3: The virtual disk has encountered a failure. The data on disk is lost or is about to be lost.&eol;4: The virtual disk encountered a failure with one or all of the constituent redundant physical disks.&eol;The data on the virtual disk might no longer be fault tolerant. |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | ROW |28374 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.674.10892.5.5.1.20.130.1.1.38.{#SNMPINDEX} |10255 |{#CNTLR_NAME}: Disk array controller status |system.hw.diskarray.status[controllerComponentStatus.{#SNMPINDEX}] |5m |1w |0d |0 |3 | | | |0 | | | | |NULL |59 | | |0 | | | | |2 |NULL | |MIB: IDRAC-MIB-SMIv2&eol;The status of the controller itself without the propagation of any contained component status.&eol;Possible values:&eol;1: Other&eol;2: Unknown&eol;3: OK&eol;4: Non-critical&eol;5: Critical&eol;6: Non-recoverable |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | ROW |28375 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.674.10892.5.5.1.20.130.1.1.2.{#SNMPINDEX} |10255 |{#CNTLR_NAME}: Disk array controller model |system.hw.diskarray.model[controllerName.{#SNMPINDEX}] |1d |30d |0 |0 |1 | | | |0 | | | | |NULL |NULL | | |0 | | | | |2 |NULL | |MIB: IDRAC-MIB-SMIv2&eol;The controller's name as represented in Storage Management. |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | ROW |28376 |4 |{$SNMP_COMMUNITY}|1.3.6.1.4.1.674.10892.5.5.1.20.130.15.1.4.{#SNMPINDEX} |10255 |Battery {#BATTERY_NUM}: Disk array cache controller battery status|system.hw.diskarray.cache.battery.status[batteryState.{#SNMPINDEX}] |5m |1w |0d |0 |3 | | | |0 | | | | |NULL |64 | | |0 | | | | |2 |NULL | |MIB: IDRAC-MIB-SMIv2&eol;Current state of battery.&eol;Possible values:&eol;1: The current state could not be determined.&eol;2: The battery is operating normally.&eol;3: The battery has failed and needs to be replaced.&eol;4: The battery temperature is high or charge level is depleting.&eol;5: The battery is missing or not detected.&eol;6: The battery is undergoing the re-charge phase.&eol;7: The battery voltage or charge level is below the threshold. |0 |30d |0 |0 | |0 | |NULL |3s | | | |200 |1 |0 | |0 |0 |0 |0 |0 |0 | @@ -3572,7 +3572,7 @@ ROW |15933 |{18158} = 0 ROW |15934 |{18159} > {$PG.REPL_LAG.MAX.WARN} |PostgreSQL: Streaming lag with {#MASTER} is too high (over {$PG.REPL_LAG.MAX.WARN} in 5m) | |0 |3 | |NULL |0 |0 |0 | |0 | |0 | | ROW |15935 |{18160} > {$PG.CONN_TOTAL_PCT.MAX.WARN} |PostgreSQL: Total number of connections is too high (over {$PG.CONN_TOTAL_PCT.MAX.WARN} in 5m) | |0 |3 | |NULL |0 |0 |0 | |0 | |0 | | ROW |15936 |{18161}=1 and {18162}>0 |PostgreSQL: Version has changed (new version value received: {ITEM.VALUE}) | |0 |1 | |NULL |0 |0 |0 | |0 | |0 | | -ROW |15937 |{18163} > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} |Database {#DBNAME}: Deadlock occured (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m) | |0 |4 | |NULL |0 |2 |0 | |0 | |0 | | +ROW |15937 |{18163} > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} |Database {#DBNAME}: Deadlock occurred (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m) | |0 |4 | |NULL |0 |2 |0 | |0 | |0 | | ROW |15938 |{18164}>{$PG.LOCKS.MAX.WARN:"{#DBNAME}"} |Database {#DBNAME}: Number of locks is too high (over {$PG.LOCKS.MAX.WARN:"{#DBNAME}"} in 5m) | |0 |2 | |NULL |0 |2 |0 | |0 | |0 | | ROW |15939 |{18165} > {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"} |Database {#DBNAME}: Too many recovery conflicts (over {$PG.CONFLICTS.MAX.WARN:"{#DBNAME}"} in 5m) | |0 |3 |The primary and standby servers are in many ways loosely connected. Actions on the primary will have an effect on the standby. As a result, there is potential for negative interactions or conflicts between them.&eol;https://www.postgresql.org/docs/current/hot-standby.html#HOT-STANDBY-CONFLICT |NULL |0 |2 |0 | |0 | |0 | | ROW |15940 |{18166}>{$PG.SLOW_QUERIES.MAX.WARN:"{#DBNAME}"} |Database {#DBNAME}: Too many slow queries (over {$PG.SLOW_QUERIES.MAX.WARN:"{#DBNAME}"} in 5m) | |0 |2 | |NULL |0 |2 |0 | |0 | |0 | | diff --git a/go/src/zabbix/vendor/github.com/godbus/dbus/auth.go b/go/src/zabbix/vendor/github.com/godbus/dbus/auth.go index b0dcb54e6b5..a0461ef4469 100644 --- a/go/src/zabbix/vendor/github.com/godbus/dbus/auth.go +++ b/go/src/zabbix/vendor/github.com/godbus/dbus/auth.go @@ -37,7 +37,7 @@ const ( // Auth defines the behaviour of an authentication mechanism. type Auth interface { - // Return the name of the mechnism, the argument to the first AUTH command + // Return the name of the mechanism, the argument to the first AUTH command // and the next status. FirstData() (name, resp []byte, status AuthStatus) @@ -127,7 +127,7 @@ func (conn *Conn) Auth(methods []Auth) error { // tryAuth tries to authenticate with m as the mechanism, using state as the // initial authState and in for reading input. It returns (nil, true) on // success, (nil, false) on a REJECTED and (someErr, false) if some other -// error occured. +// error occurred. func (conn *Conn) tryAuth(m Auth, state authState, in *bufio.Reader) (error, bool) { for { s, err := authReadLine(in) diff --git a/go/src/zabbix/vendor/github.com/godbus/dbus/auth_sha1.go b/go/src/zabbix/vendor/github.com/godbus/dbus/auth_sha1.go index df15b461198..80286700b6d 100644 --- a/go/src/zabbix/vendor/github.com/godbus/dbus/auth_sha1.go +++ b/go/src/zabbix/vendor/github.com/godbus/dbus/auth_sha1.go @@ -60,7 +60,7 @@ func (a authCookieSha1) HandleData(data []byte) ([]byte, AuthStatus) { // getCookie searches for the cookie identified by id in context and returns // the cookie content or nil. (Since HandleData can't return a specific error, -// but only whether an error occured, this function also doesn't bother to +// but only whether an error occurred, this function also doesn't bother to // return an error.) func (a authCookieSha1) getCookie(context, id []byte) []byte { file, err := os.Open(a.home + "/.dbus-keyrings/" + string(context)) diff --git a/go/src/zabbix/vendor/github.com/godbus/dbus/conn.go b/go/src/zabbix/vendor/github.com/godbus/dbus/conn.go index cc79d2d42cc..a41e9b00d10 100644 --- a/go/src/zabbix/vendor/github.com/godbus/dbus/conn.go +++ b/go/src/zabbix/vendor/github.com/godbus/dbus/conn.go @@ -135,7 +135,7 @@ func SystemBus() (conn *Conn, err error) { // SystemBusPrivate returns a new private connection to the system bus. // Note: this connection is not ready to use. One must perform Auth and Hello -// on the connection before it is useable. +// on the connection before it is usable. func SystemBusPrivate(opts ...ConnOption) (*Conn, error) { return Dial(getSystemBusPlatformAddress(), opts...) } @@ -257,7 +257,7 @@ func (conn *Conn) Close() error { // Eavesdrop causes conn to send all incoming messages to the given channel // without further processing. Method replies, errors and signals will not be -// sent to the appropiate channels and method calls will not be handled. If nil +// sent to the appropriate channels and method calls will not be handled. If nil // is passed, the normal behaviour is restored. // // The caller has to make sure that ch is sufficiently buffered; @@ -288,13 +288,13 @@ func (conn *Conn) Hello() error { } // inWorker runs in an own goroutine, reading incoming messages from the -// transport and dispatching them appropiately. +// transport and dispatching them appropriately. func (conn *Conn) inWorker() { for { msg, err := conn.ReadMessage() if err != nil { if _, ok := err.(InvalidMessageError); !ok { - // Some read error occured (usually EOF); we can't really do + // Some read error occurred (usually EOF); we can't really do // anything but to shut down all stuff and returns errors to all // pending replies. conn.Close() @@ -636,7 +636,7 @@ func getTransport(address string) (transport, error) { } // dereferenceAll returns a slice that, assuming that vs is a slice of pointers -// of arbitrary types, containes the values that are obtained from dereferencing +// of arbitrary types, contains the values that are obtained from dereferencing // all elements in vs. func dereferenceAll(vs []interface{}) []interface{} { for i := range vs { diff --git a/go/src/zabbix/vendor/github.com/godbus/dbus/doc.go b/go/src/zabbix/vendor/github.com/godbus/dbus/doc.go index 895036a8c11..ade1df951cd 100644 --- a/go/src/zabbix/vendor/github.com/godbus/dbus/doc.go +++ b/go/src/zabbix/vendor/github.com/godbus/dbus/doc.go @@ -61,7 +61,7 @@ Handling Unix file descriptors deserves special mention. To use them, you should first check that they are supported on a connection by calling SupportsUnixFDs. If it returns true, all method of Connection will translate messages containing UnixFD's to messages that are accompanied by the given file descriptors with the -UnixFD values being substituted by the correct indices. Similarily, the indices +UnixFD values being substituted by the correct indices. Similarly, the indices of incoming messages are automatically resolved. It shouldn't be necessary to use UnixFDIndex. diff --git a/go/src/zabbix/vendor/github.com/godbus/dbus/export.go b/go/src/zabbix/vendor/github.com/godbus/dbus/export.go index 95d0e29582d..4ab03f36f95 100644 --- a/go/src/zabbix/vendor/github.com/godbus/dbus/export.go +++ b/go/src/zabbix/vendor/github.com/godbus/dbus/export.go @@ -332,7 +332,7 @@ func (conn *Conn) export(methods map[string]reflect.Value, path ObjectPath, ifac h, ok := conn.handler.(*defaultHandler) if !ok { return fmt.Errorf( - `dbus: export only allowed on the default hander handler have %T"`, + `dbus: export only allowed on the default handler handler have %T"`, conn.handler) } diff --git a/go/src/zabbix/vendor/github.com/godbus/dbus/server_interfaces.go b/go/src/zabbix/vendor/github.com/godbus/dbus/server_interfaces.go index 79d97edf3ec..e4e0389fdf0 100644 --- a/go/src/zabbix/vendor/github.com/godbus/dbus/server_interfaces.go +++ b/go/src/zabbix/vendor/github.com/godbus/dbus/server_interfaces.go @@ -63,7 +63,7 @@ type Method interface { // any other decoding scheme. type ArgumentDecoder interface { // To decode the arguments of a method the sender and message are - // provided incase the semantics of the implementer provides access + // provided in case the semantics of the implementer provides access // to these as part of the method invocation. DecodeArguments(conn *Conn, sender string, msg *Message, args []interface{}) ([]interface{}, error) } diff --git a/go/src/zabbix/vendor/github.com/godbus/dbus/sig.go b/go/src/zabbix/vendor/github.com/godbus/dbus/sig.go index c1b809202cd..2d326cebc0d 100644 --- a/go/src/zabbix/vendor/github.com/godbus/dbus/sig.go +++ b/go/src/zabbix/vendor/github.com/godbus/dbus/sig.go @@ -137,7 +137,7 @@ func ParseSignatureMust(s string) Signature { return sig } -// Empty retruns whether the signature is the empty signature. +// Empty returns whether the signature is the empty signature. func (s Signature) Empty() bool { return s.str == "" } diff --git a/go/src/zabbix/vendor/github.com/godbus/dbus/variant.go b/go/src/zabbix/vendor/github.com/godbus/dbus/variant.go index 0ca123b0128..cbdb24c6d2d 100644 --- a/go/src/zabbix/vendor/github.com/godbus/dbus/variant.go +++ b/go/src/zabbix/vendor/github.com/godbus/dbus/variant.go @@ -49,7 +49,7 @@ func ParseVariant(s string, sig Signature) (Variant, error) { } // format returns a formatted version of v and whether this string can be parsed -// unambigously. +// unambiguously. func (v Variant) format() (string, bool) { switch v.sig.str[0] { case 'b', 'i': diff --git a/go/src/zabbix/vendor/golang.org/x/sys/unix/mkpost.go b/go/src/zabbix/vendor/golang.org/x/sys/unix/mkpost.go index eb4332059ae..7c3e90c9418 100644 --- a/go/src/zabbix/vendor/golang.org/x/sys/unix/mkpost.go +++ b/go/src/zabbix/vendor/golang.org/x/sys/unix/mkpost.go @@ -67,7 +67,7 @@ func main() { b = controlRegsRegex.ReplaceAll(b, []byte("_ [0]uint64")) // Remove fields that are added by glibc - // Note that this is unstable as the identifers are private. + // Note that this is unstable as the identifiers are private. removeFieldsRegex := regexp.MustCompile(`X__glibc\S*`) b = removeFieldsRegex.ReplaceAll(b, []byte("_")) diff --git a/go/src/zabbix/vendor/golang.org/x/sys/unix/syscall_linux.go b/go/src/zabbix/vendor/golang.org/x/sys/unix/syscall_linux.go index 637b5017b8b..bf298dbc96b 100644 --- a/go/src/zabbix/vendor/golang.org/x/sys/unix/syscall_linux.go +++ b/go/src/zabbix/vendor/golang.org/x/sys/unix/syscall_linux.go @@ -34,7 +34,7 @@ func Chown(path string, uid int, gid int) (err error) { return Fchownat(AT_FDCWD, path, uid, gid, 0) } -func Creat(path string, mode uint32) (fd int, err error) { +func Create(path string, mode uint32) (fd int, err error) { return Open(path, O_CREAT|O_WRONLY|O_TRUNC, mode) } @@ -55,7 +55,7 @@ func FanotifyMark(fd int, flags uint, mask uint64, dirFd int, pathname string) ( //sys fchmodat(dirfd int, path string, mode uint32) (err error) func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) { - // Linux fchmodat doesn't support the flags parameter. Mimick glibc's behavior + // Linux fchmodat doesn't support the flags parameter. Mimic glibc's behavior // and check the flags. Otherwise the mode would be applied to the symlink // destination which is not what the user expects. if flags&^AT_SYMLINK_NOFOLLOW != 0 { diff --git a/include/dbcache.h b/include/dbcache.h index d42e1df0792..2022362b114 100644 --- a/include/dbcache.h +++ b/include/dbcache.h @@ -456,9 +456,9 @@ typedef struct zbx_vector_ptr_t correlations; zbx_hashset_t conditions; - /* Configuration synchonization timestamp of the rules. */ + /* Configuration synchronization timestamp of the rules. */ /* Update the cache if this timesamp is less than the */ - /* current configuration synchonization timestamp. */ + /* current configuration synchronization timestamp. */ int sync_ts; } zbx_correlation_rules_t; diff --git a/include/preproc.h b/include/preproc.h index 450822ae4bc..7c59b14a2da 100644 --- a/include/preproc.h +++ b/include/preproc.h @@ -33,7 +33,7 @@ typedef struct } zbx_preproc_result_t; -/* the following functions are implemened differently for server and proxy */ +/* the following functions are implemented differently for server and proxy */ void zbx_preprocess_item_value(zbx_uint64_t itemid, unsigned char item_value_type, unsigned char item_flags, AGENT_RESULT *result, zbx_timespec_t *ts, unsigned char state, char *error); diff --git a/m4/ldap.m4 b/m4/ldap.m4 index fb855ab4e64..716d7983e20 100644 --- a/m4/ldap.m4 +++ b/m4/ldap.m4 @@ -76,7 +76,7 @@ AC_HELP_STRING([--with-ldap@<:@=DIR@:>@],[Include LDAP support @<:@default=no@:> found_ldap="yes" AC_DEFINE(HAVE_LDAP,1,[Define to 1 if LDAP should be enabled.]) - AC_DEFINE(LDAP_DEPRECATED, 1, [Define to 1 if LDAP depricated functions is used.]) + AC_DEFINE(LDAP_DEPRECATED, 1, [Define to 1 if LDAP deprecated functions is used.]) AC_MSG_RESULT(yes) if test "x$enable_static" = "xyes"; then diff --git a/m4/openipmi.m4 b/m4/openipmi.m4 index 0160b40674f..3aa20946026 100644 --- a/m4/openipmi.m4 +++ b/m4/openipmi.m4 @@ -68,7 +68,7 @@ AC_HELP_STRING([--with-openipmi@<:@=DIR@:>@],[Include OPENIPMI support @<:@defau found_openipmi="yes" AC_DEFINE(HAVE_OPENIPMI,1,[Define to 1 if OPENIPMI should be enabled.]) - AC_DEFINE(OPENIPMI_DEPRECATED, 1, [Define to 1 if OPENIPMI depricated functions is used.]) + AC_DEFINE(OPENIPMI_DEPRECATED, 1, [Define to 1 if OPENIPMI deprecated functions is used.]) AC_MSG_RESULT(yes) fi fi diff --git a/misc/snmptrap/zabbix_trap_receiver.pl b/misc/snmptrap/zabbix_trap_receiver.pl index 6baf55b62aa..9b9ebd4ba2a 100644 --- a/misc/snmptrap/zabbix_trap_receiver.pl +++ b/misc/snmptrap/zabbix_trap_receiver.pl @@ -78,7 +78,7 @@ sub zabbix_receiver } # print trap header - # timestamp must be placed at the beggining of the first line (can be omitted) + # timestamp must be placed at the beginning of the first line (can be omitted) # the first line must include the header "ZBXTRAP [IP/DNS address] " # * IP/DNS address is the used to find the corresponding SNMP trap items # * this header will be cut during processing (will not appear in the item value) diff --git a/sass/problems-compact-view.html b/sass/problems-compact-view.html index 79db7dc8a7f..8b2e2d14706 100644 --- a/sass/problems-compact-view.html +++ b/sass/problems-compact-view.html @@ -796,7 +796,7 @@ <td><span class="problem-unack-fg">PROBLEM</span></td> <td></td> <td><a class="link-action" role="button" href="#">Zabbix server</a></td> - <td><a title="ValueItemTrigger35 long name for elipsis testing and what not. Going on and on and on and on and on... oh well! :) Can't get enough of those goooodies :)" class="link-action" role="button" href="#">ValueItemTrigger35 with lorem ipsum desciption of problem tat needs to be shortened.</a></td> + <td><a title="ValueItemTrigger35 long name for elipsis testing and what not. Going on and on and on and on and on... oh well! :) Can't get enough of those goooodies :)" class="link-action" role="button" href="#">ValueItemTrigger35 with lorem ipsum description of problem tat needs to be shortened.</a></td> <td>5m 2d 23h</td> <td><a class="link-alt red" href="#">No</a></td> <td class="nowrap"> diff --git a/sass/stylesheets/sass/screen.scss b/sass/stylesheets/sass/screen.scss index e8772691105..3d23b70a647 100644 --- a/sass/stylesheets/sass/screen.scss +++ b/sass/stylesheets/sass/screen.scss @@ -7502,7 +7502,7 @@ Tables are used to display tabular data. All tables are declared with the `list- ##Table with Pagination -Pagination is used to separate large amounts of tabular data into descrete peices. +Pagination is used to separate large amounts of tabular data into descrete pieces. ```html_example <div class="overflow-table"> @@ -7807,7 +7807,7 @@ title: Dialogs name: dialog --- -Dialogs are used to reveal an addtional piece of information: data tables, text, forms or certain actions. Dialogs can be dismissed by clicking/pushing × at the top right corner, *cancel* button, or outside of the dialog area. +Dialogs are used to reveal an additional piece of information: data tables, text, forms or certain actions. Dialogs can be dismissed by clicking/pushing × at the top right corner, *cancel* button, or outside of the dialog area. ##Alert Dialogs diff --git a/src/libs/zbxalgo/evaluate.c b/src/libs/zbxalgo/evaluate.c index 984b837c7e6..c59632f2406 100644 --- a/src/libs/zbxalgo/evaluate.c +++ b/src/libs/zbxalgo/evaluate.c @@ -349,7 +349,7 @@ static double evaluate_term5(int *unknown_idx) { op = *ptr++; - /* even if 1st operand is Unknown we evaluate 2nd operand to catch fatal error if any occurrs */ + /* even if 1st operand is Unknown we evaluate 2nd operand to catch fatal error if any occurs */ if (ZBX_INFINITY == (operand = evaluate_term6(&oper_idx))) return ZBX_INFINITY; @@ -418,7 +418,7 @@ static double evaluate_term4(int *unknown_idx) else break; - /* even if 1st operand is Unknown we evaluate 2nd operand to catch fatal error if any occurrs */ + /* even if 1st operand is Unknown we evaluate 2nd operand to catch fatal error if any occurs */ if (ZBX_INFINITY == (operand = evaluate_term5(&oper_idx))) return ZBX_INFINITY; @@ -489,7 +489,7 @@ static double evaluate_term3(int *unknown_idx) else break; - /* even if 1st operand is Unknown we evaluate 2nd operand to catch fatal error if any occurrs */ + /* even if 1st operand is Unknown we evaluate 2nd operand to catch fatal error if any occurs */ if (ZBX_INFINITY == (operand = evaluate_term4(&oper_idx))) return ZBX_INFINITY; diff --git a/src/libs/zbxalgo/int128.c b/src/libs/zbxalgo/int128.c index 73c8f44a49d..2d6440dcaa7 100644 --- a/src/libs/zbxalgo/int128.c +++ b/src/libs/zbxalgo/int128.c @@ -52,7 +52,7 @@ static void udec128_128(zbx_uint128_t *base, const zbx_uint128_t *value) * * * Purpose: Logical right shift of 128 bit unsigned integer. * * * - * Parameters: base - [IN,OUT] the inital value and result * + * Parameters: base - [IN,OUT] the initial value and result * * bits - [IN] the number of bits to shift for. * * * * Author: Andris Zeila * @@ -83,7 +83,7 @@ static void ushiftr128(zbx_uint128_t *base, unsigned int bits) * * * Purpose: Logical left shift of 128 bit unsigned integer. * * * - * Parameters: base - [IN,OUT] the inital value and result * + * Parameters: base - [IN,OUT] the initial value and result * * bits - [IN] the number of bits to shift for. * * * * Author: Andris Zeila * diff --git a/src/libs/zbxcommon/misc.c b/src/libs/zbxcommon/misc.c index 8139229ab02..d5be849d8b0 100644 --- a/src/libs/zbxcommon/misc.c +++ b/src/libs/zbxcommon/misc.c @@ -1055,7 +1055,7 @@ static void scheduler_interval_free(zbx_scheduler_interval_t *interval) * var_len - [IN] the maximum number of characters for a filter * * variable (<from>, <to>, <step>) * * * - * Return value: SUCCEED - the fitler was successfully parsed * + * Return value: SUCCEED - the filter was successfully parsed * * FAIL - otherwise * * * * Comments: This function recursively calls itself for each filter fragment. * @@ -1179,7 +1179,7 @@ static int scheduler_parse_filter_r(zbx_scheduler_filter_t **filter, const char * var_len - [IN] the maximum number of characters for a filter * * variable (<from>, <to>, <step>) * * * - * Return value: SUCCEED - the fitler was successfully parsed * + * Return value: SUCCEED - the filter was successfully parsed * * FAIL - otherwise * * * * Comments: This function will fail if a filter already exists. This * diff --git a/src/libs/zbxcommon/str.c b/src/libs/zbxcommon/str.c index e9b1a6aabaa..34ece105bc4 100644 --- a/src/libs/zbxcommon/str.c +++ b/src/libs/zbxcommon/str.c @@ -438,7 +438,7 @@ void del_zeros(char *s) if (1 == trim) { - /* don't touch invalid numbers with more than one decimal seprator */ + /* don't touch invalid numbers with more than one decimal separator */ return; } @@ -762,7 +762,7 @@ char *zbx_strdcat(char *dest, const char *src) * * * Function: zbx_strdcatf * * * - * Purpose: dynamical cating of formated strings * + * Purpose: dynamical cating of formatted strings * * * * Return value: new pointer of string * * * @@ -4218,7 +4218,7 @@ int num_param(const char *p) * * * Author: Eugene Grigorjev, rewritten by Alexei Vladishev * * * - * Comments: delimeter for parameters is ',' * + * Comments: delimiter for parameters is ',' * * * ******************************************************************************/ int get_param(const char *p, int num, char *buf, size_t max_len) @@ -4367,7 +4367,7 @@ int get_param(const char *p, int num, char *buf, size_t max_len) * * * Author: Alexander Vladishev * * * - * Comments: delimeter for parameters is ',' * + * Comments: delimiter for parameters is ',' * * * ******************************************************************************/ static int get_param_len(const char *p, int num, size_t *sz) @@ -4497,7 +4497,7 @@ static int get_param_len(const char *p, int num, size_t *sz) * * * Author: Alexander Vladishev * * * - * Comments: delimeter for parameters is ',' * + * Comments: delimiter for parameters is ',' * * * ******************************************************************************/ char *get_param_dyn(const char *p, int num) @@ -4560,7 +4560,7 @@ static int replace_key_param(char **data, int key_type, size_t l, size_t *r, int * key_type - [IN] ZBX_KEY_TYPE_* * * cb - [IN] callback function * * cb_data - [IN] callback function custom data * - * error - [OUT] error messsage * + * error - [OUT] error message * * maxerrlen - [IN] error size * * * * Return value: SUCCEED - function executed successfully * @@ -4821,7 +4821,7 @@ int str_in_list(const char *list, const char *value, char delimiter) * * * Author: Alexei Vladishev * * * - * Comments: delimeter for parameters is ',' * + * Comments: delimiter for parameters is ',' * * * ******************************************************************************/ int get_key_param(char *param, int num, char *buf, size_t max_len) @@ -4856,7 +4856,7 @@ int get_key_param(char *param, int num, char *buf, size_t max_len) * * * Author: Alexei Vladishev * * * - * Comments: delimeter for parameters is ',' * + * Comments: delimiter for parameters is ',' * * * ******************************************************************************/ int num_key_param(char *param) diff --git a/src/libs/zbxcomms/comms.c b/src/libs/zbxcomms/comms.c index 58a290d1281..acc54892840 100644 --- a/src/libs/zbxcomms/comms.c +++ b/src/libs/zbxcomms/comms.c @@ -188,7 +188,7 @@ void zbx_gethost_by_ip(const char *ip, char *host, size_t hostlen) * * * Function: zbx_getip_by_host * * * - * Purpose: retrieve IP addres by host name * + * Purpose: retrieve IP address by host name * * * ******************************************************************************/ #ifdef HAVE_IPV6 diff --git a/src/libs/zbxcommshigh/comms.c b/src/libs/zbxcommshigh/comms.c index 99af1906ca6..17269fd923d 100644 --- a/src/libs/zbxcommshigh/comms.c +++ b/src/libs/zbxcommshigh/comms.c @@ -35,7 +35,7 @@ * protocol - [IN] the transport protocol * * timeout - [IN] timeout for this operation * * * - * Return value: SUCCEED - data successfully transmited * + * Return value: SUCCEED - data successfully transmitted * * NETWORK_ERROR - network related error occurred * * * * Author: Alexander Vladishev, Alexei Vladishev * diff --git a/src/libs/zbxconf/cfg.c b/src/libs/zbxconf/cfg.c index 1cc3e10ab9d..5e45db03759 100644 --- a/src/libs/zbxconf/cfg.c +++ b/src/libs/zbxconf/cfg.c @@ -586,7 +586,7 @@ int check_cfg_feature_str(const char *parameter, const char *value, const char * * Function: zbx_set_data_destination_hosts * * * * Purpose: parse "ServerActive' parameter value and set destination servers * - * using a calback function * + * using a callback function * * * ******************************************************************************/ void zbx_set_data_destination_hosts(char *active_hosts, add_serveractive_host_f cb) diff --git a/src/libs/zbxdbcache/dbconfig.c b/src/libs/zbxdbcache/dbconfig.c index 1ef73c9b5c6..68131849b2f 100644 --- a/src/libs/zbxdbcache/dbconfig.c +++ b/src/libs/zbxdbcache/dbconfig.c @@ -9554,7 +9554,7 @@ static int dc_expression_user_macro_validator(const char *value) * hostids_num - [IN] the number of hostids * * validator_func - [IN] an optional validator function * * * - * Return value: The text value with expanded user macros. Uknown or invalid * + * Return value: The text value with expanded user macros. Unknown or invalid * * macros will be left unresolved. * * * * Comments: The returned value must be freed by the caller. * diff --git a/src/libs/zbxdbcache/dbconfig_dump.c b/src/libs/zbxdbcache/dbconfig_dump.c index 2c44b3053d6..bbd7a2a8661 100644 --- a/src/libs/zbxdbcache/dbconfig_dump.c +++ b/src/libs/zbxdbcache/dbconfig_dump.c @@ -203,7 +203,7 @@ static void DCdump_proxies(void) proxy = (ZBX_DC_PROXY *)index.values[i]; zabbix_log(LOG_LEVEL_TRACE, "hostid:" ZBX_FS_UI64 " location:%u", proxy->hostid, proxy->location); zabbix_log(LOG_LEVEL_TRACE, " proxy_address:'%s'", proxy->proxy_address); - zabbix_log(LOG_LEVEL_TRACE, " compres:%d", proxy->auto_compress); + zabbix_log(LOG_LEVEL_TRACE, " compress:%d", proxy->auto_compress); } diff --git a/src/libs/zbxdbcache/dbsync.c b/src/libs/zbxdbcache/dbsync.c index c3f7ee3e9d0..3142f642d99 100644 --- a/src/libs/zbxdbcache/dbsync.c +++ b/src/libs/zbxdbcache/dbsync.c @@ -463,7 +463,7 @@ int zbx_dbsync_compare_config(zbx_dbsync_t *sync) "hk_history_mode,hk_history_global,hk_history,hk_trends_mode," "hk_trends_global,hk_trends,default_inventory_mode,db_extension,autoreg_tls_accept" " from config" - " order by configid"))) /* if you change number of colums in DBselect(), */ + " order by configid"))) /* if you change number of columns in DBselect(), */ /* adjust SELECTED_CONFIG_FIELD_COUNT */ { return FAIL; @@ -502,7 +502,7 @@ int zbx_dbsync_compare_config(zbx_dbsync_t *sync) * On success this function produces a changeset with 0 or 1 record * * because 'config_autoreg_tls' table can have no more than 1 record. * * If in future you want to support multiple autoregistration PSKs and/or * - * select more colums in DBselect() then do not forget to sync changes * + * select more columns in DBselect() then do not forget to sync changes * * with DCsync_autoreg_config() !!! * * * ******************************************************************************/ @@ -516,7 +516,7 @@ int zbx_dbsync_compare_autoreg_psk(zbx_dbsync_t *sync) if (NULL == (result = DBselect("select tls_psk_identity,tls_psk" " from config_autoreg_tls" - " order by autoreg_tlsid"))) /* if you change number of colums in DBselect(), */ + " order by autoreg_tlsid"))) /* if you change number of columns in DBselect(), */ /* adjust CONFIG_AUTOREG_TLS_FIELD_COUNT */ { return FAIL; @@ -2613,7 +2613,7 @@ int zbx_dbsync_compare_actions(zbx_dbsync_t *sync) * * * Function: dbsync_compare_action_op * * * - * Purpose: compares action opereation class and flushes update row if * + * Purpose: compares action operation class and flushes update row if * * necessary * * * * Parameter: sync - [OUT] the changeset * diff --git a/src/libs/zbxdbcache/valuecache.c b/src/libs/zbxdbcache/valuecache.c index 8f34e4a5958..d3f618eec10 100644 --- a/src/libs/zbxdbcache/valuecache.c +++ b/src/libs/zbxdbcache/valuecache.c @@ -2391,7 +2391,7 @@ void zbx_vc_destroy(void) * Purpose: resets value cache * * * * Comments: All items and their historical data are removed, * - * cache working mode, statistics reseted. * + * cache working mode, statistics reset. * * * ******************************************************************************/ void zbx_vc_reset(void) diff --git a/src/libs/zbxembed/duk_config.h b/src/libs/zbxembed/duk_config.h index f52b809d5f7..8aa9d00c906 100644 --- a/src/libs/zbxembed/duk_config.h +++ b/src/libs/zbxembed/duk_config.h @@ -2504,7 +2504,7 @@ typedef struct duk_hthread duk_context; #define DUK_USE_ALIGN_BY 8 #endif -/* Compiler specific hackery needed to force struct size to match aligment, +/* Compiler specific hackery needed to force struct size to match alignment, * see e.g. duk_hbuffer.h. * * http://stackoverflow.com/questions/11130109/c-struct-size-alignment diff --git a/src/libs/zbxembed/duktape.c b/src/libs/zbxembed/duktape.c index 1a833e78ef8..98d98acec73 100644 --- a/src/libs/zbxembed/duktape.c +++ b/src/libs/zbxembed/duktape.c @@ -5731,7 +5731,7 @@ DUK_INTERNAL_DECL void duk_to_primitive_ordinary(duk_hthread *thr, duk_idx_t idx /* Raw internal valstack access macros: access is unsafe so call site * must have a guarantee that the index is valid. When that is the case, * using these macro results in faster and smaller code than duk_get_tval(). - * Both 'ctx' and 'idx' are evaluted multiple times, but only for asserts. + * Both 'ctx' and 'idx' are evaluated multiple times, but only for asserts. */ #define DUK_ASSERT_VALID_NEGIDX(thr,idx) \ (DUK_ASSERT_EXPR((duk_int_t) (idx) < 0), DUK_ASSERT_EXPR(duk_is_valid_index((thr), (idx)))) @@ -6993,7 +6993,7 @@ DUK_INTERNAL_DECL duk_bool_t duk_hobject_prototype_chain_contains(duk_hthread *t #if !defined(DUK_USE_OBJECT_BUILTIN) /* These declarations are needed when related built-in is disabled and - * genbuiltins.py won't automatically emit the declerations. + * genbuiltins.py won't automatically emit the declarations. */ DUK_INTERNAL_DECL duk_ret_t duk_bi_object_prototype_to_string(duk_hthread *thr); DUK_INTERNAL_DECL duk_ret_t duk_bi_function_prototype(duk_hthread *thr); @@ -38644,7 +38644,7 @@ DUK_INTERNAL duk_ret_t duk_bi_object_setprototype_shared(duk_hthread *thr) { } } DUK_HOBJECT_SET_PROTOTYPE_UPDREF(thr, h_obj, h_new_proto); - /* fall thru */ + /* fall through */ skip: duk_set_top(thr, 1); @@ -50906,7 +50906,7 @@ DUK_INTERNAL void duk_heaphdr_refcount_finalize_norz(duk_heap *heap, duk_heaphdr /* * Refzero processing for duk_hobject: queue a refzero'ed object to either - * finalize_list or refzero_list and process the relevent list(s) if + * finalize_list or refzero_list and process the relevant list(s) if * necessary. * * Refzero_list is single linked, with only 'prev' pointers set and valid. @@ -58302,7 +58302,7 @@ DUK_INTERNAL duk_bool_t duk_hobject_putprop(duk_hthread *thr, duk_tval *tv_obj, (void) duk__check_arguments_map_for_put(thr, orig, key, &desc, throw_flag); duk_pop_unsafe(thr); } - /* fall thru */ + /* fall through */ success_no_arguments_exotic: /* shared exit path now */ @@ -62384,7 +62384,7 @@ DUK_LOCAL void duk__create_arguments_object(duk_hthread *thr, * * Note that the specification requires that the *same* thrower * built-in object is used here! See E5 Section 10.6 main - * algoritm, step 14, and Section 13.2.3 which describes the + * algorithm, step 14, and Section 13.2.3 which describes the * thrower. See test case test-arguments-throwers.js. */ @@ -67507,7 +67507,7 @@ DUK_LOCAL duk_regconst_t duk__lookup_active_register_binding(duk_compiler_ctx *c * identifier name. Returns 1 if register-bound, 0 otherwise. Caller can * also check (out_reg_varbind >= 0) to check whether or not identifier is * register bound. The caller must NOT use out_rc_varname at all unless - * return code is 0 or out_reg_varbind is < 0; this is becuase out_rc_varname + * return code is 0 or out_reg_varbind is < 0; this is because out_rc_varname * is unsigned and doesn't have a "unused" / none value. */ DUK_LOCAL duk_bool_t duk__lookup_lhs(duk_compiler_ctx *comp_ctx, duk_regconst_t *out_reg_varbind, duk_regconst_t *out_rc_varname) { @@ -72519,7 +72519,7 @@ DUK_LOCAL void duk__parse_func_like_raw(duk_compiler_ctx *comp_ctx, duk_small_ui * parsing handles this retroactively. * * For function expressions and declarations function name must - * be an Identifer (excludes reserved words). For setter/getter + * be an Identifier (excludes reserved words). For setter/getter * it is a PropertyName which allows reserved words and also * strings and numbers (e.g. "{ get 1() { ... } }"). * @@ -72578,7 +72578,7 @@ DUK_LOCAL void duk__parse_func_like_raw(duk_compiler_ctx *comp_ctx, duk_small_ui * Formal argument list * * We don't check for prohibited names or for duplicate argument - * names here, becase we don't yet know whether the function will + * names here, because we don't yet know whether the function will * be strict. Function body parsing handles this retroactively. */ @@ -74683,7 +74683,7 @@ DUK_LOCAL duk_small_uint_t duk__handle_return(duk_hthread *thr, duk_activation * * Current approach is to capture the 'thr' return value and store * a reference to 'thr' in the caller value stack temporarily. This * keeps 'thr' reachable until final yield/return handling which - * removes the references atomatically. + * removes the references automatically. */ DUK_ASSERT(thr->valstack_top - 1 >= thr->valstack_bottom); @@ -75711,7 +75711,7 @@ DUK_LOCAL duk_bool_t duk__executor_handle_call(duk_hthread *thr, duk_idx_t idx, * Other function calls are handled using duk_handle_call(), increasing * C recursion depth. * - * Abrupt completions (= long control tranfers) are handled either + * Abrupt completions (= long control transfers) are handled either * directly by reconfiguring relevant stacks and restarting execution, * or via a longjmp. Longjmp-free handling is preferable for performance * (especially Emscripten performance), and is used for: break, continue, @@ -81582,7 +81582,7 @@ duk_bool_t duk_js_declvar_activation(duk_hthread *thr, * going forward to e.g. support chunked streaming of source from flash. * * Decodes UTF-8/CESU-8 leniently with support for code points from U+0000 to - * U+10FFFF, causing an error if the input is unparseable. Leniency means: + * U+10FFFF, causing an error if the input is unparsable. Leniency means: * * * Unicode code point validation is intentionally not performed, * except to check that the codepoint does not exceed 0x10ffff. @@ -86463,7 +86463,7 @@ DUK_LOCAL duk_uint32_t duk__append_jump_offset(duk_re_compiler_ctx *re_ctx, duk_ * codepoints are generated in sequence, and when the output codepoints are * continuous (CP, CP+1, CP+2, ...), they are merged locally into as large a * range as possible. A small canonicalization bitmap is used to reduce - * actual codepoint canonicalizations which are quite slow at present. The + * actual codepoint canonicalization which are quite slow at present. The * bitmap provides a "codepoint block is continuous with respect to * canonicalization" for N-codepoint blocks. This allows blocks to be * skipped quickly. diff --git a/src/libs/zbxmedia/email.c b/src/libs/zbxmedia/email.c index 9e5664f2e9b..323253b93b1 100644 --- a/src/libs/zbxmedia/email.c +++ b/src/libs/zbxmedia/email.c @@ -131,7 +131,7 @@ static int smtp_readln(zbx_socket_t *s, const char **buf) * Parameters: mailbox - [IN] a null-terminated UTF-8 string * * error - [IN] pointer to string for reporting errors * * max_error_len - [IN] size of 'error' string * - * mailaddrs - [OUT] array of mail adresses * + * mailaddrs - [OUT] array of mail addresses * * * * Comments: The function is very much simplified in comparison with full * * RFC 5322-compliant parser. It does not recognize: * diff --git a/src/libs/zbxnix/dshm.c b/src/libs/zbxnix/dshm.c index 7aa3981f7bd..73607245442 100644 --- a/src/libs/zbxnix/dshm.c +++ b/src/libs/zbxnix/dshm.c @@ -30,7 +30,7 @@ extern char *CONFIG_FILE; * Purpose: creates dynamic shared memory segment * * * * Parameters: shm - [OUT] the dynamic shared memory data * - * shm_size - [IN] the inital size (can be 0) * + * shm_size - [IN] the initial size (can be 0) * * mutex - [IN] the name of mutex used to synchronize memory * * access * * copy_func - [IN] the function used to copy shared memory * @@ -147,7 +147,7 @@ void zbx_dshm_unlock(zbx_dshm_t *shm) * * * Return value: SUCCEED - the local reference to dynamic shared memory * * segment was validated successfully and contains * - * corret dynamic shared memory segment address * + * correct dynamic shared memory segment address * * FAIL - otherwise. The errmsg contains error message and * * must be freed by the caller. * * * diff --git a/src/libs/zbxprometheus/zbxprometheus.c b/src/libs/zbxprometheus/zbxprometheus.c index 2390fcec2e0..72330cb74ca 100644 --- a/src/libs/zbxprometheus/zbxprometheus.c +++ b/src/libs/zbxprometheus/zbxprometheus.c @@ -756,7 +756,7 @@ static int prometheus_filter_parse_labels(zbx_prometheus_filter_t *filter, const * * * Function: prometheus_filter_init * * * - * Purpose: intializes prometheus pattern filter from the specified data * + * Purpose: initializes prometheus pattern filter from the specified data * * * * Parameters: filter - [IN/OUT] the filter * * data - [IN] the filter data * diff --git a/src/libs/zbxserver/expression.c b/src/libs/zbxserver/expression.c index 8c1cd12673e..033bfeef54e 100644 --- a/src/libs/zbxserver/expression.c +++ b/src/libs/zbxserver/expression.c @@ -5439,7 +5439,7 @@ static void process_user_macro_token(char **data, zbx_token_t *token, const stru * Purpose: substitute lld macros in function macro parameters * * * * Parameters: data - [IN/OUT] pointer to a buffer * - * token - [IN/OUT] the token with funciton macro location data * + * token - [IN/OUT] the token with function macro location data * * jp_row - [IN] discovery data * * error - [OUT] error message * * max_error_len - [IN] the size of error buffer * diff --git a/src/libs/zbxsysinfo/win32/net.c b/src/libs/zbxsysinfo/win32/net.c index 40ef8ce696a..59baabcb1dd 100644 --- a/src/libs/zbxsysinfo/win32/net.c +++ b/src/libs/zbxsysinfo/win32/net.c @@ -24,12 +24,12 @@ /* __stdcall calling convention is used for GetIfEntry2(). In order to declare a */ /* pointer to GetIfEntry2() we have to expand NETIOPAPI_API macro manually since */ -/* part of it must be toghether with the pointer name in the parentheses. */ +/* part of it must be together with the pointer name in the parentheses. */ typedef NETIO_STATUS (NETIOAPI_API_ *pGetIfEntry2_t)(PMIB_IF_ROW2 Row); /* GetIfEntry2() is available since Windows Vista and Windows Server 2008. In */ /* earlier Windows releases this pointer remains set to NULL and GetIfEntry() is */ -/* used dirrectly instead. */ +/* used directly instead. */ static pGetIfEntry2_t pGetIfEntry2 = NULL; /* GetIfEntry2() and GetIfEntry() work with different MIB interface structures. */ diff --git a/src/libs/zbxsysinfo/win32/wmi.cpp b/src/libs/zbxsysinfo/win32/wmi.cpp index 93575fd9005..e5fe81bd742 100644 --- a/src/libs/zbxsysinfo/win32/wmi.cpp +++ b/src/libs/zbxsysinfo/win32/wmi.cpp @@ -82,7 +82,7 @@ extern "C" void zbx_co_uninitialize() * vtProp [OUT] - pointer to memory for the queried value * * * * Return value: SYSINFO_RET_OK - *vtProp contains the retrieved WMI value * - * SYSINFO_RET_FAIL - retreiving WMI value failed * + * SYSINFO_RET_FAIL - retrieving WMI value failed * * * * Comments: *vtProp must be initialized with VariantInit(), * * wmi_* must not be NULL. The callers must convert value to the * diff --git a/src/zabbix_agent/procstat.c b/src/zabbix_agent/procstat.c index 842648dd991..ce53f6da25b 100644 --- a/src/zabbix_agent/procstat.c +++ b/src/zabbix_agent/procstat.c @@ -350,7 +350,7 @@ static size_t procstat_strdup(void *base, const char *str) * other process. * * * * Comments: This function logs critical error and exits in the case of * - * shared memory segement operation failure. * + * shared memory segment operation failure. * * * ******************************************************************************/ static void procstat_reattach(void) diff --git a/src/zabbix_server/alerter/alert_manager.c b/src/zabbix_server/alerter/alert_manager.c index a99f862fb5d..02fe8e6cbd5 100644 --- a/src/zabbix_server/alerter/alert_manager.c +++ b/src/zabbix_server/alerter/alert_manager.c @@ -457,7 +457,7 @@ static zbx_am_mediatype_t *am_pop_mediatype(zbx_am_t *manager) * * * Function: am_release_mediatype * * * - * Purpose: releses media type, removing it if necessary * + * Purpose: releases media type, removing it if necessary * * * * Parameters: manager - [IN] the alert manager * * alert - [IN] the alert pool * diff --git a/src/zabbix_server/httppoller/httpmacro.c b/src/zabbix_server/httppoller/httpmacro.c index cfe38143183..5887368eb9b 100644 --- a/src/zabbix_server/httppoller/httpmacro.c +++ b/src/zabbix_server/httppoller/httpmacro.c @@ -69,7 +69,7 @@ static int httpmacro_cmp_func(const void *d1, const void *d2) * data - [IN] the data for regexp matching (optional) * * err_str - [OUT] the error message (optional) * * * - * Return value: SUCCEDED - the key/value pair was added successfully * + * Return value: SUCCEEDED - the key/value pair was added successfully * * FAIL - key/value pair adding to cache failed. * * The failure reason can be either empty key/value, * * wrong key format or failed regular expression * diff --git a/src/zabbix_server/preprocessor/item_preproc.c b/src/zabbix_server/preprocessor/item_preproc.c index 571841cc49c..5c4f00d4a5d 100644 --- a/src/zabbix_server/preprocessor/item_preproc.c +++ b/src/zabbix_server/preprocessor/item_preproc.c @@ -369,7 +369,7 @@ static int item_preproc_delta_uint64(zbx_variant_t *value, const zbx_timespec_t * value - [IN/OUT] the value to process * * ts - [IN] the value timestamp * * op_type - [IN] the operation type * - * history_value - [IN/OUT] the historical (previuous) data * + * history_value - [IN/OUT] the historical (previous) data * * history_ts - [IN/OUT] the timestamp of the historical data * * errmsg - [OUT] error message * * * diff --git a/src/zabbix_server/preprocessor/linked_list.c b/src/zabbix_server/preprocessor/linked_list.c index cfbf45b9db1..bfaa1cb8db0 100644 --- a/src/zabbix_server/preprocessor/linked_list.c +++ b/src/zabbix_server/preprocessor/linked_list.c @@ -301,7 +301,7 @@ void zbx_list_iterator_clear(zbx_list_iterator_t *iterator) * iterator2 - [IN] second list iterator * * * * Return value: SUCCEED is returned if both iterator point at the same item, * - * FAIL otheriwse. * + * FAIL otherwise. * * * ******************************************************************************/ int zbx_list_iterator_equal(const zbx_list_iterator_t *iterator1, const zbx_list_iterator_t *iterator2) diff --git a/src/zabbix_server/timer/timer.c b/src/zabbix_server/timer/timer.c index b2ef1f5f0b9..3c07328f4ae 100644 --- a/src/zabbix_server/timer/timer.c +++ b/src/zabbix_server/timer/timer.c @@ -91,9 +91,9 @@ static void log_host_maintenance_update(const zbx_host_maintenance_diff_t* diff) if (0 != (diff->flags & ZBX_FLAG_HOST_MAINTENANCE_UPDATE_MAINTENANCE_TYPE) && 0 == maintenance_off) { - const char *desription[] = {"with data collection", "without data collection"}; + const char *description[] = {"with data collection", "without data collection"}; - zbx_snprintf_alloc(&msg, &msg_alloc, &msg_offset, " %s", desription[diff->maintenance_type]); + zbx_snprintf_alloc(&msg, &msg_alloc, &msg_offset, " %s", description[diff->maintenance_type]); } zabbix_log(LOG_LEVEL_DEBUG, "%s", msg); diff --git a/src/zabbix_server/vmware/vmware.c b/src/zabbix_server/vmware/vmware.c index d828703ef30..963f9300c56 100644 --- a/src/zabbix_server/vmware/vmware.c +++ b/src/zabbix_server/vmware/vmware.c @@ -177,8 +177,8 @@ ZBX_VECTOR_IMPL(id_xmlnode, zbx_id_xmlnode_t) */ #define ZBX_XML_HEADER1 "Soapaction:urn:vim25/4.1" #define ZBX_XML_HEADER2 "Content-Type:text/xml; charset=utf-8" -/* cURL specific atribute to prevent the use of "Expect" derective */ -/* acording RFC 7231/5.1.1 if xml request with a size is large than 1k */ +/* cURL specific attribute to prevent the use of "Expect" derective */ +/* according RFC 7231/5.1.1 if xml request with a size is large than 1k */ #define ZBX_XML_HEADER3 "Expect:" #define ZBX_POST_VSPHERE_HEADER \ @@ -1010,7 +1010,7 @@ static void vmware_data_shared_free(zbx_vmware_data_t *data) * * * Function: vmware_shared_perf_entity_clean * * * - * Purpose: cleans resources allocated by vmware peformance entity in vmware * + * Purpose: cleans resources allocated by vmware performance entity in vmware * * cache * * * * Parameters: entity - [IN] the entity to free * @@ -1813,7 +1813,7 @@ static void zbx_property_collection_free(zbx_property_collection_iter *iter) * error - [OUT] the error message in the case of failure * * * * Return value: SUCCEED - the contents were retrieved successfully * - * FAIL - the content retrieval faield * + * FAIL - the content retrieval failed * * * ******************************************************************************/ static int vmware_service_get_contents(CURL *easyhandle, char **version, char **fullname, char **error) diff --git a/templates/db/postgresql/README.md b/templates/db/postgresql/README.md index a63574c97b5..d3222b4a0f2 100644 --- a/templates/db/postgresql/README.md +++ b/templates/db/postgresql/README.md @@ -4,7 +4,7 @@ ## Overview Templates to monitor PostgreSQL by Zabbix.\ -This template was tested on Zabbix 4.2.1 and PostgreSQL vesions 9.6, 10 and 11 on Linux and Windows. +This template was tested on Zabbix 4.2.1 and PostgreSQL versions 9.6, 10 and 11 on Linux and Windows. ## Setup @@ -184,7 +184,7 @@ There are no template links in this template. | PostgreSQL: Service has been restarted (uptime < 10m) | Info | pgsql.uptime.last() < 10m | PostgreSQL uptime is less than 10 minutes | | | PostgreSQL: Cache hit ratio too low (under {$PG.CACHE_HITRATIO.MIN.WARN} in 5m) | Warning | pgsql.cache.hit.max(5m) < {$PG.CACHE_HITRATIO.MIN.WARN} | | | | PostgreSQL: Total number of connections is too high (over {$PG.CONN_TOTAL_PCT.MAX.WARN} in 5m) | Average | pgsql.connections.sum.total_pct.min(5m) > {$PG.CONN_TOTAL_PCT.MAX.WARN} | | | -| Database {#DBNAME}: Deadlock occured (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m) | High | pgsql.dbstat.deadlocks["{#DBNAME}"].min(5m) > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} | | | +| Database {#DBNAME}: Deadlock occurred (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m) | High | pgsql.dbstat.deadlocks["{#DBNAME}"].min(5m) > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} | | | | PostgreSQL: Too many recovery conflicts (over {$PG.CONFLICTS.MAX.WARN} in 5m) | Average | pgsql.dbstat.sum.conflicts.min(5m) > {$PG.CONFLICTS.MAX.WARN} | The primary and standby servers are in many ways loosely connected. Actions on the primary will have an effect on the standby. As a result, there is potential for negative interactions or conflicts between them. https://www.postgresql.org/docs/current/hot-standby.html#HOT-STANDBY-CONFLICT | | | PostgreSQL: Streaming lag is too high (over {$PG.REPL_LAG.MAX.WARN} in 5m) | Average | pgsql.streaming.lag.sec.min(5m) > {$PG.REPL_LAG.MAX.WARN} | | | | PostgreSQL: Configuration has changed | Info | pgsql.config.diff() = 1 and pgsql.config.strlen() > 0 | | | diff --git a/templates/db/postgresql/template_db_postgresql.xml b/templates/db/postgresql/template_db_postgresql.xml index fdfb33ac40a..aa7cfba3918 100644 --- a/templates/db/postgresql/template_db_postgresql.xml +++ b/templates/db/postgresql/template_db_postgresql.xml @@ -4899,7 +4899,7 @@ https://www.postgresql.org/docs/current/routine-vacuuming.html#VACUUM-FOR-WRAPAR <expression>{Template DB PostgreSQL:pgsql.dbstat.deadlocks.rate["{#DBNAME}"].min(5m)} > {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"}</expression> <recovery_mode>0</recovery_mode> <recovery_expression/> - <name>Database {#DBNAME}: Deadlock occured (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m)</name> + <name>Database {#DBNAME}: Deadlock occurred (over {$PG.DEADLOCKS.MAX.WARN:"{#DBNAME}"} in 5m)</name> <correlation_mode>0</correlation_mode> <correlation_tag/> <url/> diff --git a/templates/net/template_net_brocade_foundry_sw_SNMPv2_EN.xml b/templates/net/template_net_brocade_foundry_sw_SNMPv2_EN.xml index 9be60cb2703..7c8316113f0 100644 --- a/templates/net/template_net_brocade_foundry_sw_SNMPv2_EN.xml +++ b/templates/net/template_net_brocade_foundry_sw_SNMPv2_EN.xml @@ -700,7 +700,7 @@ This trigger uses temperature sensor values as well as temperature sensor status <privatekey/> <port/> <description>MIB: FOUNDRY-SN-AGENT-MIB -Temperature of the chassis. Each unit is 0.5 degrees Celcius. +Temperature of the chassis. Each unit is 0.5 degrees Celsius. Only management module built with temperature sensor hardware is applicable. For those non-applicable management module, it returns no-such-name.</description> <inventory_link>0</inventory_link> diff --git a/templates/net/template_net_tplink_SNMPv2_EN.xml b/templates/net/template_net_tplink_SNMPv2_EN.xml index 145ed5be26d..32441a0275e 100644 --- a/templates/net/template_net_tplink_SNMPv2_EN.xml +++ b/templates/net/template_net_tplink_SNMPv2_EN.xml @@ -19,7 +19,7 @@ MIBs used: TPLINK-SYSINFO-MIB TPLINK-SYSMONITOR-MIB Known Issues: -description : default sysLocation, sysName and sysContact is not filled with proper data. Real hostname and location can be found only in private branch(TPLINK-SYSINFO-MIB). Please check whether this problem exists in the latest firware: http://www.tp-linkru.com/download/T2600G-28TS.html#Firmware +description : default sysLocation, sysName and sysContact is not filled with proper data. Real hostname and location can be found only in private branch(TPLINK-SYSINFO-MIB). Please check whether this problem exists in the latest firmware: http://www.tp-linkru.com/download/T2600G-28TS.html#Firmware version : 2.0.0 Build 20170628 Rel.55184(Beta) device : T2600G-28TS 2.0 description : The Serial number of the product(tpSysInfoSerialNum) is missing in HW versions prior to V2_170323 diff --git a/templates/server/template_server_dell_idrac_SNMPv2_EN.xml b/templates/server/template_server_dell_idrac_SNMPv2_EN.xml index f710c031ee1..4ed94cd262a 100644 --- a/templates/server/template_server_dell_idrac_SNMPv2_EN.xml +++ b/templates/server/template_server_dell_idrac_SNMPv2_EN.xml @@ -1738,7 +1738,7 @@ Possible states: 1: The current state could not be determined. 2: The virtual disk is operating normally or optimally. 3: The virtual disk has encountered a failure. The data on disk is lost or is about to be lost. -4: The virtual disk encounterd a failure with one or all of the constituent redundant physical disks. +4: The virtual disk encountered a failure with one or all of the constituent redundant physical disks. The data on the virtual disk might no longer be fault tolerant.</description> <inventory_link>0</inventory_link> <applications> diff --git a/tests/libs/zbxcommon/zbx_token_find.yaml b/tests/libs/zbxcommon/zbx_token_find.yaml index fe391c20c3d..5488ef53bdf 100644 --- a/tests/libs/zbxcommon/zbx_token_find.yaml +++ b/tests/libs/zbxcommon/zbx_token_find.yaml @@ -222,7 +222,7 @@ out: name: 'VALUE' return: 'SUCCEED' --- -test case: "LLD function macro missing openning bracket" +test case: "LLD function macro missing opening bracket" in: expression: '{{#VALUE}.regsub^[0-9]+, Problem)}' out: diff --git a/tests/libs/zbxdbcache/zbx_vc_add_values.yaml b/tests/libs/zbxdbcache/zbx_vc_add_values.yaml index 6fcc2266e15..139e6c8d607 100644 --- a/tests/libs/zbxdbcache/zbx_vc_add_values.yaml +++ b/tests/libs/zbxdbcache/zbx_vc_add_values.yaml @@ -815,7 +815,7 @@ out: --- # TC14 # Test that value cache is switched to low memory mode if value adding failed. -test case: Try adding value wihout enough space in cache +test case: Try adding value without enough space in cache in: history: [] precache: diff --git a/tests/libs/zbxdbcache/zbx_vc_get_values.yaml b/tests/libs/zbxdbcache/zbx_vc_get_values.yaml index 9def6a4b7e1..f18d13b3c2c 100644 --- a/tests/libs/zbxdbcache/zbx_vc_get_values.yaml +++ b/tests/libs/zbxdbcache/zbx_vc_get_values.yaml @@ -2563,7 +2563,7 @@ out: misses: 1 --- # TC45 -# Test that values withing the interval end second but not matching nanoseconds are not returned */ +# Test that values within the interval end second but not matching nanoseconds are not returned */ test case: Get 1 value during interval when using nanoseconds in end time (2) include: &include zbx_vc_get_values.inc.yaml in: @@ -2611,7 +2611,7 @@ out: misses: 1 --- # TC46 -# Test that values withing the interval end second but not matching nanoseconds are not returned */ +# Test that values within the interval end second but not matching nanoseconds are not returned */ test case: Get 10 values during interval when using nanoseconds in end time include: &include zbx_vc_get_values.inc.yaml in: diff --git a/tests/libs/zbxprometheus/prometheus_filter_init.yaml b/tests/libs/zbxprometheus/prometheus_filter_init.yaml index 94606ce23b5..eae93b0715f 100644 --- a/tests/libs/zbxprometheus/prometheus_filter_init.yaml +++ b/tests/libs/zbxprometheus/prometheus_filter_init.yaml @@ -56,16 +56,16 @@ out: pattern: 1 op: == --- -test case: 'cpu{decription="CPU \"Intel\""}' +test case: 'cpu{description="CPU \"Intel\""}' in: - filter: 'cpu{decription=~"CPU \"Intel\""}' + filter: 'cpu{description=~"CPU \"Intel\""}' out: return: SUCCEED metric: pattern: cpu op: = labels: - - key: decription + - key: description pattern: CPU "Intel" op: =~ --- |