Module: check_mk
Branch: master
Commit: 06224ac37fc71d4d0462af233ba2b967e6bbd1fe
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06224ac37fc71d…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jan 24 10:46:56 2014 +0100
Updated draft
---
doc/drafts/README.rule_based_notifications | 3 +++
1 file changed, 3 insertions(+)
diff --git a/doc/drafts/README.rule_based_notifications b/doc/drafts/README.rule_based_notifications
index dbbcc57..7ff87da 100644
--- a/doc/drafts/README.rule_based_notifications
+++ b/doc/drafts/README.rule_based_notifications
@@ -262,4 +262,7 @@ D) NOTIFICATION
they are not available in the notification context.
+==============================================================================================
+Further ideas:
+- Diagnostic feature: Click on a Host or Service and ask "who will be notified?"
Module: check_mk
Branch: master
Commit: c090f44ca49a0cd2ca67c1650cc953295e944bac
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c090f44ca49a0c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jan 24 10:43:08 2014 +0100
FIX Move two last global settings of Event Console to proper places
---
.werks/678 | 9 +++++
ChangeLog | 1 +
mkeventd/web/plugins/wato/mkeventd.py | 61 +++++++++++++++++----------------
web/htdocs/wato.py | 6 +++-
4 files changed, 47 insertions(+), 30 deletions(-)
diff --git a/.werks/678 b/.werks/678
new file mode 100644
index 0000000..b3187f8
--- /dev/null
+++ b/.werks/678
@@ -0,0 +1,9 @@
+Title: Move two last global settings of Event Console to proper places
+Level: 1
+Component: wato
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1390556556
+
+
diff --git a/ChangeLog b/ChangeLog
index bde65fd..f5d3076 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -221,6 +221,7 @@
* 0256 FIX: wato snapshots: snapshot restore no longer fails with older python versions...
* 0433 FIX: Creating WATO lock during automations (like e.g. master to slave syncs)...
* 0434 FIX: Fixed wrong count of failed hosts in bulk inventory mode...
+ * 0678 FIX: Move two last global settings of Event Console to proper places
Notifications:
* 0362 sms: now searching PATH for sendsms and smssend commands...
diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py
index dd7b71b..ce555ab 100644
--- a/mkeventd/web/plugins/wato/mkeventd.py
+++ b/mkeventd/web/plugins/wato/mkeventd.py
@@ -1482,21 +1482,6 @@ if mkeventd_enabled:
)
register_configvar(group,
- "mkeventd_connect_timeout",
- Integer(
- title = _("Connect timeout to status socket"),
- help = _("When the Multisite GUI connects the socket of the event daemon "
- "in order to retrieve information about current and historic events "
- "then this timeout will be applied."),
- minvalue = 1,
- maxvalue = 120,
- default_value = 10,
- unit = "sec",
- ),
- domain = "multisite",
- )
-
- register_configvar(group,
"replication",
Optional(
Dictionary(
@@ -1675,20 +1660,6 @@ if mkeventd_enabled:
)
register_configvar(group,
- "mkeventd_pprint_rules",
- Checkbox(title = _("Pretty-Print rules in configuration file"),
- label = _("enable pretty-printing of rules"),
- help = _("When the WATO module of the Event Console saves rules to the file "
- "<tt>mkeventd.d/wato/rules.mk</tt> it usually prints the Python "
- "representation of the rules-list into one single line by using the "
- "native Python code generator. Enabling this option switches to <tt>pprint</tt>, "
- "which nicely indents everything. While this is a bit slower for large "
- "rulesets it makes debugging and manual editing simpler."),
- default_value = False),
- domain = "multisite",
- )
-
- register_configvar(group,
"actions",
vs_mkeventd_actions,
allow_reset = False,
@@ -1781,6 +1752,38 @@ if mkeventd_enabled:
domain = "mkeventd",
)
+ # A few settings for Multisite and WATO
+ register_configvar(_("Status GUI (Multisite)"),
+ "mkeventd_connect_timeout",
+ Integer(
+ title = _("Connect timeout to status socket of Event Console"),
+ help = _("When the Multisite GUI connects the socket of the event daemon "
+ "in order to retrieve information about current and historic events "
+ "then this timeout will be applied."),
+ minvalue = 1,
+ maxvalue = 120,
+ default_value = 10,
+ unit = "sec",
+ ),
+ domain = "multisite",
+ )
+
+ register_configvar(_("Configuration GUI (WATO)"),
+ "mkeventd_pprint_rules",
+ Checkbox(title = _("Pretty-Print rules in configuration file"),
+ label = _("enable pretty-printing of rules"),
+ help = _("When the WATO module of the Event Console saves rules to the file "
+ "<tt>mkeventd.d/wato/rules.mk</tt> it usually prints the Python "
+ "representation of the rules-list into one single line by using the "
+ "native Python code generator. Enabling this option switches to <tt>pprint</tt>, "
+ "which nicely indents everything. While this is a bit slower for large "
+ "rulesets it makes debugging and manual editing simpler."),
+ default_value = False),
+ domain = "multisite",
+ )
+
+
+
# Settings that should also be avaiable on distributed Sites that
# do not run an own eventd but want to query one or send notifications
# to one.
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index dc5b503..0bcddd7 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -6358,7 +6358,7 @@ def render_global_configuration_variables(default_values, current_settings, show
groupnames.sort()
html.write('<div class=globalvars>')
for groupname in groupnames:
- forms.header(groupname, isopen=False)
+ header_is_painted = False # needed for omitting empty groups
for domain, varname, valuespec in g_configvar_groups[groupname]:
if not show_all and (not g_configvars[varname][4]
@@ -6371,6 +6371,10 @@ def render_global_configuration_variables(default_values, current_settings, show
else:
continue
+ if not header_is_painted:
+ forms.header(groupname, isopen=False)
+ header_is_painted = True
+
defaultvalue = default_values.get(varname, valuespec.default_value())
edit_url = make_link([("mode", "edit_configvar"), ("varname", varname), ("site", html.var("site", ""))])
Module: check_mk
Branch: master
Commit: 2201ce45b8ad5a1fa58a3ee2d15e19b2b3321be4
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2201ce45b8ad5a…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jan 24 10:35:36 2014 +0100
Better description for (cached data)
---
ChangeLog | 9 +++------
web/htdocs/wato.py | 2 +-
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7b0260b..bde65fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -62,16 +62,13 @@
* 0462 emcvnx_raidgroups.list_disks: New check for EMC VNX storage system...
* 0463 emcvnx_raidgroups.capacity, emcvnx_raidgroups.capacity_contiguous: New Checks for EMC VNX Storage systems...
* 0570 fileinfo.groups: file groups now allow exclude patterns as well
-<<<<<<< HEAD
- * 0571 cmciii_lcp_fans: now monitors the lower limit for the rpm
- * 0572 cmciii_lcp_waterflow: lower and upper limits to the flow are now monitored
- * 0573 cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: checks now observe limits to the temperatures
-=======
* 0464 stulz_pump: new check for the status of pumps of Stulz clima units
* 0125 unitrends_backup:Unitrends Backup...
* 0126 mikrotik_signal: Check for mikrotik wifi bridges
* 0127 hp_proliant_raid: Check for proliant RAID status.
->>>>>>> d95f1c667c93038de25f1677c693ad80fd9b937c
+ * 0571 cmciii_lcp_fans: now monitors the lower limit for the rpm
+ * 0572 cmciii_lcp_waterflow: lower and upper limits to the flow are now monitored
+ * 0573 cmciii_lcp_airin, cmciii_lcp_airout, cmciii_lcp_waterin, cmciii_lcp_waterout: checks now observe limits to the temperatures
* 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/web/htdocs/wato.py b/web/htdocs/wato.py
index d68ff37..dc5b503 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -2427,7 +2427,7 @@ def mode_inventory(phase, firsttime):
if html.var("_scan"):
title += _(" (live scan)")
else:
- title += _(" (cached data)")
+ title += _(" (might be cached data)")
return title
elif phase == "buttons":
Module: check_mk
Branch: master
Commit: 90d163d712e1789ed448afd506eeb2f49e9c240f
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90d163d712e178…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Jan 24 10:30:00 2014 +0100
Make title of tags and tag groups localizable
The names of the host tags that are shipped are now correctly
localized. More then that: the user now can change these localizations
and even create language depended name for his own host tags.
---
.werks/677 | 10 +++++++
ChangeLog | 1 +
web/htdocs/lib.py | 40 +++++++++++++++++++++++++
web/htdocs/valuespec.py | 15 ++++++++--
web/htdocs/wato.py | 45 ++++++++++++++++------------
web/plugins/config/builtin.py | 2 ++
web/plugins/wato/check_mk_configuration.py | 28 +++++++++++++++++
7 files changed, 120 insertions(+), 21 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=90d163d712…
Module: check_mk
Branch: master
Commit: 8c901d5c5bd27cb07c147aa26b4843f3af168285
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c901d5c5bd27c…
Author: Götz Golla <gg(a)mathias-kettner.de>
Date: Thu Jan 23 20:25:18 2014 +0100
cmciii_lcp_fans: now monitors the lower limit for the rpm
---
.werks/571 | 9 +++++++++
ChangeLog | 2 +-
checkman/cmciii_lcp_fans | 2 ++
checks/cmciii_lcp_fans | 25 +++++++++++++++++--------
4 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/.werks/571 b/.werks/571
new file mode 100644
index 0000000..c67eb70
--- /dev/null
+++ b/.werks/571
@@ -0,0 +1,9 @@
+Title: cmciii_lcp_fans: now monitors the lower limit for the rpm
+Level: 1
+Component: checks
+Class: feature
+State: unknown
+Version: 1.2.5i1
+Date: 1390505063
+
+
diff --git a/ChangeLog b/ChangeLog
index ff848c2..a25baca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -57,6 +57,7 @@
* 0462 emcvnx_raidgroups.list_disks: New check for EMC VNX storage system...
* 0463 emcvnx_raidgroups.capacity, emcvnx_raidgroups.capacity_contiguous: New Checks for EMC VNX Storage systems...
* 0570 fileinfo.groups: file groups now allow exclude patterns as well
+ * 0571 cmciii_lcp_fans: now monitors the lower limit for the rpm
* 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...
@@ -171,7 +172,6 @@
* 0428 Changed user profiles (e.g. pw changes) are now replicated in distributed setups...
* 0114 User Custom Attributes can now be exported to the core...
* 0448 New button in WATO service list for displaying check parameters...
- * 0353 New button in service list for refreshing all services...
* 0057 FIX: Fix exception in WATO host editor on custom tag without topic...
* 0241 FIX: Improved sorting of WATO folders in dropdown menu...
* 0019 FIX: Fixed wording in WATO rule for MSSQL check
diff --git a/checkman/cmciii_lcp_fans b/checkman/cmciii_lcp_fans
index 9f63824..5200b70 100644
--- a/checkman/cmciii_lcp_fans
+++ b/checkman/cmciii_lcp_fans
@@ -11,6 +11,8 @@ description:
taken as the state of the check as follows:
If the Rittal device returns {OK}, the check is {OK}. Otherwise
the check is {CRIT}.
+ Futhermore, the global lower limit for the fan RPM is extracted from
+ the device. If the fan RPM is below this limit, the check is {WARN}.
item:
The number of the fan
diff --git a/checks/cmciii_lcp_fans b/checks/cmciii_lcp_fans
index 40e581b..8f56bd7 100644
--- a/checks/cmciii_lcp_fans
+++ b/checks/cmciii_lcp_fans
@@ -33,21 +33,30 @@ def inventory_cmciii_lcp_fans(info):
return inventory
def check_cmciii_lcp_fans(item, params, info):
- for i in range(1,7):
- if item == i:
- status = info[0][i*4-1]
- lowlevel = re.sub(" .*$", "", info[0][0])
- info_text = "%s RPM: %s, Status: %s" % \
- (info[0][i*4-3], info[0][i*4-2], info[0][i*4-1])
+ lowlevel = int(re.sub(" .*$", "", info[0][0])) # global low warning
- perfdata = [ ("rpm", re.sub(" ","", info[0][i*4-2]), lowlevel+":", 0, 0 ) ]
+ for i in range(1,7):
+ if item == i:
+ name = info[0][i*4-3]
+ status = info[0][i*4-1].lower()
+ rpm = int(info[0][i*4-2].split(" ")[0])
+ unit = info[0][i*4-2].split(" ")[1]
- if status.lower() == "ok":
+ sym = ""
+ if status == "ok" and rpm >= lowlevel:
state = 0
+ elif ( status == "ok" and rpm < lowlevel ):
+ state = 1
+ sym = "(!)"
else:
state = 2
+ info_text = "%s RPM: %d%s (limit %d%s)%s, Status %s" \
+ % (name, rpm, unit, lowlevel, unit, sym, status)
+
+ perfdata = [ ("rpm", str(rpm)+unit, str(lowlevel)+":", 0, 0 ) ]
+
return (state, info_text, perfdata)
return (3, "no SNMP data found")