Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64477 discussions

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by Mathias Kettner

Module: check_mk Branch: master Commit: b7c88e578337842324013677f447a5322c480e5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b7c88e57833784… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 9 17:01:57 2013 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

11 years, 2 months

Check_MK Git: check_mk: FIX: Fixed wrong default settings of view filters in localized multisit

by Lars Michelsen

Module: check_mk Branch: master Commit: 3a5b5e2f574fa0a66a2b2ef5059d19064f278aa0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a5b5e2f574fa0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 9 13:27:46 2013 +0200 FIX: Fixed wrong default settings of view filters in localized multisit --- ChangeLog | 1 + web/htdocs/views.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4ad6df4..578080f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -79,6 +79,7 @@ * FIX: better error message in case of exception in SNMP handling * FIX: Inventory screen: Now shows custom checks * FIX: Fixed locking problem of multisite pages related to user loading/saving + * FIX: Fixed wrong default settings of view filters in localized multisite WATO: * Allow to configure check-/retry_interval in second precision diff --git a/web/htdocs/views.py b/web/htdocs/views.py index c980681..933ce87 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -641,7 +641,7 @@ def page_edit_view(): ("show", _("Show to user")), ("hide", _("Use for linking")), ("hard", _("Hardcode"))], - "", "filter_activation(this)") + "off", "filter_activation(this)") show_filter(filt) html.write('</div>') html.write('<div class=clear></div>')

11 years, 2 months

Check_MK Git: check_mk: Reporting: begin outage statistics

by Mathias Kettner

Module: check_mk Branch: master Commit: ccc693e571a7d57ca4371f5a160e95cc0f98c3b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ccc693e571a7d5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 9 12:40:40 2013 +0200 Reporting: begin outage statistics --- web/plugins/views/availability.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 227e906..f564561 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -203,6 +203,19 @@ avoption_entries = [ ), ), + # Show colummns for min, max, avg duration and count + # ( "show_aggregations", + # "double", + # ListChoice( + # title = _("Outage statistics"), + # choices = [ + # ( "foo", "FOO" ), + # ( "bar", "FABR" ), + # ] + # ), + # ), + + # How to deal with times out of the notification period ( "notification_period", "single", @@ -291,6 +304,7 @@ def render_availability_options(): "unknown" : "unknown", "host_down" : "host_down", }, + "outage_statistics" : [], "short_intervals" : 0, "dont_merge" : False, "summary" : "sum",

11 years, 2 months

Check_MK Git: check_mk: moved check manpage for wut_webio_io to correct name

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: a6723961f3283fba7683e50ad427c38ddaedfc2f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6723961f3283f… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Jul 9 12:02:23 2013 +0200 moved check manpage for wut_webio_io to correct name --- checkman/{wut_webio_io => wut_webio_io.inputs} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/checkman/wut_webio_io b/checkman/wut_webio_io.inputs similarity index 100% rename from checkman/wut_webio_io rename to checkman/wut_webio_io.inputs

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 246d83401d0976851612caf607235e1efa1a48dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=246d83401d0976… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 9 10:04:50 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Check_MK Git: check_mk: Fixed dimensions of nagvis icon

by Lars Michelsen

Module: check_mk Branch: master Commit: e59d32ec1f001be3b4c4db2c45be636838d930ce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e59d32ec1f001b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jul 9 10:04:47 2013 +0200 Fixed dimensions of nagvis icon --- web/htdocs/images/icon_nagvis.png | Bin 6073 -> 7189 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web/htdocs/images/icon_nagvis.png b/web/htdocs/images/icon_nagvis.png index 455ead1..54564d6 100644 Binary files a/web/htdocs/images/icon_nagvis.png and b/web/htdocs/images/icon_nagvis.png differ

11 years, 2 months

Check_MK Git: check_mk: WATO rule icon: fix case where there is no item

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e0184a7d584f5935f8adbdcf863748f8e4fd7a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e0184a7d584f5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Jul 8 13:46:17 2013 +0200 WATO rule icon: fix case where there is no item --- web/htdocs/wato.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c475d1f..4746507 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10080,7 +10080,10 @@ def mode_edit_ruleset(phase): descr_pattern = checks[check_command]["service_description"].replace("%s", "(.*)") matcher = re.search(descr_pattern, html.var("service_description")) if matcher: - item = matcher.group(1) + try: + item = matcher.group(1) + except: + item = None elif check_command.startswith("check_mk_active-"): check_command = check_command[16:].split(" ")[0][:-1] varname = "active_checks:" + check_command

11 years, 2 months

Check_MK Git: check_mk: Showing view title in view deletion confirm message

by Lars Michelsen

Module: check_mk Branch: master Commit: 794e3eb7e01f244931d62049b0a9127751cc0c0f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=794e3eb7e01f24… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 8 13:45:13 2013 +0200 Showing view title in view deletion confirm message --- web/htdocs/views.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 77edcde..c980681 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -340,11 +340,13 @@ def page_edit_views(msg=None): load_views() # Deletion of views - delname = html.var("_delete") - if delname and html.confirm(_("Please confirm the deletion of the view <tt>%s</tt>.") % delname): - del html.multisite_views[(config.user_id, delname)] - save_views(config.user_id) - html.reload_sidebar(); + delname = html.var("_delete") + if delname: + deltitle = html.multisite_views[(config.user_id, delname)]['title'] + if html.confirm(_("Please confirm the deletion of the view \"%s\".") % deltitle): + del html.multisite_views[(config.user_id, delname)] + save_views(config.user_id) + html.reload_sidebar() html.begin_form("create_view", "edit_view.py")

11 years, 2 months

Check_MK Git: check_mk: wato users: Using dynamic field names to prevent autocompletion of passwords in chrome

by Lars Michelsen

Module: check_mk Branch: master Commit: 8cf1ec8162e1890a1c570f9128b9bb7e81cc2f0d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cf1ec8162e189… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 8 13:35:26 2013 +0200 wato users: Using dynamic field names to prevent autocompletion of passwords in chrome --- web/htdocs/wato.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8d69a4f..c475d1f 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8063,8 +8063,10 @@ def mode_edit_user(phase): user = users.get(cloneid, userdb.new_user_template('htpasswd')) else: user = userdb.new_user_template('htpasswd') + pw_suffix = 'new' else: user = users.get(userid, userdb.new_user_template('htpasswd')) + pw_suffix = userid # Returns true if an attribute is locked and should be read only. Is only # checked when modifying an existing user @@ -8121,8 +8123,8 @@ def mode_edit_user(phase): increase_serial = True # password changed, reflect in auth serial else: - password = html.var("password", '').strip() - password2 = html.var("password2", '').strip() + password = html.var("password_" + pw_suffix, '').strip() + password2 = html.var("password2_" + pw_suffix, '').strip() # Detect switch back from automation to password if "automation_secret" in new_user: @@ -8269,9 +8271,9 @@ def mode_edit_user(phase): _("Normal user login with password")) html.write("<ul><table><tr><td>%s</td><td>" % _("password:")) if not is_locked('password'): - html.password_input("password", autocomplete="off") + html.password_input("password_" + pw_suffix, autocomplete="off") html.write("</td></tr><tr><td>%s</td><td>" % _("repeat:")) - html.password_input("password2", autocomplete="off") + html.password_input("password2_" + pw_suffix, autocomplete="off") html.write(" (%s)" % _("optional")) else: html.write('<i>%s</i>' % _('The password can not be changed (It is locked by the user connector).'))

11 years, 2 months

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by Lars Michelsen

Module: check_mk Branch: master Commit: 2f87c5bfb7df6c3b3b1397485934c622ac6d92c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f87c5bfb7df6c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 8 13:36:59 2013 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

11 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits