Module: check_mk
Branch: master
Commit: 3d08aff1b87f5c445aa321acfc075eb24c30354a
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d08aff1b87f5c…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Feb 20 13:52:36 2015 +0100
Renamed inventorized into discovered
---
web/htdocs/wato.py | 8 ++++----
web/plugins/wato/check_parameters.py | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index ad6cabf..34a61b6 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -2569,7 +2569,7 @@ def mode_object_parameters(phase):
}[origin]
render_rule_reason(_("Type of check"), None, "", "", False, origin_txt)
- # First case: inventorized checks. They come from var/check_mk/autochecks/HOST.
+ # First case: discovered checks. They come from var/check_mk/autochecks/HOST.
if origin == "auto":
checkgroup = serviceinfo["checkgroup"]
checktype = serviceinfo["checktype"]
@@ -2585,8 +2585,8 @@ def mode_object_parameters(phase):
serviceinfo["item"], serviceinfo["parameters"])
else:
- # Note: some inventorized checks have a check group but
- # *no* ruleset for inventorized checks. One example is "ps".
+ # Note: some discovered checks have a check group but
+ # *no* ruleset for discovered checks. One example is "ps".
# That can be configured as a manual check or created by
# inventory. But in the later case all parameters are set
# by the inventory. This will be changed in a later version,
@@ -15318,7 +15318,7 @@ def register_rule(group, varname, valuespec = None, title = None,
# 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, register_static_check=True):
- # Register rule for inventorized checks
+ # Register rule for discovered checks
if valuespec and has_inventory: # would be useless rule if check has no parameters
itemenum = None
if itemspec:
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index e61bf9b..1743551 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -26,7 +26,7 @@
# Rules for configuring parameters of checks (services)
-register_rulegroup("checkparams", _("Parameters for Inventorized Checks"),
+register_rulegroup("checkparams", _("Parameters for discovered checks"),
_("Levels and other parameters for checks found by the Check_MK service discovery.\n"
"Use these rules in order to define parameters like filesystem levels, "
"levels for CPU load and other things for services that have been found "
@@ -5460,11 +5460,11 @@ register_check_parameters(
help = _("State the disk is expected to be in. Typical good states "
"are online, host spare, OK and the like. The exact way of how "
"to specify a state depends on the check and hard type being used. "
- "Please take examples from inventorized checks for reference.")),
+ "Please take examples from discovered checks for reference.")),
TextAscii(
title = _("Number or ID of the disk"),
help = _("How the disks are named depends on the type of hardware being "
- "used. Please look at already inventorized checks for examples.")),
+ "used. Please look at already discovered checks for examples.")),
"first"
)
Module: check_mk
Branch: master
Commit: 0fd695831991812951d3a9fcef369b2efb5de2ac
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0fd69583199181…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Feb 20 12:36:03 2015 +0100
#2004 FIX windows_updates: fix exception in WATO when displaying default levels
---
.werks/2004 | 10 ++++++++++
ChangeLog | 1 +
checks/windows_updates | 4 ++--
web/htdocs/wato.py | 7 ++++++-
web/plugins/wato/check_parameters.py | 15 ++++++++-------
5 files changed, 27 insertions(+), 10 deletions(-)
diff --git a/.werks/2004 b/.werks/2004
new file mode 100644
index 0000000..634b188
--- /dev/null
+++ b/.werks/2004
@@ -0,0 +1,10 @@
+Title: windows_updates: fix exception in WATO when displaying default levels
+Level: 1
+Component: checks
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1424432147
+
+
diff --git a/ChangeLog b/ChangeLog
index a7b7eca..84ed61d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -169,6 +169,7 @@
* 1999 FIX: raritan_pdu_inlet_summary, raritan_pdu_inlet, ups_socomec_outphase: renamed services to be consistent...
NOTE: Please refer to the migration notes!
* 2000 FIX: check_mk_agent.freebsd: Add missing <<<local>>> section, plugins was twice instead...
+ * 2004 FIX: windows_updates: fix exception in WATO when displaying default levels
Multisite:
* 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report...
diff --git a/checks/windows_updates b/checks/windows_updates
index cdd4acf..717ff52 100644
--- a/checks/windows_updates
+++ b/checks/windows_updates
@@ -38,7 +38,7 @@
import datetime
-windows_updates_default_params = (None, None, None, None, None, None, True)
+windows_updates_default_params = (0, 0, 0, 0, 604800, 172800, True)
def inventory_windows_updates(info):
if info and len(info[0]) == 3:
@@ -99,7 +99,7 @@ def check_windows_updates(_unused, params, info):
date, time = forced_reboot
year, month, day = map(int, date.split("-"))
hour, minute, second = map(int, time.split(":"))
- force_date = datetime.datetime( year, month, day, hour, minute, second)
+ force_date = datetime.datetime(year, month, day, hour, minute, second)
now = datetime.datetime.now()
nix = datetime.timedelta(seconds=0)
# check if force_date is in the future
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 0c53c48..ad6cabf 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -2733,7 +2733,12 @@ def output_analysed_ruleset(all_rulesets, rulespec, hostname, service, known_set
pass
elif known_settings is not PARAMETERS_UNKNOWN:
- html.write(valuespec.value_to_text(known_settings))
+ try:
+ html.write(valuespec.value_to_text(known_settings))
+ except Exception, e:
+ if config.debug:
+ raise
+ html.write(_("Invalid parameter %r: %s") % (known_settings, e))
else:
# For match type "dict" it can be the case the rule define some of the keys
diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py
index 483fc04..e61bf9b 100644
--- a/web/plugins/wato/check_parameters.py
+++ b/web/plugins/wato/check_parameters.py
@@ -6703,16 +6703,17 @@ register_check_parameters(
register_check_parameters(
subgroup_applications,
"windows_updates",
- _("WSUS"),
+ _("WSUS (Windows Updates)"),
Tuple(
title = _("Parameters for the Windows Update Check with WSUS"),
+ help = _("Set the according numbers to 0 if you want to disable alerting."),
elements = [
- Integer(title = _("Warning level for important updates")),
- Integer(title = _("Critical level for important updates")),
- Integer(title = _("Warning level for optional updates")),
- Integer(title = _("Critical level for optional updates")),
- Age(title = _("Warning level for time until forced reboot"), default_value = 604800),
- Age(title = _("Critical level for time until forced reboot"), default_value = 172800),
+ Integer(title = _("Warning if at least this number of important updates are pending")),
+ Integer(title = _("Critical if at least this number of important updates are pending")),
+ Integer(title = _("Warning if at least this number of optional updates are pending")),
+ Integer(title = _("Critical if at least this number of optional updates are pending")),
+ Age(title = _("Warning if time until forced reboot is less then"), default_value = 604800),
+ Age(title = _("Critical if time time until forced reboot is less then"), default_value = 172800),
Checkbox(title = _("display all important updates verbosely"), default_value = True),
],
),
Module: check_mk
Branch: master
Commit: 7295ac8cf6ca433df31b2436fe9520a3f1dd9849
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7295ac8cf6ca43…
Author: Sven Rueß <sr(a)mathias-kettner.de>
Date: Fri Feb 20 12:22:39 2015 +0100
#1950 ibm_svc_mdisk / disk checks: now able to configure the return state for state and mode of disk
The check ibm_svc_mdisk now has configurable result states for states and modes of hard disk via WATO.
New limits:
<ul>
<li>State online</li>
<li>State degraded</li>
<li>State offline</li>
<li>State excluded</li>
<li>Mode managed</li>
<li>Mode array</li>
<li>Mode image</li>
<li>Mode unmanaged</li>
</ul>
The result state can be configured independently for every state and mode to all monitoring states.
---
.werks/1950 | 23 ++++++++++++
ChangeLog | 1 +
checkman/ibm_svc_mdisk | 53 ++++++++++++++++++++++++----
checks/ibm_svc_mdisk | 61 ++++++++++++++++++++++----------
web/plugins/wato/check_parameters.py | 64 ++++++++++++++++++++++++++++++++++
5 files changed, 177 insertions(+), 25 deletions(-)
Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7295ac8cf6…
Module: check_mk
Branch: master
Commit: 24c0fd9f3e8ffda95a233f93b6152a94a93b41cd
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24c0fd9f3e8ffd…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Feb 20 12:16:25 2015 +0100
#2003 FIX Fix saving of "Users are allowed to directly login into the Web GUI of this site"
This checkbox was never saved and always set to checked. This has been fixed.
---
.werks/2003 | 10 ++++++++++
ChangeLog | 1 +
2 files changed, 11 insertions(+)
diff --git a/.werks/2003 b/.werks/2003
new file mode 100644
index 0000000..d0ad6fe
--- /dev/null
+++ b/.werks/2003
@@ -0,0 +1,10 @@
+Title: Fix saving of "Users are allowed to directly login into the Web GUI of this site"
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1424430940
+
+This checkbox was never saved and always set to checked. This has been fixed.
diff --git a/ChangeLog b/ChangeLog
index ce875d2..1cd42a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -244,6 +244,7 @@
* 2001 FIX: Fix exception of missing .site when editing a non-existing host
* 2002 FIX: Mark slave sites as dirty if BI aggregates are changes and login is allowed...
* 2009 FIX: Fixed styling of site login page for establishing a distributed monitoring WATO sync...
+ * 2003 FIX: Fix saving of "Users are allowed to directly login into the Web GUI of this site"...
Notifications:
* 1662 notification plugin spectrum: finalized script. now able to handle host notications
Module: check_mk
Branch: master
Commit: 5c804905aad03d8577becb52372790773627ec23
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c804905aad03d…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Fri Feb 20 12:15:34 2015 +0100
#2002 FIX Mark slave sites as dirty if BI aggregates are changes and login is allowed
If you have remote sites that are connected via distributed WATO and user login
is allowed on that sites then now changes to BI aggregates will correctly set
these sites to <i>Sync required</i>.
---
.werks/2002 | 12 ++++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 19 +++++++++++++------
3 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/.werks/2002 b/.werks/2002
new file mode 100644
index 0000000..4527177
--- /dev/null
+++ b/.werks/2002
@@ -0,0 +1,12 @@
+Title: Mark slave sites as dirty if BI aggregates are changes and login is allowed
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1424430866
+
+If you have remote sites that are connected via distributed WATO and user login
+is allowed on that sites then now changes to BI aggregates will correctly set
+these sites to <i>Sync required</i>.
diff --git a/ChangeLog b/ChangeLog
index 92e3c3c..ce875d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -242,6 +242,7 @@
* 1986 FIX: Added nicer error message when calling the rename host page with a non existant host
* 1987 FIX: Editing auxtags shows existing topics in dropdown instead of as "create new topic"
* 2001 FIX: Fix exception of missing .site when editing a non-existing host
+ * 2002 FIX: Mark slave sites as dirty if BI aggregates are changes and login is allowed...
* 2009 FIX: Fixed styling of site login page for establishing a distributed monitoring WATO sync...
Notifications:
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 6a8ee20..0c53c48 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -10371,6 +10371,9 @@ def mode_edit_site(phase):
# Handle the insecure replication flag
new_site["insecure"] = html.get_checkbox("insecure")
+ # Allow direct user login
+ new_site["user_login"] = html.get_checkbox("user_login")
+
# Secret is not checked here, just kept
if not new and "secret" in old_site:
new_site["secret"] = old_site["secret"]
@@ -16341,7 +16344,7 @@ def mode_bi_rules(phase):
"the id <b>%s</b>?") % ruleid)
if c:
del aggregation_rules[ruleid]
- log_audit(None, "bi-delete-rule", _("Deleted BI rule with id %s") % ruleid)
+ log_pending(SYNC, None, "bi-delete-rule", _("Deleted BI rule with id %s") % ruleid)
save_bi_rules(aggregations, aggregation_rules)
elif c == False: # not yet confirmed
return ""
@@ -16353,7 +16356,7 @@ def mode_bi_rules(phase):
_("Do you really want to delete the aggregation number <b>%s</b>?") % (nr+1))
if c:
del aggregations[nr]
- log_audit(None, "bi-delete-aggregation", _("Deleted BI aggregation number %d") % (nr+1))
+ log_pending(SYNC, None, "bi-delete-aggregation", _("Deleted BI aggregation number %d") % (nr+1))
save_bi_rules(aggregations, aggregation_rules)
elif c == False: # not yet confirmed
return ""
@@ -16628,6 +16631,10 @@ def save_bi_rules(aggregations, aggregation_rules):
out.write(replace_constants(pprint.pformat(convert_aggregation_to_bi(aggregation))))
out.write(")\n")
+ # Make sure that BI aggregates are replicated to all other sites that allow
+ # direct user login
+ update_login_sites_replication_status()
+
def rename_host_in_bi(oldname, newname):
renamed = 0
aggregations, rules = load_bi_rules()
@@ -17024,10 +17031,10 @@ def mode_bi_edit_aggregation(phase):
raise MKUserError('rule_p_groups_0', _("Please define at least one aggregation group"))
if new:
aggregations.append(new_aggr)
- log_audit(None, "bi-new-aggregation", _("Created new BI aggregation %d") % (len(aggregations)))
+ log_pending(SYNC, None, "bi-new-aggregation", _("Created new BI aggregation %d") % (len(aggregations)))
else:
aggregations[nr] = new_aggr
- log_audit(None, "bi-new-aggregation", _("Modified BI aggregation %d") % (nr + 1))
+ log_pending(SYNC, None, "bi-new-aggregation", _("Modified BI aggregation %d") % (nr + 1))
save_bi_rules(aggregations, aggregation_rules)
return "bi_rules"
@@ -17164,14 +17171,14 @@ def mode_bi_edit_rule(phase):
if new:
del new_rule["id"]
aggregation_rules[ruleid] = new_rule
- log_audit(None, "bi-new-rule", _("Create new BI rule %s") % ruleid)
+ log_pending(SYNC, None, "bi-new-rule", _("Create new BI rule %s") % ruleid)
else:
aggregation_rules[ruleid].update(new_rule)
new_rule["id"] = ruleid
if bi_rule_uses_rule(aggregation_rules, new_rule, new_rule["id"]):
raise MKUserError(None, _("There is a cycle in your rules. This rule calls itself - "
"either directly or indirectly."))
- log_audit(None, "bi-edit-rule", _("Modified BI rule %s") % ruleid)
+ log_pending(SYNC, None, "bi-edit-rule", _("Modified BI rule %s") % ruleid)
save_bi_rules(aggregations, aggregation_rules)
return "bi_rules"
Module: check_mk
Branch: master
Commit: 1523d38bc989e126024b9b82bc4e12cb617523d6
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1523d38bc989e1…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri Feb 20 12:15:28 2015 +0100
#2009 FIX Fixed styling of site login page for establishing a distributed monitoring WATO sync
This page was not fitting our current form styling. This has been consolidated now.
---
.werks/2009 | 10 ++++++++++
ChangeLog | 1 +
web/htdocs/wato.py | 21 +++++++--------------
3 files changed, 18 insertions(+), 14 deletions(-)
diff --git a/.werks/2009 b/.werks/2009
new file mode 100644
index 0000000..1be39da
--- /dev/null
+++ b/.werks/2009
@@ -0,0 +1,10 @@
+Title: Fixed styling of site login page for establishing a distributed monitoring WATO sync
+Level: 1
+Component: wato
+Class: fix
+Compatible: compat
+State: unknown
+Version: 1.2.7i1
+Date: 1424430878
+
+This page was not fitting our current form styling. This has been consolidated now.
diff --git a/ChangeLog b/ChangeLog
index c9222f7..92e3c3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -242,6 +242,7 @@
* 1986 FIX: Added nicer error message when calling the rename host page with a non existant host
* 1987 FIX: Editing auxtags shows existing topics in dropdown instead of as "create new topic"
* 2001 FIX: Fix exception of missing .site when editing a non-existing host
+ * 2009 FIX: Fixed styling of site login page for establishing a distributed monitoring WATO sync...
Notifications:
* 1662 notification plugin spectrum: finalized script. now able to handle host notications
diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py
index 3d3702e..6a8ee20 100644
--- a/web/htdocs/wato.py
+++ b/web/htdocs/wato.py
@@ -9966,33 +9966,26 @@ def mode_sites(phase):
wato_html_head(_("Login into site '%s'") % site["alias"])
if error:
html.show_error(error)
- html.write("<div class=message>")
- html.write("<h3>%s</h3>" % _("Login credentials"))
- html.write(_("For the initial login into the slave site %s "
+
+ html.write('<p>%s</p>' % (_("For the initial login into the slave site %s "
"we need once your administration login for the Multsite "
"GUI on that site. Your credentials will only be used for "
"the initial handshake and not be stored. If the login is "
"successful then both side will exchange a login secret "
- "which is used for the further remote calls.") % site["alias"])
+ "which is used for the further remote calls.") % site["alias"]))
html.begin_form("login", method="POST")
- html.write("<table class=form>")
- html.write("<tr><td class=legend>%s</td>" % _("Administrator login"))
- html.write("<td class=content>")
- html.write("<table><tr><td>%s</td><td>" % _("Adminstrator name:"))
+ forms.header(_('Login credentials'))
+ forms.section(_('Adminstrator name:'))
html.text_input("_name")
html.set_focus("_name")
- html.write("</td></tr><tr><td>%s</td><td>" % _("Administrator password:"))
+ forms.section(_('Adminstrator password:'))
html.password_input("_passwd")
- html.write("</td></tr></table>")
- html.write("</td></tr>")
- html.write("<tr><td class=buttons colspan=2>")
+ forms.end()
html.button("_do_login", _("Login"))
html.button("_abort", _("Abort"))
- html.write("</td></tr></table>")
html.hidden_field("_login", login_id)
html.hidden_fields()
html.end_form()
- html.write("</div>")
return ""
return
Module: check_mk
Branch: master
Commit: c61ecf44381ab6f02f77a4ad06750d18a74281cb
URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c61ecf44381ab6…
Author: Sven Rueß <sr(a)mathias-kettner.de>
Date: Fri Feb 20 12:04:15 2015 +0100
ibm_svc_host: correction of spelling in manpage of check
---
checkman/ibm_svc_host | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/checkman/ibm_svc_host b/checkman/ibm_svc_host
index e915e35..1913623 100644
--- a/checkman/ibm_svc_host
+++ b/checkman/ibm_svc_host
@@ -6,14 +6,14 @@ distribution: check_mk
description:
Checks the status of hosts on IBM SVC / Storwize V3700 / V7000 presents volumes to.
- For every host category {active}, {inactive}, {degraded}, {offline}, {other} the
+ For every host category {active}, {inactive}, {degraded}, {offline} and {other} the
amount of hosts is compared to the configured limits.
For host category {active} the check returns {CRIT} if the amount of hosts is
equal or below the critical limit. The check returns {WARN} if the amount of hosts
is above critical limit and equal or below warning level. Otherwise the check returns {OK}.
- For host categories {inactive}, {degraded}, {offline}, {other} the check return {CRIT} if
+ For host categories {inactive}, {degraded}, {offline} and {other} the check return {CRIT} if
the amount of hosts is equal or above the critical limit. The check return {WARN} if
the amount of hosts is below critical limit and equal or above warning limit. Otherwise
the check return {OK}.