Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: WATO: volatile topics now able to hande Basic Settings

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0279f4d098de6bbee923f4faef7c1ed8bd47d520 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0279f4d098de6b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 25 15:01:18 2011 +0100 WATO: volatile topics now able to hande Basic Settings --- web/htdocs/wato.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c0de3d1..51f5aa2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3874,7 +3874,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute html.write("</table>") html.end_foldable_container() # end of topic if topic_is_volatile: - volatile_topics.append(topic.encode('utf-8')) + volatile_topics.append((topic or _("Basic settings")) or topic.encode('utf-8')) if topic == topics[-1]: html.write('<table class="form nomargin">')

12 years, 9 months

Check_MK Git: check_mk: Simplify custom dashboard in non-OMD

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 679269384f43a3acc110373c47ff8c2483c690bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=679269384f43a3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 28 10:55:29 2011 +0100 Simplify custom dashboard in non-OMD --- web/plugins/dashboard/builtin.py | 132 +++++++++++++++++++------------------- 1 files changed, 65 insertions(+), 67 deletions(-) diff --git a/web/plugins/dashboard/builtin.py b/web/plugins/dashboard/builtin.py index 7215a84..5b11088 100644 --- a/web/plugins/dashboard/builtin.py +++ b/web/plugins/dashboard/builtin.py @@ -24,71 +24,69 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -builtin_dashboards = { - "main" : { - "title" : _("Main Overview"), - "dashlets" : [ -# { -# "url" : "dashlet_mk_logo.py", -# "position" : (1, 1), -# "size" : (4, 5), -# "shadow" : False, -# "background" : False, -# }, - { - "title" : _("Host Statistics"), - "url" : "dashlet_hoststats.py", - "position" : (1, 1), - "size" : (10, 6), - "shadow" : True, - "background" : True, - "refresh" : 60, - }, - { - "title" : _("Service Statistics"), - "url" : "dashlet_servicestats.py", - "position" : (11, 1), - "size" : (10, 6), - "shadow" : True, - "background" : True, - "refresh" : 60, - }, - { - "title" : _("Host Problems"), - "title_url" : "view.py?view_name=hostproblems", - "view" : "hostproblems_dash", # "view.py?view_name=hostproblems_dash&display_options=SIXHR&_body_class=dashlet", - "position" : (-1, 1), - "size" : (GROW, 6), - }, - { - "title" : _("Service Problems"), - "title_url" : "view.py?view_name=svcproblems", - "view" : "svcproblems_dash", # "view.py?view_name=svcproblems_dash&display_options=SIXHR&_body_class=dashlet", - "position" : (1, 7), - "size" : (GROW, MAX), - }, - { - "title" : _("Events of recent 4 hours"), - "title_url" : "view.py?view_name=events_dash", - "view" : "events_dash", # "view.py?view_name=events_dash&display_options=SIXHR&_body_class=dashlet", - "position" : (-1, -1), - "size" : (GROW, GROW), - }, - # { - # "title" : "CPU load of Nagios", - # # "url" : "http://localhost/dk/pnp4nagios/index.php/image?host=DerNagiosSelbst&srv=fs_…", - # "url" : "http://localhost/dk/pnp4nagios/index.php/popup?host=localhost&srv=CPU_load&…", - # "position" : (1, -1), - # "size" : (11, 5), - # }, - # { - # "title" : "CPU utilization of Nagios", - # # "url" : "http://localhost/dk/pnp4nagios/index.php/image?host=DerNagiosSelbst&srv=fs_…", - # "url" : "http://localhost/dk/pnp4nagios/index.php/popup?host=localhost&srv=CPU_utili…", - # "position" : (12, -1), - # "size" : (11, 5), - # }, - # { - ] - } +builtin_dashboards["main"] = { + "title" : _("Main Overview"), + "dashlets" : [ +# { +# "url" : "dashlet_mk_logo.py", +# "position" : (1, 1), +# "size" : (4, 5), +# "shadow" : False, +# "background" : False, +# }, + { + "title" : _("Host Statistics"), + "url" : "dashlet_hoststats.py", + "position" : (1, 1), + "size" : (10, 6), + "shadow" : True, + "background" : True, + "refresh" : 60, + }, + { + "title" : _("Service Statistics"), + "url" : "dashlet_servicestats.py", + "position" : (11, 1), + "size" : (10, 6), + "shadow" : True, + "background" : True, + "refresh" : 60, + }, + { + "title" : _("Host Problems"), + "title_url" : "view.py?view_name=hostproblems", + "view" : "hostproblems_dash", # "view.py?view_name=hostproblems_dash&display_options=SIXHR&_body_class=dashlet", + "position" : (-1, 1), + "size" : (GROW, 6), + }, + { + "title" : _("Service Problems"), + "title_url" : "view.py?view_name=svcproblems", + "view" : "svcproblems_dash", # "view.py?view_name=svcproblems_dash&display_options=SIXHR&_body_class=dashlet", + "position" : (1, 7), + "size" : (GROW, MAX), + }, + { + "title" : _("Events of recent 4 hours"), + "title_url" : "view.py?view_name=events_dash", + "view" : "events_dash", # "view.py?view_name=events_dash&display_options=SIXHR&_body_class=dashlet", + "position" : (-1, -1), + "size" : (GROW, GROW), + }, + # { + # "title" : "CPU load of Nagios", + # # "url" : "http://localhost/dk/pnp4nagios/index.php/image?host=DerNagiosSelbst&srv=fs_…", + # "url" : "http://localhost/dk/pnp4nagios/index.php/popup?host=localhost&srv=CPU_load&…", + # "position" : (1, -1), + # "size" : (11, 5), + # }, + # { + # "title" : "CPU utilization of Nagios", + # # "url" : "http://localhost/dk/pnp4nagios/index.php/image?host=DerNagiosSelbst&srv=fs_…", + # "url" : "http://localhost/dk/pnp4nagios/index.php/popup?host=localhost&srv=CPU_utili…", + # "position" : (12, -1), + # "size" : (11, 5), + # }, + # { + ] }

12 years, 9 months

Check_MK Git: check_mk: Fixed Changelog

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 006637386f38c2962a723a0bf5c1c5f45a2006e9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=006637386f38c2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 28 10:37:53 2011 +0100 Fixed Changelog --- ChangeLog | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4beaad4..ecd0f36 100644 --- a/ChangeLog +++ b/ChangeLog @@ -482,7 +482,7 @@ cases where OIDs are missing) * Allow merging of dictionary based check parameters * --debug now implies -v - * new option --debug: creates execution profile of check_mk itself + * new option --profile: creates execution profile of check_mk itself * sped up use of stored snmp walks * find configuration file in subdirectories of conf.d also * check_mk_templates.cfg: make check-mk-ping take arguments

12 years, 9 months

Check_MK Git: check_mk: livecheck: fixed running inventory check

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c67aedcf1e9d6a6e63e6d536e32a41babbd9c406 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c67aedcf1e9d6a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 28 09:06:33 2011 +0100 livecheck: fixed running inventory check --- .bugs/474 | 11 ++++++++--- livestatus/src/check_icmp.c | 3 +-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.bugs/474 b/.bugs/474 index 6d82dbc..b823663 100644 --- a/.bugs/474 +++ b/.bugs/474 @@ -1,11 +1,16 @@ Title: Check plugins are executed as root Component: livecheck -Benefit: 2 -State: open Cost: 1 Date: 2011-11-28 08:20:20 -Targetversion: 1.1.13i1 +State: done Class: bug +Benefit: 2 +Fun: 0 +Targetversion: 1.1.13i1 Currently livecheck seems to execute all plugins as root. This needs to be changed to the normal user. + +2011-11-28 09:06:18: changed state open -> done +The problem in fact was that the inline check_icmp deleted the +environment and bin/check_mk was missing OMD_ROOT. diff --git a/livestatus/src/check_icmp.c b/livestatus/src/check_icmp.c index 5c6ce0f..9f36b0b 100644 --- a/livestatus/src/check_icmp.c +++ b/livestatus/src/check_icmp.c @@ -182,7 +182,6 @@ static void crash(const char *, ...); /** external **/ extern int optind, opterr, optopt; extern char *optarg; -extern char **environ; /** global variables **/ static struct rta_host **table, *cursor, *list; @@ -413,7 +412,7 @@ int check_icmp(int argc, char **argv, char *output, int size) icmp_sockerrno = 0; /* POSIXLY_CORRECT might break things, so unset it (the portable way) */ - environ = NULL; + unsetenv("POSIXLY_CORRECT"); /* use the pid to mark packets as ours */ /* Some systems have 32-bit pid_t so mask off only 16 bits */

12 years, 9 months

Check_MK Git: check_mk: gb: do not use dot as selection character

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 90bfed82432bc62564465848d56fb1d1b916614d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=90bfed82432bc6… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 28 08:23:31 2011 +0100 gb: do not use dot as selection character --- gb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/gb b/gb index 45ed851..8f79147 100755 --- a/gb +++ b/gb @@ -346,7 +346,7 @@ def input_choice(what, choices): texts = [] for choice in choices: for c in choice: - if c not in ctc: + if c not in ".-_/" and c not in ctc: ctc[c] = choice texts.append(choice.replace(c, tty_bold + c + tty_normal, 1)) break

12 years, 9 months

Check_MK Git: check_mk: Reserved 50 bug IDS

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4fb5c2c19ead9e38d2f0cf9f04fc8e7d971c75e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4fb5c2c19ead9e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 28 08:20:14 2011 +0100 Reserved 50 bug IDS --- .bugs/config | 3 +++ .bugs/first_free | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/.bugs/config b/.bugs/config index 52e04cf..9f9c59d 100644 --- a/.bugs/config +++ b/.bugs/config @@ -11,8 +11,10 @@ components = [ "checks", "multisite", "livestatus", + "livecheck", "wato", "bi", + "mobile", "docu" ] @@ -27,6 +29,7 @@ classes = [ targetversions = [ "1.1.12", + "1.1.13i1", "1.2.0", "future", ] diff --git a/.bugs/first_free b/.bugs/first_free index 5f3bb98..97a0533 100644 --- a/.bugs/first_free +++ b/.bugs/first_free @@ -1 +1 @@ -474 +524

12 years, 9 months

Check_MK Git: check_mk: Updated bugs

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3e54972e890931ff388fced35221202998a229f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3e54972e890931… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 28 08:21:22 2011 +0100 Updated bugs --- .bugs/474 | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/.bugs/474 b/.bugs/474 new file mode 100644 index 0000000..6d82dbc --- /dev/null +++ b/.bugs/474 @@ -0,0 +1,11 @@ +Title: Check plugins are executed as root +Component: livecheck +Benefit: 2 +State: open +Cost: 1 +Date: 2011-11-28 08:20:20 +Targetversion: 1.1.13i1 +Class: bug + +Currently livecheck seems to execute all plugins as root. +This needs to be changed to the normal user.

12 years, 9 months

Check_MK Git: check_mk: Reload-button in snapins only for reloable snapins

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 61843f738251e26252ae98483ce073bd4aa3bb3e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=61843f738251e2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Nov 27 11:08:37 2011 +0100 Reload-button in snapins only for reloable snapins --- web/htdocs/sidebar.py | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/web/htdocs/sidebar.py b/web/htdocs/sidebar.py index 48abc0e..eb8677a 100644 --- a/web/htdocs/sidebar.py +++ b/web/htdocs/sidebar.py @@ -215,10 +215,12 @@ def render_snapin(name, state): html.write('<div class="closesnapin">') iconbutton("closesnapin", "sidebar_openclose.py?name=%s&state=off" % name, "side", "removeSnapin", 'snapin_'+name) html.write('</div>') - html.write('<div class="reloadsnapin">') - iconbutton("reloadsnapin", url="sidebar_snapin.py?name=" + name, handler="updateContents", - name = "snapin_" + name); - html.write('</div>') + # Show reload button, but only for reloadable Snapins + if snapin.get("reload") or snapin.get("restart"): + html.write('<div class="reloadsnapin">') + iconbutton("reloadsnapin", url="sidebar_snapin.py?name=" + name, handler="updateContents", + name = "snapin_" + name); + html.write('</div>') html.write("<b class=heading onclick=\"toggle_sidebar_snapin(this,'%s')\" onmouseover=\"this.style.cursor='pointer'\" " "onmouseout=\"this.style.cursor='auto'\">%s</b>" % (url, snapin["title"])) html.write("</div>")

12 years, 9 months

Check_MK Git: check_mk: Move styles of login from css/* to check_mk.css

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 37d21dbe8fe2a8b48a0c8dc1d9a03aee8237ccd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37d21dbe8fe2a8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Nov 26 21:00:40 2011 +0100 Move styles of login from css/* to check_mk.css (css/* is just for user supplied addons are style modifications) --- web/htdocs/check_mk.css | 43 +++++++++++++++++++++++++++++++++++++++++++ web/htdocs/css/login.css | 31 ------------------------------- 2 files changed, 43 insertions(+), 31 deletions(-) diff --git a/web/htdocs/check_mk.css b/web/htdocs/check_mk.css index 9c176cf..9c3c35a 100644 --- a/web/htdocs/check_mk.css +++ b/web/htdocs/check_mk.css @@ -2699,3 +2699,46 @@ table.debug_vars td { border: 1px solid #050; font-family: courier, monospace; } + +/* + .----------------------------------------------------------------------. + | _ _ | + | | | ___ __ _(_)_ __ | + | | | / _ \ / _` | | '_ \ | + | | |__| (_) | (_| | | | | | | + | |_____\___/ \__, |_|_| |_| | + | |___/ | + '----------------------------------------------------------------------' +*/ + +#login { + margin: 0; + height: 100%; + width: 100%; + text-align:center; +} +/*#login #logo { + width: 320px; + margin: 7em auto; + height: 55px; + background-repeat: no-repeat; + background-image: url("images/sidebar_top.png"); +}*/ +#login h1 { + width: 300px; + margin: 3em auto 2em auto; +} +#login a { + color: #ffffff; +} +#login a:hover { + text-decoration: none; +} +#login #table { + width: 320px; margin: 0 auto; +} +#login #foot { + font-size: 0.8em; + font-style: italic; + color: #ffffff; +} diff --git a/web/htdocs/css/login.css b/web/htdocs/css/login.css deleted file mode 100644 index ca11956..0000000 --- a/web/htdocs/css/login.css +++ /dev/null @@ -1,31 +0,0 @@ -#login { - margin: 0; - height: 100%; - width: 100%; - text-align:center; -} -/*#login #logo { - width: 320px; - margin: 7em auto; - height: 55px; - background-repeat: no-repeat; - background-image: url("../images/sidebar_top.png"); -}*/ -#login h1 { - width: 300px; - margin: 3em auto 2em auto; -} -#login a { - color: #ffffff; -} -#login a:hover { - text-decoration: none; -} -#login #table { - width: 320px; margin: 0 auto; -} -#login #foot { - font-size: 0.8em; - font-style: italic; - color: #ffffff; -}

12 years, 9 months

Check_MK Git: check_mk: WATO: handle visibility of topics (part1)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 20bf839f1cfb23e843f2af54ffc8a5448050b469 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=20bf839f1cfb23… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 25 14:55:53 2011 +0100 WATO: handle visibility of topics (part1) --- web/htdocs/wato.py | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 00fe13f..c0de3d1 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3678,7 +3678,9 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute dependency_mapping = {} inherited_tags = {} + volatile_topics = [] for topic in topics: + topic_is_volatile = True # assume topic is sometimes hidden due to dependencies if len(topics) > 1: if topic == None: title = _("Basic settings") @@ -3716,6 +3718,10 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute depends_on_tags = attr.depends_on_tags() if depends_on_tags: dependency_mapping[attrname] = depends_on_tags + else: + # One attribute is always shown -> topic can never + # be made invisible + topic_is_volatile = False # "bulk": determine, if this attribute has the same setting for all hosts. values = [] @@ -3866,7 +3872,9 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute if len(topics) > 1: html.write("</table>") - html.end_foldable_container() + html.end_foldable_container() # end of topic + if topic_is_volatile: + volatile_topics.append(topic.encode('utf-8')) if topic == topics[-1]: html.write('<table class="form nomargin">') @@ -3874,7 +3882,11 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute # of all attributes. html.javascript("var inherited_tags = %r;\n"\ "var wato_depends_on = %r;\n"\ - "wato_fix_visibility();\n" % (inherited_tags, dependency_mapping)) + "var volatile_topics = %r;\n"\ + "wato_fix_visibility();\n" % ( + inherited_tags, + dependency_mapping, + volatile_topics)) # Check if at least one host in a folder (or its subfolders)

12 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits