fixed directly in 2.2 & trunk in revisions 46912 and 46914.

affected templates should be :

• Template JMX Tomcat
• Template OS FreeBSD
• Template OS HP-UX
• Template OS Linux
• Template OS OpenBSD

(1) to be documented in template change page at https://www.zabbix.com/documentation/2.2/manual/installation/template_changes

RESOLVED

asaveljevs The changes concern only "system.cpu.util[,nice]" item and the item you changed in 2.2 with hostid=10084 belongs to "Zabbix server" host, not "Template JMX Tomcat", which has hostid=10083. REOPENED.

<richlv>

svn diff -c 46914 svn://svn.zabbix.com/branches/2.2/create/src/data.tmpl | grep "Number of sessions we rejected due to maxActive bee*ing reached"

-ROW |23248 |16 | | |10083 |Number of sessions we rejected due to maxActive beeing reached   |jmx["Catalina:type=Manager,path=/,host=localhost",rejectedSessions]...
+ROW |23248 |16 | | |10083 |Number of sessions we rejected due to maxActive being reached   |jmx["Catalina:type=Manager,path=/,host=localhost",rejectedSessions]...

that shows a jmx item being changed, which should belong to the tomcat template. what am i missing here ?

asaveljevs Oh, it did not occur to me that r46914 touched 2.2 - I thought r46912 touched 2.2 and r46914 touched trunk only, so I was only doing "svn di -c ..." in their respective directories. I shall check once again.

asaveljevs Yes, now that I see that r46914 touched 2.2, too, it looks good. CLOSED.

(2) changed templates should be added at https://www.zabbix.org/wiki/Zabbix_Templates/Official_Templates
this should be done once 2.2.5 is out as there might be other changes to templates
<richlv> RESOLVED

asaveljevs Due to the mistake described in (1), "Template JMX Tomcat" should probably not be on the updated list. REOPENED.

asaveljevs As described in (1), my mistake. CLOSED.

(3) do we need changelog entry & info in upgrade notes ?

wiper wouldn't hurt to have changelog entry. Not sure if it's worth mentioning in upgrade notes.

<richlv> changelog entry added in r47430. for consistency also added in https://www.zabbix.com/documentation/2.2/manual/installation/upgrade_notes_225
RESOLVED

asaveljevs Same problem with "Template JMX Tomcat" as described in (1). REOPENED.

asaveljevs As described in (1), my mistake. CLOSED.

(4) For 2.2, file "data.tmpl" became misaligned. This is fixed in development branch svn://svn.zabbix.com/branches/dev/ZBX-8405 . It also fixes a couple of similar typos in frontends/php/include/classes/items/CHelpItems.php .

<richlv> thanks for the item typo fix - but it changes translatable strings in 2.2. do we want to do that ?

<richlv> as suggested by asaveljevs, msgid strings in the translations have been changed as well to preserve the existing translations in r51056. RESOLVED.

asaveljevs CLOSED

(5) For trunk, file "data.tmpl" became misaligned, too.

<richlv> fixed in trunk, r50712 (assuming no other changes required, separate dev branch did not seem to be that useful at this time)
RESOLVED

sasha Why it is commited under ZBX-954 (svn log messages)?

<richlv> thinking about typo fixes and messing things up, again. sorry, i'll stop touching anything until getting a couple of weeks of decent sleep :/

sasha I fixed svn log messages (r46912, r46914 and r50712)

asaveljevs r50712 by itself looks good, but it only fixes two items - items with IDs 22848, 22888, 22968, 23302 are still misaligned. Not sure whether you forgot these items or you wish to fix them when merging (4) from 2.2. REOPENED.

<richlv> hopefully fixed data.tmpl alignment for good in r50955 (at least my ad-hoc checking script does not find anything else) -> RESOLVED

asaveljevs Looks good. CLOSED.

subissues still open : 4, 5

merged to 2.2 in r51194, 2.4 in r51196, trunk in r51198.

(6) Not sure where it went wrong, but r51196 commits a misaligned row into "data.tmpl" in 2.4 for item ID 23248.

asaveljevs Similarly, the merge into trunk in r51198 introduces a misaligned row into "data.tmpl" for the same item.

<richlv> if i'm not mistaken, it looks like they changed how misalignment was distributed. likely reason - accidental local change in 2.4 branch that got merged further to trunk.
hopefully fixed in r51208 (same rev for 2.4 & trunk) -> RESOLVED

asaveljevs Seems good. CLOSED.

(7) ChangeLog entry is missing.

<richlv> assuming this was only about system.cpu.num item's description - added in r51247 for 2.2, 2.4 and trunk -> RESOLVED

sasha Thank you. CLOSED