Bug #57056 agent upd.inst doesn't add new 'items-mysql-cluster.xml' to 'agent-item-files'

Description:
The agent update installer does not add the new

  share/mysql-monitor-agent/items/items-mysql-cluster.xml

to 'agent-item-files' in the mysql-monitor-agent.ini file.

How to repeat:
compare mysql-monitor-agent.ini between updated and fresh install:

# on net-qa1
agents.sh stop 2 s
agents.sh uninstall 2 rm
UPD=2.2.2.1729
VER=2.3.0.2025
# install old and update
INSTALLDIR_UPD=/data0/merlin/agent/${UPD}/rhel4-x86-32bit/net-qa1
/nfstmp2/merlin/packages/${UPD}/agents/mysqlmonitoragent-${UPD}-linux-glibc2.3-x86-32bit-installer.bin --installdir ${INSTALLDIR_UPD}  --mysqlhost 127.0.0.1 --mysqlport 43300 --mysqluser agent --mysqlpassword mysql --checkmysqlhost yes --managerhost 127.0.0.1 --managerport 48080 --agentuser pino --agentpassword pino --proxyport 44044 --enableproxy 1 --createaccount 0 --mode unattended
cp -pr ${INSTALLDIR_UPD}/etc ${INSTALLDIR_UPD}/etc.${UPD}
/nfstmp2/merlin/packages/${VER}/agents/mysqlmonitoragent-${VER}-linux-glibc2.3-x86-32bit-update-installer.bin --installdir ${INSTALLDIR_UPD} --enableproxy 1 --enableaggregator 1 --aggregatorport 44046 --aggregatorsslport 44047 --createBackup 1 --backupdir ${INSTALLDIR_UPD}/backup_${VER} --restartImmediately 0 --mode unattended
# install fresh
INSTALLDIR_FULL=/data0/merlin/agent/${VER}/rhel4-x86-32bit/net-qa1
/nfstmp2/merlin/packages/${VER}/agents/mysqlmonitoragent-${VER}-linux-glibc2.3-x86-32bit-installer.bin --installdir ${INSTALLDIR_FULL} --mysqlhost 127.0.0.1 --mysqlport 43300 --mysqluser agent --mysqlpassword mysql --checkmysqlhost yes --managerhost 127.0.0.1 --managerport 48080 --agentuser pino --agentpassword pino --proxyport 44044 --mode unattended --enableproxy 1 --enableaggregator 1 --aggregatorport 44046 --aggregatorsslport 44047 --createaccount 0
# compare installed INIs
diff ${INSTALLDIR_UPD}/etc/mysql-monitor-agent.ini ${INSTALLDIR_FULL}/etc/mysql-monitor-agent.ini

Andy Bang writes: 
We have added a new items file that should be included in the agent-item-files parameter in the mysql-monitor-agent..ini file. You will see this included in the INI file template in source control (as share/mysql-monitor-agent/items/items-mysql-cluster.xml), so it gets included on a full install. It needs to be added during an upgrade install.

Patch sent to Andy

Andy Bang writes: 
In build 2.3.0.2027.

Carsten Segieth writes: 
Tested with 2.3.0.2028 the position of "items-mysql-cluster.xml" differs between a full install and an update. In case of update it's appended to the end of the string, but in a full install it is the 2nd last one and "custom.xml" is the last entry:

  # full install 2.3.0.2028
  agent-item-files = share/mysql-monitor-agent/items/quan.lua,share/mysql-monitor-agent/items/items-mysql-monitor.xml,share/mysql-monitor-agent/items/items-mysql-cluster.xml,share/mysql-monitor-agent/items/custom.xml

  # updated from 2.2.2 to 2.3.0.2028
  agent-item-files = share/mysql-monitor-agent/items/quan.lua,share/mysql-monitor-agent/items/items-mysql-monitor.xml,share/mysql-monitor-agent/items/custom.xml,share/mysql-monitor-agent/items/items-mysql-cluster.xml

Jan said, that the order of the entries in 'agent-item-files' is relevant in case there are duplicate rules ("last one wins", "it may be harmless, but as a rule of thumb: custom.xml should be last, otherwise custom.xml doesn't overwrite our rules").

So please change the logic to insert the new part before "custom.xml".

Patch sent to Andy

- OK in 2.3.0.2030 for the "non-Win platforms
- waiting now for the next Win agent before closing this bug

Andy Bang writes: 
In build 2.3.0.2030.

Carsten Segieth writes: 
Win agent 2.3.0.2033 tested also OK