note that description texts SHOULD NOT BE CHANGED at this time, even when they miss some detail - all of them should be reviewed and updated at once to reduce the amount of work translators have to do

decisions to be made (updated after discussing with maartinjsh) :

• log/logrt items - regexp or pattern ? -> regexp
• logrt - probably file_pattern instead of file_format. maybe even file_regexp ? -> file_regexp
• ordering - shorter or longer key first ? (probably shortest) -> shortest
• swap items - device or swap ? swap could be on a file... -> but even swap file sometimes is said to be swap device -> device
• system.swap.size is the only swap item to use "mode" instead of "type", and that is also different from the manual. seems to be a simple mistake -> should be changed to "type"
• eventlog - name or logtype ? -> name

zabbix 1.8 is not supported anymore, so this should be fixed in 2.0 and up (primarily because system.localtime is missing the param completely)

• fixed for 2.0 in svn://svn.zabbix.com/branches/dev/ZBX-9168; to minimise changes in this branch, only incorrect item keys were changed
• fixed for 2.2 in svn://svn.zabbix.com/branches/dev/ZBX-9168-2.2

(1) In 2.0 branch, some agent keys are missing in the item helper:

• agent.hostname
• net.udp.listen[port]
• sensor[device,sensor,<mode>]
• services[<type>,<state>,<exclude>]

asaveljevs Not sure what "incorrect item keys" means. Therefore, listing differences that are still present between 2.0 manual at https://www.zabbix.com/documentation/2.0/manual/config/items/itemtypes/zabbix_agent and https://www.zabbix.com/documentation/2.0/manual/config/items/itemtypes/zabbix_agent/win_keys, and item helper:

<richlv> missing item keys added in r51550; only "description" column from the manual was used to keep things simpler for 2.0.

"incorrect item keys" was meant to be keys that don't just use a different word to refer to a specific parameter (like "regexp" vs "pattern"), but keys that omitted the fact that item key had any parameters at all, for example.

from the above list, all of the differences seem to be in how item key parameters are denoted/named - to keep the number of changes to 2.0 low, it is proposed not to modify key parameters for this branch.

RESOLVED

asaveljevs CLOSED

(2) Some lines in the 2.0 diff go like this:

-ROW   |7       |system.cpu.num ...
+ROW   |7       |system.cpu.num[<type>] ...

HTML entities should probably be used instead of raw angle brackets:

+ROW   |7       |system.cpu.num[<type>] ...

<richlv> ouch, sorry about that. should be fixed in r51549.
RESOLVED

asaveljevs CLOSED

(3) in 2.2 branch, the following keys are missing :

• sensor[device,sensor,<mode>]
• services[<type>,<state>,<exclude>]

adding these would also add translatable strings, thus it is proposed to postpone this until all item descriptions are unified in item pages (ZBX-8811)

asaveljevs Fixing description for items like "system.swap.size[device,type]", where description still refers to the old "swap" and "mode", will have to be postponed until ZBX-8811, too, it seems. CLOSED.

(4) asterisk (*) was changed to "service" in service_state key parameters in :

• https://www.zabbix.com/documentation/1.8/manual/config/items
• https://www.zabbix.com/documentation/2.0/manual/config/items/itemtypes/zabbix_agent/win_keys
• https://www.zabbix.com/documentation/2.2/manual/config/items/itemtypes/zabbix_agent/win_keys
• https://www.zabbix.com/documentation/2.4/manual/config/items/itemtypes/zabbix_agent/win_keys
• https://www.zabbix.com/documentation/3.0/manual/config/items/itemtypes/zabbix_agent/win_keys

RESOLVED

asaveljevs CLOSED

merged to 2.0 in r51594, 2.2 in r51599, 2.4 in r51600, trunk in r51604.

(5) no translation changes

asaveljevs Until r51604, everything is good, but see (7). CLOSED.

<richlv> it was decided not to change anything in (7), still no changed strings, remains CLOSED

(6) conflicts were resolved when merging to 2.4 (net.tcp.service and net.tcp.service.perf keys) and trunk (net.dns and net.dns.record keys) - a quick check on that would be appreciated

asaveljevs CLOSED

(7) In 2.2 and above, descriptions of passive and active versions of net.tcp.service[] differ. Unifying them would remove one translatable string.

<richlv> it was discovered that actually the difference is between agent & simple check descriptions, and those indeed are slightly different -> nothing to change, CLOSED