Update to 4.4.1
This commit is contained in:
parent
b0ec57cffc
commit
6bf4559bd5
20
WAPT/control
20
WAPT/control
|
@ -1,9 +1,11 @@
|
||||||
package : fws-zabbix-agent
|
package : fws-zabbix-agent
|
||||||
version : 4.2.1-3
|
version : 4.4.1-4
|
||||||
architecture : all
|
architecture : all
|
||||||
section : base
|
section : base
|
||||||
priority : optional
|
priority : optional
|
||||||
maintainer : Florent Heuze <heuzef@firewall-services.com>
|
name :
|
||||||
|
categories :
|
||||||
|
maintainer : Daniel Berteaud <daniel@firewall-services.com>
|
||||||
description : Zabbix Monitoring Agent
|
description : Zabbix Monitoring Agent
|
||||||
depends :
|
depends :
|
||||||
conflicts :
|
conflicts :
|
||||||
|
@ -25,8 +27,12 @@ editor : Zabbix SIA
|
||||||
keywords : monitoring, zabbix, agent
|
keywords : monitoring, zabbix, agent
|
||||||
licence :
|
licence :
|
||||||
homepage : https://zabbix.com
|
homepage : https://zabbix.com
|
||||||
package_uuid :
|
package_uuid : e4bcc94a-446e-492c-b58a-9f673350226c
|
||||||
signer : Florent Heuze
|
valid_from :
|
||||||
signer_fingerprint:
|
valid_until :
|
||||||
signature_date :
|
forced_install_on :
|
||||||
signed_attributes :
|
signer : Daniel Berteaud
|
||||||
|
signer_fingerprint: 3c9415559e2dedbc4390e3faa2c28d3b67265baa5b35902d2764d9e41c3b3f0a
|
||||||
|
signature : QhHtyL/PwAT8OW1xdOh7IOXdt3YCtnFUMTGeEYpkohLjmw9hPR4QAWhxjRvew/49nYBXfXx6cK6zrMDRhw4kHiTXcCLFNmrQAOg/xo5OmNzehvPoEvE0pzXkBUyI+F+IS0Qmi9Nc16A4jr4wpvCYB51DdXtk8E/o8PAr3Khx3flNgeXC5YE6n2YY8tviHwFENll4KzoNNZgpaIvzxWdiHMLfh2yPGARZ4dW0VA0IS1V0jHtfXLxL+5AKoSFRx5muyWWFeBwEyU7zeDkgQtb4Bed6fMoSK8y122pL6/F94jkmPzHwtXIup2DTsoWYxJcNBX/2NCOo664yRBvkrzqo6Q==
|
||||||
|
signature_date : 2019-11-05T12:11:50.737000
|
||||||
|
signed_attributes : package,version,architecture,section,priority,name,categories,maintainer,description,depends,conflicts,maturity,locale,target_os,min_os_version,max_os_version,min_wapt_version,sources,installed_size,impacted_process,description_fr,description_pl,description_de,description_es,audit_schedule,editor,keywords,licence,homepage,package_uuid,valid_from,valid_until,forced_install_on,signer,signer_fingerprint,signature_date,signed_attributes
|
53
setup.py
53
setup.py
|
@ -21,16 +21,31 @@ props = {
|
||||||
|
|
||||||
def install():
|
def install():
|
||||||
version = control['version'].split('-',1)[0]
|
version = control['version'].split('-',1)[0]
|
||||||
print('Installing Zabbix Agent version ' + version)
|
|
||||||
|
# Remove previous version from suiviperf, if present
|
||||||
|
print('Checking old Zabbix Agent version...')
|
||||||
|
old_agent = installed_softwares('{65BE9C8D-BE1D-4AEA-A144-9F52D57A3D12}')
|
||||||
|
for uninstall in old_agent:
|
||||||
|
if Version(uninstall['version'].split('.',1)[0]) < Version(version) :
|
||||||
|
if Version(uninstall['version']) < Version(version):
|
||||||
|
killalltasks(['zabbix_agentd.exe'])
|
||||||
|
print('Uninstalling previous version %s' % uninstall['version'])
|
||||||
|
cmd = uninstall_cmd(uninstall['key'])
|
||||||
|
run_notfatal(cmd)
|
||||||
|
|
||||||
|
print('Installing Zabbix Agent version %s' % version)
|
||||||
|
|
||||||
if iswin64():
|
if iswin64():
|
||||||
install_msi_if_needed('zabbix_agent-%s_x64.msi' % version,killbefore=['zabbix_agentd.exe'],properties=props,remove_old_version=True)
|
msi = 'zabbix_agent-%s-win-amd64-openssl.msi' % version
|
||||||
else:
|
else:
|
||||||
install_msi_if_needed('zabbix_agent-%s_x86.msi' % version,killbefore=['zabbix_agentd.exe'],properties=props,remove_old_version=True)
|
msi = 'zabbix_agent-%s-win-i386-openssl.msi' % version
|
||||||
|
|
||||||
|
install_msi_if_needed(msi,killbefore=['zabbix_agentd.exe'],properties=props,remove_old_version=True)
|
||||||
|
|
||||||
print('Opening port 10050 in the firewall')
|
print('Opening port 10050 in the firewall')
|
||||||
# Remove the previous rule if it existed. We don't mind the return code as the rule might not exist
|
# Remove the previous rule if it existed. We don't mind the return code as the rule might not exist
|
||||||
run_notfatal('netsh advfirewall firewall del rule name="Zabbix Agent"')
|
run_notfatal('netsh advfirewall firewall del rule name="Zabbix Agent"')
|
||||||
|
|
||||||
# And add a new one
|
# And add a new one
|
||||||
run('netsh advfirewall firewall add rule name="Zabbix Agent" dir=in action=allow protocol=TCP localport=10050 enable=yes remoteip=%s' % (','.join(variables['zabbix_servers'])))
|
run('netsh advfirewall firewall add rule name="Zabbix Agent" dir=in action=allow protocol=TCP localport=10050 enable=yes remoteip=%s' % (','.join(variables['zabbix_servers'])))
|
||||||
|
|
||||||
|
@ -41,22 +56,26 @@ def uninstall():
|
||||||
def update_package():
|
def update_package():
|
||||||
import requests, re
|
import requests, re
|
||||||
from waptpackage import PackageEntry
|
from waptpackage import PackageEntry
|
||||||
print('Updating Zabbix Agent package')
|
|
||||||
page = requests.get('https://www.suiviperf.com/zabbix/',headers={'User-Agent':'Mozilla/5.0 (Windows NT 6.1; Win64; x64)'}).text
|
|
||||||
version = re.search('zabbix_agent-(\d+(\.\d+)*)_x64.msi', page).group(1)
|
|
||||||
for arch in ['86', '64']:
|
|
||||||
if not isfile('zabbix_agent-%s_x%s.msi' % (version, arch)):
|
|
||||||
filename ='zabbix_agent-%s_x%s.msi' % (version, arch)
|
|
||||||
url = 'http://www.suiviperf.com/zabbix/%s' % filename
|
|
||||||
print('Downloading %s from %s' % (filename, url))
|
|
||||||
wget(url, filename)
|
|
||||||
for old in glob.glob(r'zabbix_agent-*_x%s' % arch):
|
|
||||||
if not old == filename:
|
|
||||||
remove_file(old)
|
|
||||||
|
|
||||||
|
print('Checking latest agent version')
|
||||||
|
page = wgets('https://www.zabbix.com/download')
|
||||||
|
latest_version = re.search('"latest":"(\d+(\.\d+)*)"', page).group(1)
|
||||||
pe = PackageEntry()
|
pe = PackageEntry()
|
||||||
control = pe.load_control_from_wapt(os.getcwd())
|
control = pe.load_control_from_wapt(os.getcwd())
|
||||||
|
current_version = control['version'].split('-',1)[0]
|
||||||
|
|
||||||
if Version(version) > Version(control['version'].split('-',1)[0]):
|
if Version(latest_version) > Version(current_version):
|
||||||
pe.version = version + '-0'
|
print('Updating package from %s to %s' % (current_version, latest_version))
|
||||||
|
for arch in ['amd64', 'i386']:
|
||||||
|
filename ='zabbix_agent-%s-win-%s-openssl.msi' % (latest_version, arch)
|
||||||
|
if not isfile(filename):
|
||||||
|
url = 'https://www.zabbix.com/downloads/%s/%s' % (latest_version, filename)
|
||||||
|
print('Downloading %s from %s' % (filename, url))
|
||||||
|
wget(url, filename)
|
||||||
|
for old in glob.glob(r'zabbix_agent-*-win-%s-openssl.msi' % arch):
|
||||||
|
if not old == filename:
|
||||||
|
remove_file(old)
|
||||||
|
|
||||||
|
pe.version = latest_version + '-0'
|
||||||
|
pe.maturity = 'PREPROD'
|
||||||
pe.save_control_to_wapt(os.getcwd())
|
pe.save_control_to_wapt(os.getcwd())
|
||||||
|
|
BIN
zabbix_agent-4.0.1_x64.msi
(Stored with Git LFS)
BIN
zabbix_agent-4.0.1_x64.msi
(Stored with Git LFS)
Binary file not shown.
BIN
zabbix_agent-4.0.1_x86.msi
(Stored with Git LFS)
BIN
zabbix_agent-4.0.1_x86.msi
(Stored with Git LFS)
Binary file not shown.
BIN
zabbix_agent-4.2.1_x64.msi
(Stored with Git LFS)
BIN
zabbix_agent-4.2.1_x64.msi
(Stored with Git LFS)
Binary file not shown.
BIN
zabbix_agent-4.2.1_x86.msi
(Stored with Git LFS)
BIN
zabbix_agent-4.2.1_x86.msi
(Stored with Git LFS)
Binary file not shown.
BIN
zabbix_agent-4.4.1-win-amd64-openssl.msi
(Stored with Git LFS)
Normal file
BIN
zabbix_agent-4.4.1-win-amd64-openssl.msi
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
zabbix_agent-4.4.1-win-i386-openssl.msi
(Stored with Git LFS)
Normal file
BIN
zabbix_agent-4.4.1-win-i386-openssl.msi
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
Reference in New Issue
Block a user