Module: check_mk
Branch: master
Commit: 8a6aac008b15c0bf275d9a207bf978c35d4236d1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8a6aac008b15c0…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Oct 15 16:53:31 2014 +0200
now able to handle package code updates of vanilla and baked msi container
---
agents/windows/msibuild/msi-update | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update
index 667f9ae..811b73a 100755
--- a/agents/windows/msibuild/msi-update
+++ b/agents/windows/msibuild/msi-update
@@ -34,7 +34,6 @@ def bail_out(text):
sys.stderr.write("ERROR: %s\n" % text)
sys.exit(1)
-
try:
if sys.argv[1] == '-v':
opt_verbose = True
@@ -159,10 +158,19 @@ for entry in [ "Property", "File", "Upgrade" ]:
os.system((path_prefix + "msibuild %(new_msi_file)s -i %(work_dir)s/%(file)s.idt") % \
{ "work_dir" : work_dir, "new_msi_file": new_msi_file, "file": entry })
-# Update summary info with new uuid (HACK! - the msibuild way is not working on all systems...)
+# Update summary info with new uuid (HACK! - the msibuild tool is not able to do this on all systems)
+# In this step we replace the package code with a new uuid. This uuid is important, because it is
+# the unqiue identifier for this package. Inside the package the uuid is split into two halfs.
+# Each of it is updated with the corresponding new package code. Since msi-update uses the
+# vanilla_container.msi as well as the baked_container.msi we need to handle both..
package_code = ("{%s}" % uuid.uuid1()).upper()
-os.system("sed -i -e s/{08012468-53DE-4/%(start)s/ -e s/2A3-BAA9-FE4C2A129135}/%(end)s/ %(new_msi_file)s" % \
- {"new_msi_file": new_msi_file, "start": package_code[:16], "end": package_code[16:]})
+summary_info = {"new_msi_file": new_msi_file, "start": package_code[:16], "end": package_code[16:]}
+default_package_codes = {
+ "vanilla_container.msi": { "dftl_start": "{08012468-53DE-4", "dftl_end": "2A3-BAA9-FE4C2A129135}"},
+ "baked_container.msi" : { "dftl_start": "{47ED1918-CEDF-4", "dftl_end": "D37-943C-B4DBC3F58E6C}"}
+}
+summary_info.update(default_package_codes[msi_file])
+os.system("sed -i -e 's/%(dftl_start)s/%(start)s/' -e 's/%(dftl_end)s/%(end)s/' %(new_msi_file)s" % summary_info)
# Remove original product.cab from stream
verbose("Removing product.cab from %s" % new_msi_file)
Module: check_mk
Branch: master
Commit: e73d1c4c6570bb292af719e14b7e9657fbfe1b34
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e73d1c4c6570bb…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Oct 15 15:49:27 2014 +0200
#1129 FIX Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files
The tool msibuild had troubles updating the msi's "Summary Information" on some distributions.
It is no longer used for this task...
---
.werks/1129 | 11 +++++++++++
ChangeLog | 1 +
agents/windows/msibuild/msi-update | 6 +++---
3 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/.werks/1129 b/.werks/1129
new file mode 100644
index 0000000..0deb8cf
--- /dev/null
+++ b/.werks/1129
@@ -0,0 +1,11 @@
+Title: Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files
+Level: 2
+Component: core
+Compatible: compat
+Version: 1.2.5i6
+Date: 1413380611
+Class: fix
+
+The tool msibuild had troubles updating the msi's "Summary Information" on some distributions.
+It is no longer used for this task...
+
diff --git a/ChangeLog b/ChangeLog
index 5b94013..4d3d056 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
Core & Setup:
* 1008 Overall check timeout for Check_MK checks now defaults to CRIT state...
* 1373 SEC: Do not ouput complete command line when datasource programs fail...
+ * 1129 FIX: Windows MSI-Installer: some systems created corrupted check_mk_agent.msi files...
Checks & Agents:
* 0185 knuerr_rms_humidity, knuerr_rms_temp: Two new Checks to Monitor the Temperature and the Humidity on Knürr RMS Devices
diff --git a/agents/windows/msibuild/msi-update b/agents/windows/msibuild/msi-update
index 99a5dd8..667f9ae 100755
--- a/agents/windows/msibuild/msi-update
+++ b/agents/windows/msibuild/msi-update
@@ -159,10 +159,10 @@ for entry in [ "Property", "File", "Upgrade" ]:
os.system((path_prefix + "msibuild %(new_msi_file)s -i %(work_dir)s/%(file)s.idt") % \
{ "work_dir" : work_dir, "new_msi_file": new_msi_file, "file": entry })
-# Update summary info with new uid
+# Update summary info with new uuid (HACK! - the msibuild way is not working on all systems...)
package_code = ("{%s}" % uuid.uuid1()).upper()
-os.system((path_prefix + 'msibuild %(new_msi_file)s -s "Check_MK 32/64 bit MSI installer" "Mathias Kettner GmbH" "Intel;1033" "%(code)s"') %\
- {"code": package_code, "new_msi_file": new_msi_file})
+os.system("sed -i -e s/{08012468-53DE-4/%(start)s/ -e s/2A3-BAA9-FE4C2A129135}/%(end)s/ %(new_msi_file)s" % \
+ {"new_msi_file": new_msi_file, "start": package_code[:16], "end": package_code[16:]})
# Remove original product.cab from stream
verbose("Removing product.cab from %s" % new_msi_file)
Module: check_mk
Branch: master
Commit: a5cf793d9310ec536044c30df2ac277aaefa89c8
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5cf793d9310ec…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Wed Oct 15 15:37:57 2014 +0200
#1128 FIX bluecat_dns: now reports UNKNOWN if no snmp data is available
---
.werks/1128 | 9 +++++++++
ChangeLog | 1 +
checks/bluecat_dns | 4 +++-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/.werks/1128 b/.werks/1128
new file mode 100644
index 0000000..826aa29
--- /dev/null
+++ b/.werks/1128
@@ -0,0 +1,9 @@
+Title: bluecat_dns: now reports UNKNOWN if no snmp data is available
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i6
+Date: 1413380242
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 5ee719d..5b94013 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,6 +108,7 @@
* 1078 FIX: Fix compensation for daylight safing time in prediction
* 1126 FIX: bluecat_ntp: check no longer crashes on evaluating sysLeap values higher than 1...
* 1127 FIX: bluecat_dhcp: fixed exception when data was available.. returns UNKNOWN when data is missing
+ * 1128 FIX: bluecat_dns: now reports UNKNOWN if no snmp data is available
Multisite:
* 1066 Implemented Dashboard Designer...
diff --git a/checks/bluecat_dns b/checks/bluecat_dns
index 4515454..8e25614 100644
--- a/checks/bluecat_dns
+++ b/checks/bluecat_dns
@@ -43,7 +43,9 @@ def check_bluecat_dns(item, params, info):
5 : "fault"
}
- state = 0
+ if not info:
+ return
+
for line in info:
oper_state = int(line[0])
if oper_state in params['oper_states']['warning']: