Module: check_mk
Branch: master
Commit: 9a0fafc30f54e0e7f2af9ac1fa7a41136d2019d1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a0fafc30f54e0…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Mar 3 09:49:25 2014 +0100
FIX Fix NoneType has not attribute userdb_automatic_sync bug in D-WATO
---
.werks/709 | 9 +++++++++
ChangeLog | 1 +
web/plugins/wato/userdb.py | 13 ++++++++++---
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/.werks/709 b/.werks/709
new file mode 100644
index 0000000..d50f91d
--- /dev/null
+++ b/.werks/709
@@ -0,0 +1,9 @@
+Title: Fix NoneType has not attribute userdb_automatic_sync bug in D-WATO
+Level: 1
+Component: wato
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1393836538
+
+
diff --git a/ChangeLog b/ChangeLog
index da48fa2..649a992 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -297,6 +297,7 @@
* 0690 FIX: Fix language jumping to German when saving user profiles
* 0666 FIX: Minimum port for the mknotifyd is now 1024 (never use well known ports)...
* 0559 FIX: WATO snapshots: improved validation of (uploaded) snapshots...
+ * 0709 FIX: Fix NoneType has not attribute userdb_automatic_sync bug in D-WATO
Notifications:
* 0362 sms: now searching PATH for sendsms and smssend commands...
diff --git a/web/plugins/wato/userdb.py b/web/plugins/wato/userdb.py
index 43608fd..ff7a0ef 100644
--- a/web/plugins/wato/userdb.py
+++ b/web/plugins/wato/userdb.py
@@ -24,9 +24,16 @@
# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
# Boston, MA 02110-1301 USA.
-import userdb
-
def sync_pre_activate_changes(_unused):
- if 'wato_pre_activate_changes' in config.userdb_automatic_sync:
+ # In some rare cases for still unknown reasons at this time the
+ # variable config sometimes has the value None. This could or could
+ # not be a mod_python problem. But it makes the activation of changes
+ # in a D-WATO setup break. So better handle this case here.
+ try:
+ do_sync = 'wato_pre_activate_changes' in config.userdb_automatic_sync
+ except:
+ do_sync = False
+ if do_sync:
userdb.hook_sync()
+
api.register_hook('pre-activate-changes', sync_pre_activate_changes)
Module: check_mk
Branch: master
Commit: a65190c9c29293f32a34898bc22645ec25280b9c
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a65190c9c29293…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Mar 3 08:26:22 2014 +0100
brocade_fcport: Now supporting interface speed of 16 Gbit (just discovered in the wild)
---
.bugs/2127 | 13 +++++++++++++
.werks/674 | 8 ++++++++
ChangeLog | 1 +
checks/brocade_fcport | 6 +++++-
4 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/.bugs/2127 b/.bugs/2127
new file mode 100644
index 0000000..c1c411c
--- /dev/null
+++ b/.bugs/2127
@@ -0,0 +1,13 @@
+Title: EC-Check: Make check for hostname AND ipaddress match possible
+Component: ec
+State: open
+Date: 2014-03-03 08:20:36
+Targetversion: 1.2.5i1
+Class: nastiness
+
+When e.g. receiving SNMP-traps, only the ipaddress is known in the event. The view resolves the ipaddress to existing
+hostnames. As a result, the user thinks the "check event state in event console" check can check for events with matching
+host name. But this is not true, since the event only has the ipaddress stored.
+
+Either add an option "hostname or ipaddress" to the ec-check or use livestatus to try to resolve ipaddres to hostnames
+to make this easier to handle.
diff --git a/.werks/674 b/.werks/674
new file mode 100644
index 0000000..d97e152
--- /dev/null
+++ b/.werks/674
@@ -0,0 +1,8 @@
+Title: brocade_fcport: Now supporting interface speed of 16 Gbit (just discovered in the wild)
+Level: 1
+Component: checks
+Version: 1.2.5i1
+Date: 1393831533
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index b273ac7..da48fa2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -97,6 +97,7 @@
* 0586 rmon_stats: new snmp check to gather network traffic statistics on RMON enabled network interfaces
* 0704 windows_os_bonding: new check for bonding interfaces on windows...
* 0562 esx_vsphere_vm.guest_tools: new check to monitor guest tools status...
+ * 0674 brocade_fcport: Now supporting interface speed of 16 Gbit (just discovered in the wild)
* 0103 FIX: services: Fixed bug with service inventory defined in main.mk...
* 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now
* 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs...
diff --git a/checks/brocade_fcport b/checks/brocade_fcport
index 40078c7..c112e7a 100644
--- a/checks/brocade_fcport
+++ b/checks/brocade_fcport
@@ -25,11 +25,15 @@
# Boston, MA 02110-1301 USA.
# lookup tables for check implementation
+# Taken from swFCPortPhyState
brocade_fcport_phystates = [ '', 'noCard', 'noTransceiver', 'laserFault', 'noLight',
'noSync', 'inSync', 'portFault', 'diagFault', 'lockRef' ]
+# Taken from swFCPortOpStatus
brocade_fcport_opstates = [ 'unknown', 'online', 'offline', 'testing', 'faulty' ]
+# Taken from swFCPortAdmStatus
brocade_fcport_admstates = [ '', 'online', 'offline', 'testing', 'faulty' ]
-brocade_fcport_speed = [ 'unknown', '1Gbit', '2Gbit', 'auto-Neg', '4Gbit', '8Gbit', '10Gbit', ]
+# Taken from swFCPortSpeed
+brocade_fcport_speed = [ '', '1Gbit', '2Gbit', 'auto-Neg', '4Gbit', '8Gbit', '10Gbit', 'unknown', '16Gbit' ]
# settings for inventory: which ports should be inventorized