Module: check_mk
Branch: master
Commit: ff3f09526f6fde567ecfc01b56dfc4fcbd424a1c
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ff3f09526f6fde…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 4 15:59:30 2014 +0100
#1634 FIX Fix editing of cluster hosts in WATO: cluster-property no longer goes lost
When editing a cluster host in WATO the list of nodes (and thereore the cluster
property) got list. This bug was probably introduced while creating the new WATO
webservice. This has been fixed.
---
.werks/1634 | 11 +++++++++++
ChangeLog | 7 ++++---
web/htdocs/wato.py | 6 +++++-
3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/.werks/1634 b/.werks/1634
new file mode 100644
index 0000000..f60c99a
--- /dev/null
+++ b/.werks/1634
@@ -0,0 +1,11 @@
+Title: Fix editing of cluster hosts in WATO: cluster-property no longer goes lost
+Level: 2
+Component: wato
+Compatible: compat
+Version: 1.2.5i7
+Date: 1417705023
+Class: fix
+
+When editing a cluster host in WATO the list of nodes (and thereore the cluster
+property) got list. This bug was probably introduced while creating the new WATO
+webservice. This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index 800838e..20dd62c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,11 +48,11 @@
* 1616 drbd: Added support for Ahead/Behind cluster states (DRBD >= 8.3.10)
* 1626 Renamed service descriptions of filesystem, process and logwatch checks...
* 1627 megaraid_ldisks: Warn if current cache or write policy differs from logical
drive default policy...
- * 1597 bluecat_dhcp, bluecat_dns: Checks can now be used in Check_MK Cluster Mode
* 1629 check_mk_agent.freebsd: several new features and improvements, now only use
statgrab...
* 1630 smart: update in plugin that also outputs information about disks attached to
a MegaRAID controller...
* 1631 juniper_bgp_state: check now detects and supports more differen device
models...
* 1645 Added basic kernel section to FreeBSD agent...
+ * 1597 bluecat_dhcp, bluecat_dns: Checks can now be used in Check_MK Cluster Mode
* 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization...
* 1480 FIX: brocade_vdx_status: disable check on some devices that do not support
it...
* 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors,
dell_om_sensors: detect more devices...
@@ -95,12 +95,12 @@
* 1617 FIX: lnx_if: Deal with data provided by cluster host
* 1618 FIX: ad_replication: Output of timeLastSuccess and timeLastFailure was
inverted...
* 1623 FIX: hp_proliant_mem: support for some yet unhandled status situations
- * 1598 FIX: bluecat_dhcp: Check is not longer found in inventory if dhcp service is
not activated
* 1640 FIX: check_jolokia_metrics_serv_req: Fixed wrong levels shown for upper
thresholds
- * 1453 FIX: drbd.stats: tried to send non-numeric write order parameter to rrd...
* 1632 FIX: hr_fs: remove ugly "mounted on:" information appearing on
Juniper devices
* 1646 FIX: hyperv_vms: Plugin garbles following plugin output when no VMs exist...
* 1647 FIX: agent_ipmi: Check_MK service gets critical now when ipmi-sensors command
fails
+ * 1453 FIX: drbd.stats: tried to send non-numeric write order parameter to rrd...
+ * 1598 FIX: bluecat_dhcp: Check is not longer found in inventory if dhcp service is
not activated
Multisite:
* 1508 Allow input of plugin output and perfdata when faking check results...
@@ -183,6 +183,7 @@
* 1637 FIX: Fixed exception in notification analysis when notifications have not
NOTIFICATIONTYPE set
* 1639 FIX: Interfaces with speed more than 10GBit/s can now be configured correctly
* 1633 FIX: Fix problem that attributes of new WATO folders have not been saved...
+ * 1634 FIX: Fix editing of cluster hosts in WATO: cluster-property no longer goes
lost...
Notifications:
* 1512 Bulk notification can now be grouped according to custom macro values...
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index c213df8..5563842 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -17474,7 +17474,11 @@ def update_hosts_in_folder(folder, hosts):
updated_hosts = {}
for hostname, attributes in hosts.items():
- cleaned_attr = dict([(k, v) for (k, v) in attributes.get("set",
{}).iteritems() if not k.startswith('.') ])
+ cleaned_attr = dict([
+ (k, v) for
+ (k, v) in
+ attributes.get("set", {}).iteritems()
+ if (not k.startswith('.') or k == ".nodes") ])
# unset keys
for key in attributes.get("unset", []):
if key in cleaned_attr: