Module: check_mk
Branch: master
Commit: 09af9e0bc5c0383df52e99743749b561c47b1ab0
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=09af9e0bc5c038…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Mon Nov 19 14:11:10 2012 +0100
lnx_if ist jetzt default
---
checkman/lnx_if | 6 ------
checkman/netctr.combined | 5 +----
checkman/netif.link | 5 +----
checkman/netif.params | 5 +----
4 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/checkman/lnx_if b/checkman/lnx_if
index 020e273..a524125 100644
--- a/checkman/lnx_if
+++ b/checkman/lnx_if
@@ -17,10 +17,6 @@ description:
link speed setting and link status if {ethtool} is installed and supported
by the NIC.
- Please also note, that the inventory of this check is currently still
- turned off per default. Please set {linux_nic_check = "lnx_if"} in order
- to turn it on. This will change in some day in the future.
-
Depending on the check parameters this check can go WARN or CRIT when the
port status changes (i.e. is down), when the link speed changes (e.g. a
port expected to be set to 1GBit/s operates only at 100MBit/s), when the
@@ -143,5 +139,3 @@ if_default_traffic_levels (float/int, float/int): Default levels for checking tr
if_default_average (int): Default time range for averaging in minutes. This is preset to {None}, which disables
averaging of port traffic.
-linux_nic_check(string): Set this to {"lnx_if"} if you want inventory this find this check
- instead of the old check {"netif.link"}, {"netif.params"} and {"netctr"}.
diff --git a/checkman/netctr.combined b/checkman/netctr.combined
index a7d94ce..7918a77 100644
--- a/checkman/netctr.combined
+++ b/checkman/netctr.combined
@@ -10,10 +10,7 @@ description:
is the number of errors and collisions compared
to the number of packets transmitted during one check interval.
- Note: this check is deprecated. Better use {lnx_if}. Set {linux_nic_check = "lnx_if"}
- in your configuration in order to turn on inventory of {lnx_if} and turn it
- of for this check.
-
+ Note: this check is deprecated. Better use {lnx_if}.
item:
The name of the network interface as shown by {ifconfig},
for example {"eth0"}
diff --git a/checkman/netif.link b/checkman/netif.link
index 6357056..2a5b27b 100644
--- a/checkman/netif.link
+++ b/checkman/netif.link
@@ -6,7 +6,4 @@ distribution: check_mk
description:
This check monitors the link status of Linux network interfaces.
- Note: this check is deprecated. Better use {lnx_if}. Set {linux_nic_check =
- "lnx_if"} in your configuration in order to turn on inventory of {lnx_if}
- and turn it of for this check.
-
+ Note: this check is deprecated. Better use {lnx_if}.
diff --git a/checkman/netif.params b/checkman/netif.params
index 176c2c1..6385603 100644
--- a/checkman/netif.params
+++ b/checkman/netif.params
@@ -6,8 +6,5 @@ distribution: check_mk
description:
This check monitors the link status of Linux network interfaces.
- Note: this check is deprecated. Better use {lnx_if}. Set {linux_nic_check =
- "lnx_if"} in your configuration in order to turn on inventory of {lnx_if}
- and turn it of for this check.
-
+ Note: this check is deprecated. Better use {lnx_if}.
ok states of log messages
User-Agent: Heirloom mailx 12.4 7/29/08
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Module: check_mk
Branch: master
Commit: adb19c226a7c3852a159ec64e180c620ca1cab07
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=adb19c226a7c38…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Mon Nov 19 12:23:18 2012 +0100
logwatch: Fixed confusion with ignore/ok states of log messages
---
ChangeLog | 3 +++
checks/logwatch | 24 ++++++------------------
web/plugins/wato/check_parameters.py | 5 -----
3 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 4d60a59..d37a685 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,9 @@
WATO:
* Cloning of contact/host/service groups (without members)
+ Checks:
+ * logwatch: Fixed confusion with ignore/ok states of log messages
+
1.2.1i2:
Core:
diff --git a/checks/logwatch b/checks/logwatch
index 57e1c9a..dd94dca 100644
--- a/checks/logwatch
+++ b/checks/logwatch
@@ -71,7 +71,7 @@ def inventory_logwatch(info):
# appearance.
#
# PATTERN is a list like:
-# [ ( 'I', ".*ssh.*" ), # Make informational (OK) messages from these
+# [ ( 'O', ".*ssh.*" ), # Make informational (OK) messages from these
# ( (10, 20), "login" ), # Warning at 10 messages, Critical at 20
# ( 'C', "bad" ), # Always critical
# ( 'W', "not entirely bad" ), # Always warning
@@ -88,15 +88,13 @@ def logwatch_state(state):
return "OK"
def logwatch_level_name(level):
- if level == 'I': return 'OK'
- elif level == 'O': return 'OK'
+ if level == 'O': return 'OK'
elif level == 'W': return 'WARN'
elif level == 'C': return 'CRIT'
else: return 'IGN'
def logwatch_level_worst(worst, level):
- if level == 'I': return max(worst, 0)
- elif level == 'O': return max(worst, 0)
+ if level == 'O': return max(worst, 0)
elif level == 'W': return max(worst, 1)
elif level == 'C': return max(worst, 2)
else: return worst
@@ -112,17 +110,7 @@ def logwatch_precompile(hostname, item, _unused):
rules = service_extra_conf(hostname, item, logwatch_rules)
for rule in rules:
for pattern in rule:
- # The specification of "O" -> OK and "I" -> IGNORE is not equal to the.
- # states reported by the logwatch agent. The agent sends "I" for OK messages.
- # This is really a nastiness. We do not change the valuespec for th moment but
- # only modify the levels taken from the defined rules.
- # FIXME: Oneday we should clean it up. Maybe via hint in migration nodes or
- # some mor inteligent valuespec, ...
- if pattern[0] == 'I': # Fix "IGNORE" declaration
- level = 'S'
- else:
- level = pattern[0]
- params.append((level, pattern[1]))
+ params.append((pattern[0], pattern[1]))
# Now load the old logwatch_patterns var
patterns = logwatch_patterns.get(item)
@@ -247,7 +235,7 @@ def check_logwatch(item, params, info):
for line in loglines:
worst = logwatch_level_worst(worst, logwatch_parse_line(line)[0])
- # Ignore log lines which result in an "S" -> "Skip / Ignore" state
+ # Ignore log lines which result in an "I" -> "Ignore" state
if worst > -1:
try:
logarch = file(logfile, "a+")
@@ -412,7 +400,7 @@ def logwatch_to_prio(level):
return 4
elif level == 'C':
return 2
- elif level == 'I':
+ elif level == '0':
return 5
def syslog_time():
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 08cbe12..030bc03 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -103,11 +103,6 @@ register_rule(group + '/' + subgroup_applications,
elements = [
DropdownChoice(
title = _("State"),
- # The specification of "O" -> OK and "I" -> IGNORE is not equal to the.
- # states reported by the logwatch agent. The agent sends "I" for OK messages.
- # This is really a nastiness here. Since this rule definition is already part
- # of a released version we don't change it here, instead we clean it up in
- # the logwatch check before applying the rules.
choices = [
('C', _('CRITICAL')),
('W', _('WARNING')),
Module: check_mk
Branch: master
Commit: a2d6c548b9dcb5dbab773f42185a0aecbf5ff4a2
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a2d6c548b9dcb5…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Nov 18 14:59:11 2012 +0100
added HOST/SERVICEPROBLEMID to notification macros
---
ChangeLog | 2 ++
check_mk_templates.cfg | 2 ++
web/plugins/wato/globals_notification.py | 6 +++++-
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 88d1d14..4d60a59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
1.2.1i3:
+ Core:
+ * added HOST/SERVICEPROBLEMID to notification macros
Event Console:
* New performance counter for client request processing time
* FIX: fixed bug in rule optimizer with ranges of syslog priorities
diff --git a/check_mk_templates.cfg b/check_mk_templates.cfg
index 8e7686c..c99bd1e 100644
--- a/check_mk_templates.cfg
+++ b/check_mk_templates.cfg
@@ -313,6 +313,8 @@ define command {
NOTIFY_NOTIFICATIONTYPE='$NOTIFICATIONTYPE$' \
NOTIFY_HOSTNOTIFICATIONNUMBER='$HOSTNOTIFICATIONNUMBER$' \
NOTIFY_SERVICENOTIFICATIONNUMBER='$SERVICENOTIFICATIONNUMBER$' \
+ NOTIFY_HOSTPROBLEMID='$HOSTPROBLEMID$' \
+ NOTIFY_SERVICEPROBLEMID='$SERVICEPROBLEMID$' \
NOTIFY_HOSTNAME='$HOSTNAME$' \
NOTIFY_HOSTALIAS='$HOSTALIAS$' \
NOTIFY_HOSTADDRESS='$HOSTADDRESS$' \
diff --git a/web/plugins/wato/globals_notification.py b/web/plugins/wato/globals_notification.py
index d66af2d..67cba82 100644
--- a/web/plugins/wato/globals_notification.py
+++ b/web/plugins/wato/globals_notification.py
@@ -115,7 +115,11 @@ register_configvar(group,
"<tt><b>$SERVICEOUTPUT$</b></tt>: the output of the check command , "
"<tt><b>$LONGSERVICEOUTPUT$</b></tt>: the long output of the check command, "
"<tt><b>$SERVICEPERFDATA$</b></tt>: the performance data of the check, "
- "<tt><b>$SERVICECHECKCOMMAND$</b></tt>: the name of the service check command"
+ "<tt><b>$SERVICECHECKCOMMAND$</b></tt>: the name of the service check command, "
+ "<tt><b>HOSTPROBLEMID</b></tt>: a unique ID of the host problem this notification is about, "
+ "<tt><b>SERVICEPROBLEMID</b></tt>: the same for service problems, "
+ "<tt><b>HOSTNOTIFICATIONNUMBER</b></tt>: the number of notification of this host problem (begins with 1), "
+ "<tt><b>SERVICENOTIFICATIONNUMBER</b></tt>: same for service problems, "
"<br><br>"
"<tt><b>$MONITORING_HOST$</b></tt>: the host name of the monitoring server "
"<tt><b>$OMD_ROOT$</b></tt>: the home directory of the OMD site (only on OMD) "
Module: check_mk
Branch: master
Commit: de6087820df09f3a6812c0be26205b05f727bed7
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=de6087820df09f…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Nov 18 14:30:40 2012 +0100
FIX: fixed detection of existing groups when creating new groups
Conflicts:
ChangeLog
---
ChangeLog | 7 +++++++
web/htdocs/wato.py | 2 ++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7b432e9..88d1d14 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -120,6 +120,13 @@
* winperf_phydisk: monitor average queue length for read/write
1.2.0p4:
+ WATO:
+ * FIX: fixed detection of existing groups when creating new groups
+
+
+1.2.0p3:
+ Mulitisite
+ * Added "view" parameter to dashlet_pnpgraph webservice
* FIX: BI: Assuming "OK" for hosts is now possible
* FIX: Fixed error in makeuri() calls when no parameters in URL
* FIX: Try out mode in view editor does not show context buttons anymore
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index a0135f7..b8604bc 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -5807,6 +5807,8 @@ def mode_edit_group(phase, what):
raise MKUserError("name", _("Sorry, spaces are not allowed in group names."))
if not re.match("^[-a-z0-9A-Z_]*$", name):
raise MKUserError("name", _("Invalid group name. Only the characters a-z, A-Z, 0-9, _ and - are allowed."))
+ if name in groups:
+ raise MKUserError("name", _("Sorry, there is already a group with that name"))
groups[name] = alias
log_pending(SYNCRESTART, None, "edit-%sgroups" % what, _("Create new %s group %s" % (what, name)))
else:
Module: check_mk
Branch: master
Commit: a756bb3faecfa93696749e30a903c4a7e983b66b
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a756bb3faecfa9…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Sun Nov 18 14:28:32 2012 +0100
WATO: Cloning of contact/host/service groups (without members)
---
ChangeLog | 3 +++
web/htdocs/wato.py | 12 ++++++++++--
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3de6b68..7b432e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
* New performance counter for client request processing time
* FIX: fixed bug in rule optimizer with ranges of syslog priorities
+ WATO:
+ * Cloning of contact/host/service groups (without members)
+
1.2.1i2:
Core:
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index d23391b..a0135f7 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -5755,8 +5755,10 @@ def mode_groups(phase, what):
html.write('<tr class="data %s0">' % odd)
edit_url = make_link([("mode", "edit_%s_group" % what), ("edit", name)])
delete_url = html.makeactionuri([("_delete", name)])
+ clone_url = make_link([("mode", "edit_%s_group" % what), ("clone", name)])
html.write("<td class=buttons>")
html.icon_button(edit_url, _("Properties"), "edit")
+ html.icon_button(clone_url, _("Create a copy of this group"), "clone")
html.icon_button(delete_url, _("Delete"), "delete")
html.write("</td><td>%s</td><td>%s</td>" % (name, alias))
if what == "contact":
@@ -5821,7 +5823,8 @@ def mode_edit_group(phase, what):
html.help(_("The name of the group is used as an internal key. It cannot be "
"changed later. It is also visible in the status GUI."))
if new:
- html.text_input("name")
+ clone_group = html.var("clone")
+ html.text_input("name", clone_group or "")
html.set_focus("name")
else:
html.write(name)
@@ -5829,7 +5832,12 @@ def mode_edit_group(phase, what):
forms.section(_("Alias"))
html.help(_("An Alias or description of this group."))
- html.text_input("alias", name and groups.get(name, "") or "")
+ alias = groups.get(name, "")
+ if not alias and clone_group:
+ alias = groups.get(clone_group, "")
+ if not alias:
+ alias = name
+ html.text_input("alias", alias)
forms.end()
html.button("save", _("Save"))
html.hidden_fields()