Module: check_mk
Branch: master
Commit: 8925bab1c1834b20daa1e83e725b055e77466744
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8925bab1c1834b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Nov 7 12:10:32 2014 +0100
#1495 Most WATO tables can now be sorted (where useful)
Most of the data tables in WATO can now be used. Some of the
tables which have a defined order, like the rules within a
ruleset can not be sorted using the new sort mechanism.
At the moment the host table is not sortable, but this will
be added soon.
---
.werks/1495 | 14 ++++++
ChangeLog | 1 +
mkeventd/web/plugins/wato/mkeventd.py | 2 +-
web/htdocs/lib.py | 2 +-
web/htdocs/pages.css | 3 ++
web/htdocs/table.py | 84 ++++++++++++++++++++++++---------
web/htdocs/wato.py | 6 +--
7 files changed, 84 insertions(+), 28 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8925bab1c1…
Module: check_mk
Branch: master
Commit: 438f086fb17757061ff1fe7a5003b78b7c6c31bd
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=438f086fb17757…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Nov 7 10:40:00 2014 +0100
#1494 FIX Fixed error in NagVis Maps snapin when some users had no contact groups assigned
---
.werks/1494 | 10 ++++++++++
ChangeLog | 1 +
web/plugins/userdb/hook_auth.py | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/.werks/1494 b/.werks/1494
new file mode 100644
index 0000000..708bb2c
--- /dev/null
+++ b/.werks/1494
@@ -0,0 +1,10 @@
+Title: Fixed error in NagVis Maps snapin when some users had no contact groups assigned
+Level: 1
+Component: multisite
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.5i7
+Date: 1415353168
+
+
diff --git a/ChangeLog b/ChangeLog
index bcc24d6..1d10f66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,7 @@
* 1487 FIX: Fixed exception in Web GUI "Internal error:: name 'Filter' is not defined" in manual setups (using setup.py)...
* 1488 FIX: Fixed wrong information showing up on "Host Group" and "Service Group" views...
* 1433 FIX: Quicksearch: no longer shows an invalid search result when looking for multiple hosts...
+ * 1494 FIX: Fixed error in NagVis Maps snapin when some users had no contact groups assigned
WATO:
* 1170 Added buttons to move rules to top/bottom of the list to ruleset edit dialog
diff --git a/web/plugins/userdb/hook_auth.py b/web/plugins/userdb/hook_auth.py
index 0f2f70f..fc34447 100644
--- a/web/plugins/userdb/hook_auth.py
+++ b/web/plugins/userdb/hook_auth.py
@@ -142,7 +142,7 @@ function user_roles($username) {
function user_groups($username) {
global $mk_users;
- if(!isset($mk_users[$username]))
+ if(!isset($mk_users[$username]) || !isset($mk_users[$username]['contactgroups']))
return array();
else
return $mk_users[$username]['contactgroups'];
Module: check_mk
Branch: master
Commit: 5ca1f935c6b7d231cd9115746d946b92375a50f9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ca1f935c6b7d2…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Fri Nov 7 09:03:13 2014 +0100
#1448 domino_info: check is extended to also show and monitor the lnNotesServerState
---
.werks/1448 | 9 +++++++++
ChangeLog | 1 +
checkman/domino_info | 15 +++++++++++----
checks/domino_info | 28 +++++++++++++++++++++++-----
4 files changed, 44 insertions(+), 9 deletions(-)
diff --git a/.werks/1448 b/.werks/1448
new file mode 100644
index 0000000..c83b530
--- /dev/null
+++ b/.werks/1448
@@ -0,0 +1,9 @@
+Title: domino_info: check is extended to also show and monitor the lnNotesServerState
+Level: 1
+Component: checks
+Compatible: compat
+Version: 1.2.5i7
+Date: 1415347315
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index bd15e6a..eb99d58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,7 @@
* 1432 agent_vsphere: now able to monitor virtual machines snapshots...
* 1507 New optional parse_function for check API...
* 1445 quantum_libsmall_door, quantum_libsmall_status: Two new checks for monitoring small Quantum tape libraries
+ * 1448 domino_info: check is extended to also show and monitor the lnNotesServerState
* 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...
diff --git a/checkman/domino_info b/checkman/domino_info
index 6464205..d790d22 100644
--- a/checkman/domino_info
+++ b/checkman/domino_info
@@ -4,7 +4,14 @@ catalog: app/lotusnotes
license: GPL
distribution: check_mk
description:
- This check uses snmp to extract the following informational data about a
- Lotus Notes Server: {lnServerName} the server name, {lnMailDomain} the server
- domain, {lnServerNotesVersion} the Lotus Notes version. No configuration and
- no limits can be set in this check.
+
+ This check uses snmp to extract the following information about a Lotus
+ Domino Server from the Notes-MIB: {lnNotesServerState} the overall
+ state, {lnServerName} the server name, {lnMailDomain} the server domain,
+ {lnServerNotesVersion} the Lotus Domino version.
+
+ The state of the check is determined from the {lnNotesServerState}. A state of
+ 1:{up} leads to an OK state, states 2-4:{down, not_responding, crashed}
+ lead to a critical state, otherwise the state is warning.
+
+ No configuration and no limits can be set in this check.
diff --git a/checks/domino_info b/checks/domino_info
index 4055dbc..8754b0a 100644
--- a/checks/domino_info
+++ b/checks/domino_info
@@ -27,20 +27,37 @@
# Example SNMP walk:
#
+# .1.3.6.1.4.1.334.72.2.2.0 1
# .1.3.6.1.4.1.334.72.1.1.4.8.0 MEDEMA
# .1.3.6.1.4.1.334.72.1.1.6.2.1.0 CN=HH-BK4/OU=SRV/O=MEDEMA/C=DE
# .1.3.6.1.4.1.334.72.1.1.6.2.4.0 Release 8.5.3FP5 HF89
+domino_info_states = {
+ '1' : 'up',
+ '2' : 'down',
+ '3' : 'not-responding',
+ '4' : 'crashed',
+ '5' : 'unknown'
+}
+
def inventory_domino_info(info):
- if info and len(info) == 3:
+ if info and len(info[0]) != 0:
yield None, None
def check_domino_info(_no_item, _no_params, info):
- if len(info) == 3:
- domain, name, release = info
- infotext = "Name: %s, Domain: %s, %s" % ( domain[0][0], name[0][0], release[0][0] )
- yield 0, infotext
+ serverstate, domain, name, release = info
+ if int(serverstate[0][0]) > 4:
+ state = 1
+ infotext = "Server is %s" % ( domino_info_states[serverstate[0][0]] )
+ elif int(serverstate[0][0]) > 1:
+ state = 2
+ infotext = "Server is %s" % ( domino_info_states[serverstate[0][0]] )
+ else:
+ state = 0
+ infotext = "Server is %s. Domain: %s, Name: %s, %s" \
+ % ( domino_info_states[serverstate[0][0]], domain[0][0], name[0][0], release[0][0] )
+ yield state, infotext
check_info['domino_info'] = {
"check_function" : check_domino_info,
@@ -49,6 +66,7 @@ check_info['domino_info'] = {
"service_description" : "Domino Info",
"snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.311.1.1.3.1.2",
"snmp_info" : [
+ [ ".1.3.6.1.4.1.334.72.2", [ 2 ] ], # lnNotesServerState
[ ".1.3.6.1.4.1.334.72.1.1.4", [ 8 ] ], # lnMailDomain
[ ".1.3.6.1.4.1.334.72.1.1.6.2", [ 1 ] ], # lnServerName
[ ".1.3.6.1.4.1.334.72.1.1.6.2", [ 4 ] ], # lnServerNotesVersion
Module: check_mk
Branch: master
Commit: 7f60654e4d11e5bc5fad5515e531d630d1c783c9
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7f60654e4d11e5…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Thu Nov 6 17:32:54 2014 +0100
Updated bug entries #1011
---
.bugs/1011 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/.bugs/1011 b/.bugs/1011
index acb15f4..916b26d 100644
--- a/.bugs/1011
+++ b/.bugs/1011
@@ -5,6 +5,7 @@ Date: 2014-11-05 22:49:22
Targetversion: future
Class: nastiness
-logging behaviour can be configured in several places in wato (e.g. global settings), however it is neven mentioned where the actual logfiles can be found, and
+logging behaviour can be configured in several places in wato (e.g. global settings),
+however it is often not mentioned where the actual logfiles can be found, and
paths are not at all intuitive. It would be of great benefit to the users to
mention the location of the log whenever logging behaviour can be configured.
Module: check_mk
Branch: master
Commit: bf031c0bf4980c0c6ba4c2d8e3894ef433140a32
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bf031c0bf4980c…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Thu Nov 6 17:31:19 2014 +0100
Updated bug entries #1014
---
.bugs/1014 | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.bugs/1014 b/.bugs/1014
new file mode 100644
index 0000000..e080d40
--- /dev/null
+++ b/.bugs/1014
@@ -0,0 +1,9 @@
+Title: some global settings show a help text when hovering over them, some dont
+Component: wato
+State: open
+Date: 2014-11-06 17:28:13
+Targetversion: future
+Class: nastiness
+
+most of the global settings show a help text when clicking on the settings line, however only some of these
+also show the help text when hovering over the line. hovering should work for all the global settings.
Module: check_mk
Branch: master
Commit: 18edaf3e80936ec35a1f7b1338ea2baf46797fe1
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18edaf3e80936e…
Author: Goetz Golla <gg(a)mathias-kettner.de>
Date: Thu Nov 6 17:14:08 2014 +0100
Updated bug entries #1012, #1013
---
.bugs/1012 | 9 +++++++++
.bugs/1013 | 8 ++++++++
2 files changed, 17 insertions(+)
diff --git a/.bugs/1012 b/.bugs/1012
new file mode 100644
index 0000000..4a765fa
--- /dev/null
+++ b/.bugs/1012
@@ -0,0 +1,9 @@
+Title: wato list of rules: display used rulesets in different color
+Component: wato
+State: open
+Date: 2014-11-06 17:04:46
+Targetversion: future
+Class: feature
+
+In the various rule listings it would be extremly useful if used rules sets
+are shown in a different color than unused rulesets.
diff --git a/.bugs/1013 b/.bugs/1013
new file mode 100644
index 0000000..87a85d2
--- /dev/null
+++ b/.bugs/1013
@@ -0,0 +1,8 @@
+Title: make search in global settings possible
+Component: wato
+State: open
+Date: 2014-11-06 17:12:22
+Targetversion: future
+Class: feature
+
+a search feature for global settings would be very helpful