Module: check_mk
Branch: master
Commit: 8e96b8f6235a0eb0fc3f1c654d50985fe6325585
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e96b8f6235a0e…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Dec 11 11:10:10 2014 +0100
Updated bug entries #2213
---
.bugs/2213 | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.bugs/2213 b/.bugs/2213
new file mode 100644
index 0000000..4399135
--- /dev/null
+++ b/.bugs/2213
@@ -0,0 +1,10 @@
+Title: Consolidate rules like normal/retry check intervals into single rules
+Component: core
+State: open
+Date: 2014-12-11 10:57:20
+Targetversion: future
+Class: todo
+
+We could really reduce the number of rules by consolidating rules which should
+better be configured in one single rule like normal/retry check intervals or
+host/service rules
Module: check_mk
Branch: master
Commit: b26349e31a0d3307d8ca60036275b07b0da27a74
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b26349e31a0d33…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Dec 11 11:06:24 2014 +0100
#1660 notification plugin spectrum: now configurable via flexible notifications
---
.werks/1660 | 9 +++++++++
ChangeLog | 1 +
notifications/spectrum | 8 ++++++++
3 files changed, 18 insertions(+)
diff --git a/.werks/1660 b/.werks/1660
new file mode 100644
index 0000000..6be1695
--- /dev/null
+++ b/.werks/1660
@@ -0,0 +1,9 @@
+Title: notification plugin spectrum: now configurable via flexible notifications
+Level: 1
+Component: notifications
+Compatible: compat
+Version: 1.2.5i7
+Date: 1418292351
+Class: feature
+
+
diff --git a/ChangeLog b/ChangeLog
index ae3ff56..7b6083b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -269,6 +269,7 @@
* 1512 Bulk notification can now be grouped according to custom macro values...
* 1650 Enabled rule based notifications by default (for new installations)...
* 1749 Allow title of notifiation script to be in third line if second line is encoding: utf-8...
+ * 1660 notification plugin spectrum: now configurable via flexible notifications
* 1168 FIX: HTML mails can now be configured to display graphs among each other...
* 1514 FIX: Try harder to detect previous hard state in notification when using Nagios as core...
* 1582 FIX: Fixed missing graphs in mails when sending notifications to non-contacts...
diff --git a/notifications/spectrum b/notifications/spectrum
index dee63b2..28ea1e2 100755
--- a/notifications/spectrum
+++ b/notifications/spectrum
@@ -41,6 +41,14 @@ def main():
(var[7:], value.decode("utf-8"))
for (var, value)
in os.environ.items()])
+
+ # check if configured via flexible notifcations
+ if "PARAMETER_1" in context:
+ context["PARAMETER_COMMUNITY"] = context["PARAMETER_1"]
+ context["PARAMETER_DESTINATION"] = context["PARAMETER_2"]
+
+ # adjust these oids to your needs
+ # Note: HOSTCONTACTGROUPNAMES is only available via cmc
oids = {
"1.3.6.1.4.1.13424.10.5.2.1.1.1" : context['MONITORING_HOST'],
"1.3.6.1.4.1.13424.10.5.2.1.1.2" : context['HOSTNAME'],
Module: check_mk
Branch: master
Commit: 29c43cf33b38d531d7d848428b1756c8340e5f4b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=29c43cf33b38d5…
Author: Andreas Boesl <ab(a)mathias-kettner.de>
Date: Thu Dec 11 10:49:40 2014 +0100
fixed typo
---
web/plugins/icons/builtin.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py
index 06b9ae0..03d0ec4 100644
--- a/web/plugins/icons/builtin.py
+++ b/web/plugins/icons/builtin.py
@@ -623,7 +623,7 @@ def paint_icon_crashed_check(what, row, tags, custom_vars):
crashurl = html.makeuri([("site", row["site"]), ("host", row["host_name"]), ("service", row["service_description"])], filename="crashed_check.py")
return '<a href="%s">%s</a>' % (
crashurl, html.render_icon('crash',
- _("This check crash. Please click here for more information. You also can submit "
+ _("This check crashed. Please click here for more information. You also can submit "
"a crash report to the development team if you like.")))
multisite_icons.append({
Module: check_mk
Branch: master
Commit: 2bf3ebb061c44b1e7f48fe4588d9ca5a49cf3497
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2bf3ebb061c44b…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Dec 11 10:41:11 2014 +0100
Updated bug entries #2212
---
.bugs/2212 | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/.bugs/2212 b/.bugs/2212
new file mode 100644
index 0000000..b3095f2
--- /dev/null
+++ b/.bugs/2212
@@ -0,0 +1,10 @@
+Title: cisco_power: Check mixes up different sensors (non unique item)
+Component: checks
+State: open
+Date: 2014-12-11 10:40:05
+Targetversion: 1.2.5i1
+Class: bug
+
+The walk switch-cisco-c4500-x-1chassis contains 4 power supply sensors, while two are named
+Power Supply 1 and two Power Supply 2. The check does not handled them correctly and mixes
+the data.
Module: check_mk
Branch: master
Commit: fdb9a797ae171d756d5df455c3b0015e33f50155
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fdb9a797ae171d…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Dec 11 10:47:54 2014 +0100
#1740 FIX Changed default service discovery check intervall to 12 hours
---
.werks/1740 | 9 +++++++++
ChangeLog | 1 +
web/plugins/wato/check_mk_configuration.py | 20 ++++++++++----------
3 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/.werks/1740 b/.werks/1740
new file mode 100644
index 0000000..e3ee853
--- /dev/null
+++ b/.werks/1740
@@ -0,0 +1,9 @@
+Title: Changed default service discovery check intervall to 12 hours
+Level: 1
+Component: core
+Compatible: compat
+Version: 1.2.5i7
+Date: 1418291243
+Class: fix
+
+
diff --git a/ChangeLog b/ChangeLog
index 8298226..ae3ff56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@
* 1649 FIX: Check_MK inventory service has been renamed to Check_MK Discovery...
* 1706 FIX: Fix file permissions when installing MKPs to 0644 or 0755...
* 1750 FIX: Handle rare cases where SNMP response string begins with a line feed...
+ * 1740 FIX: Changed default service discovery check intervall to 12 hours
Checks & Agents:
* 1197 climaveneta_temp: New check for temperature sensors on Climaveneta clima devices
diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py
index 8e55d5e..b2147f2 100644
--- a/web/plugins/wato/check_mk_configuration.py
+++ b/web/plugins/wato/check_mk_configuration.py
@@ -1271,21 +1271,21 @@ group = _("Service discovery")
register_configvar(group,
"inventory_check_interval",
Optional(
- Integer(title = _("Do inventory check every"),
+ Integer(title = _("Perform service discovery check every"),
unit = _("minutes"),
min_value = 1,
- default_value = 120),
- title = _("Enable regular inventory checks"),
+ default_value = 720),
+ title = _("Enable regular service discovery checks"),
help = _("If enabled, Check_MK will create one additional check per host "
- "that does a regular check, if the inventory would find new services "
+ "that does a regular check, if the service discovery would find new services "
"currently un-monitored.")),
need_restart = True)
register_configvar(group,
"inventory_check_severity",
DropdownChoice(
- title = _("Severity of failed inventory check"),
- help = _("Please select which alarm state the inventory check services "
+ title = _("Severity of failed service discovery check"),
+ help = _("Please select which alarm state the service discovery check services "
"shall assume in case that un-monitored services are found."),
choices = [
(0, _("OK - do not alert, just display")),
@@ -1298,7 +1298,7 @@ register_configvar(group,
register_configvar(group,
"inventory_check_do_scan",
DropdownChoice(
- title = _("Inventory check for SNMP devices"),
+ title = _("Service discovery check for SNMP devices"),
choices = [
( True, _("Perform full SNMP scan always, detect new check types") ),
( False, _("Just rely on existing check files, detect new items only") )
@@ -1308,11 +1308,11 @@ register_configvar(group,
register_configvar(group,
"inventory_check_autotrigger",
Checkbox(
- title = _("Inventory triggers inventory check"),
- label = _("Automatically schedule inventory check after service configuration changes"),
+ title = _("Service Discovery triggers service discovery check"),
+ label = _("Automatically schedule service discovery check after service configuration changes"),
help = _("When this option is enabled then after each change of the service "
"configuration of a host via WATO - may it be via manual changes or a bulk "
- "inventory - the inventory check is automatically rescheduled in order "
+ "discovry - the service discovery check is automatically rescheduled in order "
"to reflect the new service state correctly immediately."),
default_value = True,
))
Module: check_mk
Branch: master
Commit: 3961952ccb03eff129bdc092e834bba3df764f55
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3961952ccb03ef…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Dec 11 10:31:59 2014 +0100
Remove bogus process specification from parameter rule
---
web/htdocs/wato.py | 69 +++++++++++++++++-----------------
web/plugins/icons/wato.py | 4 +-
web/plugins/wato/check_parameters.py | 32 +++++++++++++---
3 files changed, 64 insertions(+), 41 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 4867850..c950320 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -15285,7 +15285,7 @@ def register_rule(group, varname, valuespec = None, title = None,
# Special version of register_rule, dedicated to checks. This is not really
# modular here, but we cannot put this function into the plugins file because
# the order is not defined there.
-def register_check_parameters(subgroup, checkgroup, title, valuespec, itemspec, matchtype, has_inventory=True):
+def register_check_parameters(subgroup, checkgroup, title, valuespec, itemspec, matchtype, has_inventory=True, register_static_check=True):
# Register rule for inventorized checks
if valuespec and has_inventory: # would be useless rule if check has no parameters
itemenum = None
@@ -15312,40 +15312,41 @@ def register_check_parameters(subgroup, checkgroup, title, valuespec, itemspec,
itemenum = itemenum,
match = matchtype)
- # Register rule for static checks
- elements = [
- CheckTypeGroupSelection(
- checkgroup,
- title = _("Checktype"),
- help = _("Please choose the check plugin")) ]
- if itemspec:
- elements.append(itemspec)
- else:
- # In case of static checks without check-item, add the fixed
- # valuespec to add "None" as second element in the tuple
- elements.append(FixedValue(
- None,
- totext = '',
- ))
- if not valuespec:
- valuespec =\
- FixedValue(None,
- help = _("This check has no parameters."),
- totext = "")
- if not valuespec.title():
- valuespec._title = _("Parameters")
- elements.append(valuespec)
+ if register_static_check:
+ # Register rule for static checks
+ elements = [
+ CheckTypeGroupSelection(
+ checkgroup,
+ title = _("Checktype"),
+ help = _("Please choose the check plugin")) ]
+ if itemspec:
+ elements.append(itemspec)
+ else:
+ # In case of static checks without check-item, add the fixed
+ # valuespec to add "None" as second element in the tuple
+ elements.append(FixedValue(
+ None,
+ totext = '',
+ ))
+ if not valuespec:
+ valuespec =\
+ FixedValue(None,
+ help = _("This check has no parameters."),
+ totext = "")
+ if not valuespec.title():
+ valuespec._title = _("Parameters")
+ elements.append(valuespec)
- register_rule(
- "static/" + subgroup,
- "static_checks:%s" % checkgroup,
- title = title,
- valuespec = Tuple(
- title = valuespec.title(),
- elements = elements,
- ),
- itemspec = itemspec,
- match = "all")
+ register_rule(
+ "static/" + subgroup,
+ "static_checks:%s" % checkgroup,
+ title = title,
+ valuespec = Tuple(
+ title = valuespec.title(),
+ elements = elements,
+ ),
+ itemspec = itemspec,
+ match = "all")
# Registers notification parameters for a certain notification script,
# e.g. "mail" or "sms". This will create:
diff --git a/web/plugins/icons/wato.py b/web/plugins/icons/wato.py
index cf03036..f86cabf 100644
--- a/web/plugins/icons/wato.py
+++ b/web/plugins/icons/wato.py
@@ -36,10 +36,12 @@ def wato_link(folder, site, hostname, where):
if where == "inventory":
url += "&mode=inventory"
help = _("Edit services")
+ icon = "services"
else:
url += "&mode=edithost"
help = _("Edit this host")
- return '<a href="%s">%s</a>' % (url, html.render_icon('services', help))
+ icon = "wato"
+ return '<a href="%s">%s</a>' % (url, html.render_icon(icon, help))
else:
return ""
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index d5ff0e4..73e80d7 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -340,7 +340,7 @@ register_rule(group + '/' + subgroup_inventory,
register_rule(group + '/' + subgroup_inventory,
varname = "inventory_processes_rules",
- title = _('Process Inventory'),
+ title = _('Process Discovery'),
help = _("This ruleset defines criteria for automatically creating checks for running processes "
"based upon what is running when the service discovery is done. These services will be "
"created with default parameters. They will get critical when no process is running and "
@@ -348,10 +348,10 @@ register_rule(group + '/' + subgroup_inventory,
valuespec = Dictionary(
elements = [
('descr', TextAscii(
- title = _('Service Description'),
+ title = _('Process Name'),
style = "dropdown",
allow_empty = False,
- help = _('<p>The service description may contain one or more occurances of <tt>%s</tt>. If you do this, then the pattern must be a regular '
+ help = _('<p>The process name may contain one or more occurances of <tt>%s</tt>. If you do this, then the pattern must be a regular '
'expression and be prefixed with ~. For each <tt>%s</tt> in the description, the expression has to contain one "group". A group '
'is a subexpression enclosed in brackets, for example <tt>(.*)</tt> or <tt>([a-zA-Z]+)</tt> or <tt>(...)</tt>. When the inventory finds a process '
'matching the pattern, it will substitute all such groups with the actual values when creating the check. That way one '
@@ -419,6 +419,7 @@ register_rule(group + '/' + subgroup_inventory,
'the actual user name. For example "\\\\NT AUTHORITY\NETWORK SERVICE" or "\\\\CHKMKTEST\Administrator".</p>'),
)),
],
+ required_keys = [ "descr" ],
# Some keys have moved into a check parameter ruleset
ignored_keys = [ 'levels', 'perfdata', 'handle_count', 'cpulevels', 'cpu_average', 'virtual_levels', 'resident_levels'],
@@ -6233,6 +6234,25 @@ def ps_convert_from_singlekeys(old_params):
return params
+# Rule for disovered process checks
+register_check_parameters(
+ subgroup_applications,
+ "ps",
+ _("State and count of processes"),
+ Transform(
+ Dictionary(
+ elements = process_level_elements,
+ ),
+ forth = ps_convert_from_singlekeys,
+ ),
+ TextAscii(
+ title = _("Process name as defined at discovery"),
+ ),
+ "dict",
+ has_inventory = True,
+ register_static_check = False,
+)
+
# Rule for static process checks
register_check_parameters(
subgroup_applications,
@@ -6242,7 +6262,7 @@ register_check_parameters(
Dictionary(
elements = [
( "process", Alternative(
- title = _("Name of the process"),
+ title = _("Process Matching"),
style = "dropdown",
elements = [
TextAscii(
@@ -6296,7 +6316,7 @@ register_check_parameters(
forth = ps_convert_from_singlekeys,
),
TextAscii(
- title = _("Name of service"),
+ title = _("Process Name"),
help = _("This name will be used in the description of the service"),
allow_empty = False,
regex = "^[a-zA-Z_0-9 _.-]*$",
@@ -6304,7 +6324,7 @@ register_check_parameters(
"dot and hyphon for your service description"),
),
"dict",
- True,
+ has_inventory = False,
)
register_check_parameters(
Module: check_mk
Branch: master
Commit: 5e800099420f20bc4a2dc751688435321b136a84
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5e800099420f20…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Dec 11 09:03:32 2014 +0100
Process inventory: Fixed help text
---
web/plugins/wato/check_parameters.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index d5ff0e4..4870aa4 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -344,7 +344,7 @@ register_rule(group + '/' + subgroup_inventory,
help = _("This ruleset defines criteria for automatically creating checks for running processes "
"based upon what is running when the service discovery is done. These services will be "
"created with default parameters. They will get critical when no process is running and "
- "OK otherwise. You can parameterize the check with the ruleset <i>Process Checks</i>."),
+ "OK otherwise. You can parameterize the check with the ruleset <i>State and count of processes</i>."),
valuespec = Dictionary(
elements = [
('descr', TextAscii(