Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64359 discussions

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2ee4d78b26ff2248f9eb202810a7be6b3ca5eab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ee4d78b26ff22… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Jul 19 08:51:48 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

Check_MK Git: check_mk: Added permission to control the "clone host" feature in WATO

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 3cd2caad6d71e7391970e1edfd72ffce9b69102b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3cd2caad6d71e7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 14:18:14 2012 +0200 Added permission to control the "clone host" feature in WATO --- ChangeLog | 1 + web/htdocs/wato.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7effd3..e15e120 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * New Checks for Siemens Blades (BX600) WATO: + * Added permission to control the "clone host" feature in WATO * FIX: remove line about number of rules in rule set overview (that garbled the logical layout) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 8da1a09..3e79453 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -1309,7 +1309,8 @@ def show_hosts(folder): msg += ". " + _("The inventory of this host failed during a previous bulk inventory.") html.icon_button(services_url, msg, image) if config.may("wato.manage_hosts"): - html.icon_button(clone_url, _("Create a clone of this host"), "insert") + if config.may("wato.clone_hosts"): + html.icon_button(clone_url, _("Create a clone of this host"), "insert") html.icon_button(delete_url, _("Delete this host"), "delete") html.write("</td>\n") @@ -1799,6 +1800,9 @@ def mode_edithost(phase, new, cluster): if clonename and clonename not in g_folder[".hosts"]: raise MKGeneralException(_("You called this page with an invalid host name.")) + if clonename and not config.may("wato.clone_hosts"): + raise MKAuthException(_("Sorry, you are not allowed to clone hosts.")) + if clonename: title = _("Create clone of %s") % clonename host = g_folder[".hosts"][clonename] @@ -11483,6 +11487,12 @@ def load_plugins(): "<i>Modify existing hosts</i>."), [ "admin", "user" ]) + config.declare_permission("wato.clone_hosts", + _("Clone hosts"), + _("Clone existing hosts to create new ones from the existing one." + "Please also add the permission <i>Add & remove hosts</i>."), + [ "admin", "user" ]) + config.declare_permission("wato.random_hosts", _("Create random hosts"), _("The creation of random hosts is a facility for test and development "

12 years, 2 months

Check_MK Git: check_mk: Added new role/ permission matrix page in WATO to compare permissions of roles

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: aecb93f0698ae2d36ec83f972245697ec77e9e4e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aecb93f0698ae2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Jul 16 16:43:42 2012 +0200 Added new role/permission matrix page in WATO to compare permissions of roles --- ChangeLog | 2 + web/htdocs/wato.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index e15e120..5de0409 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ WATO: * Added permission to control the "clone host" feature in WATO + * Added new role/permission matrix page in WATO to compare + permissions of roles * FIX: remove line about number of rules in rule set overview (that garbled the logical layout) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3e79453..712568e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8071,6 +8071,7 @@ def mode_roles(phase): elif phase == "buttons": global_buttons() + html.context_button(_("Matrix"), make_link([("mode", "role_matrix")]), "matrix") return roles = load_roles() @@ -8172,7 +8173,6 @@ def mode_roles(phase): # - number of users with this role html.write("</table>") - def mode_edit_role(phase): id = html.var("edit") @@ -8372,6 +8372,63 @@ def rename_user_role(id, new_id): user["roles"].append(new_id) save_users(users) +def mode_role_matrix(phase): + if phase == "title": + return _("Role & Permission Matrix") + + elif phase == "buttons": + global_buttons() + return + + elif phase == "action": + return + + # Show table of builtin and user defined roles, sorted by alias + roles = load_roles() + role_list = roles.items() + role_list.sort(cmp = lambda a,b: cmp((a[1]["alias"],a[0]), (b[1]["alias"],b[0]))) + + html.write("<table class=data>") + html.write("<tr class=dualheader><th></th>") + num_roles = 1 + for id, role in role_list: + html.write('<th>%s</th>' % role['alias']) + num_roles += 1 + html.write("</tr>\n") + + # Loop all permission sections, but sorted plz + odd = "even" + for section, (prio, section_title) in sorted(config.permission_sections.iteritems(), + key = lambda x: x[1][0], reverse = True): + + html.write('<tr>') + html.write('<th colspan=%d>%s</th>' % (num_roles, section_title)) + html.write('</tr>') + + # Loop all permissions + for perm in config.permissions_by_order: + pname = perm["name"] + this_section = pname.split(".")[0] + if section != this_section: + continue # Skip permissions of other sections + + odd = odd == "odd" and "even" or "odd" + + html.write('<tr class="data %s0">' % odd) + html.write('<td class=title>%s</td>' % perm["title"]) + + for id, role in role_list: + base_on_id = role.get('basedon', id) + pvalue = role["permissions"].get(pname) + if pvalue is None: + pvalue = base_on_id in perm["defaults"] + + html.write('<td>%s</td>' % (pvalue and 'X' or '')) + + html.write('</tr>') + + html.write("</table>") + #. # .-Host-Tags------------------------------------------------------------. # | _ _ _ _____ | @@ -11368,6 +11425,7 @@ modes = { "users" : (["users"], mode_users), "edit_user" : (["users"], mode_edit_user), "roles" : (["users"], mode_roles), + "role_matrix" : (["users"], mode_role_matrix), "edit_role" : (["users"], mode_edit_role), "hosttags" : (["hosttags"], mode_hosttags), "edit_hosttag" : (["hosttags"], mode_edit_hosttag),

12 years, 2 months

Check_MK Git: check_mk: Introduce comment and disabling for rules

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a91e9d810e257df8f4de6716b05fe00cec897505 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a91e9d810e257d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 18 17:26:58 2012 +0200 Introduce comment and disabling for rules --- ChangeLog | 11 +++- modules/check_mk.py | 34 +++++++++++ web/htdocs/images/icon_disabled.png | Bin 0 -> 3640 bytes web/htdocs/wato.py | 107 ++++++++++++++++++++++++++++------- 4 files changed, 129 insertions(+), 23 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a91e9d810e…

12 years, 2 months

Check_MK Git: check_mk: New option prefix_values for ValueSpec DropdownChoice

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b82354b948fedd9a2f331a20a840001192be7743 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b82354b948fedd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 17 18:28:55 2012 +0200 New option prefix_values for ValueSpec DropdownChoice --- web/htdocs/valuespec.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 0de2dc7..4c85365 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -757,6 +757,7 @@ class DropdownChoice(ValueSpec): self._choices = kwargs["choices"] self._help_separator = kwargs.get("help_separator") self._label = kwargs.get("label") + self._prefix_values = kwargs.get("prefix_values", False) def choices(self): if type(self._choices) == list: @@ -778,6 +779,8 @@ class DropdownChoice(ValueSpec): defval = "0" options = [] for n, entry in enumerate(self.choices()): + if self._prefix_values: + entry = (entry[0], "%s - %s" % entry) options.append((str(n),) + entry[1:]) if entry[0] == value: defval = str(n)

12 years, 2 months

Check_MK Git: check_mk: Cosmetic code cleanup (added missing linefeed)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 67f622f3bfe3f33eb61a918af19008673cb9f907 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67f622f3bfe3f3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 17 14:40:01 2012 +0200 Cosmetic code cleanup (added missing linefeed) --- livestatus/src/logger.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/livestatus/src/logger.c b/livestatus/src/logger.c index d5a1911..3872e2c 100644 --- a/livestatus/src/logger.c +++ b/livestatus/src/logger.c @@ -67,7 +67,8 @@ void logger(int priority, const char *loginfo, ...) char timestring[64]; time_t now_t = time(0); struct tm now; localtime_r(&now_t, &now); - strftime(timestring, 64, "%F %T ", &now); fputs(timestring, g_logfile); + strftime(timestring, 64, "%F %T ", &now); + fputs(timestring, g_logfile); /* write log message */ vfprintf(g_logfile, loginfo, ap);

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b387092942428cc395d1f86606e0c50bb065df8a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b387092942428c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jul 17 14:40:05 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Check_MK Git: check_mk: hpux_tunables: Pretty Perf-O-Meters and PNP-Graphs for kernel tunable statistics from HP-UX systems

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7b24326fc2a2eca9f9c5f419558ee76a15f89578 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b24326fc2a2ec… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 13 18:20:50 2012 +0200 hpux_tunables: Pretty Perf-O-Meters and PNP-Graphs for kernel tunable statistics from HP-UX systems --- checks/hpux_tunables | 5 +- .../check_mk-hpux_tunables.maxfiles_lim.php | 1 + pnp-templates/check_mk-hpux_tunables.nkthread.php | 1 + pnp-templates/check_mk-hpux_tunables.nproc.php | 1 + pnp-templates/check_mk-hpux_tunables.php | 50 ++++++++++++++++++++ pnp-templates/check_mk-hpux_tunables.semmni.php | 1 + pnp-templates/check_mk-hpux_tunables.semmns.php | 1 + pnp-templates/check_mk-hpux_tunables.shmseg.php | 1 + web/plugins/perfometer/check_mk.py | 42 ++++++++++++++++ 9 files changed, 101 insertions(+), 2 deletions(-) diff --git a/checks/hpux_tunables b/checks/hpux_tunables index c0acc76..8a79f12 100644 --- a/checks/hpux_tunables +++ b/checks/hpux_tunables @@ -86,9 +86,10 @@ def check_hpux_tunables(item, params, info, hpux_tunable, thingname): state = 2 elif float(warn) < pct: state = 1 - perfdata = [ (thingname, usage, threshold, warn * mimi, crit * mimi) ] +# name = current , warn , crit , min , max + perfdata = [ (thingname, usage, warn * mimi, crit * mimi, 0, threshold) ] else: - perfdata = [ (thingname, usage, threshold, '', '') ] + perfdata = [ (thingname, usage, None, None, 0, threshold) ] return (state, nagios_state_names[state] + \ " - %.2f%% used" % pct + state * "!" + " (%d/%d %s) " % (usage, threshold, thingname), perfdata) diff --git a/pnp-templates/check_mk-hpux_tunables.maxfiles_lim.php b/pnp-templates/check_mk-hpux_tunables.maxfiles_lim.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.maxfiles_lim.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hpux_tunables.nkthread.php b/pnp-templates/check_mk-hpux_tunables.nkthread.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.nkthread.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hpux_tunables.nproc.php b/pnp-templates/check_mk-hpux_tunables.nproc.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.nproc.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hpux_tunables.php b/pnp-templates/check_mk-hpux_tunables.php new file mode 100644 index 0000000..3dd2c66 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.php @@ -0,0 +1,50 @@ +<?php +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2012 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# ails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +$title = str_replace("_", " ", substr($servicedesc, 10)); +$vertical = "Number"; +$format = "%4.0lf"; +$color = "8040f0"; +$line = "202060"; + +$opt[1] = " --vertical-label \"$vertical\" -X0 -L5 -l 0 -u $MAX[1] --title \"$title \" "; + +$def[1] = "DEF:var1=$RRDFILE[1]:$DS[1]:MAX ". + "AREA:$MAX[1]#f3f3f2:\"\" ". + "LINE:$MAX[1]#8b8989:\"Kernel threshold\" ". + "AREA:var1#$color:\"$title\" ". + "LINE1:var1#$line:\"\" ". + "GPRINT:var1:LAST:\"Current\: $format\" ". + "GPRINT:var1:MAX:\"Peak\: $format \" ". + ""; + +# Add in warning / crit if they're passed to us. +if (isset($WARN[1]) and $WARN[1] != "") { + $def[1] .= ""; + "HRULE:$WARN[1]#FFFF00:\"Warning at $WARN[1]\" ". + "HRULE:$CRIT[1]#FF0000:\"Critical at $CRIT[1]\" "; + } + +?> diff --git a/pnp-templates/check_mk-hpux_tunables.semmni.php b/pnp-templates/check_mk-hpux_tunables.semmni.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.semmni.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hpux_tunables.semmns.php b/pnp-templates/check_mk-hpux_tunables.semmns.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.semmns.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/pnp-templates/check_mk-hpux_tunables.shmseg.php b/pnp-templates/check_mk-hpux_tunables.shmseg.php new file mode 120000 index 0000000..271d5a1 --- /dev/null +++ b/pnp-templates/check_mk-hpux_tunables.shmseg.php @@ -0,0 +1 @@ +check_mk-hpux_tunables.php \ No newline at end of file diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 94300db..7673ff3 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -465,3 +465,45 @@ def perfometer_mssql_counters_cache_hits(row, check_command, perf_data): return "%.1f%%" % perc, h perfometers["check_mk-mssql_counters.cache_hits"] = perfometer_mssql_counters_cache_hits + + + +def perfometer_hpux_tunables(row, check_command, perf_data): + + varname, value, unit, warn, crit, minival, threshold = perf_data[0] + value = float(value) + threshold = float(threshold) + + + if warn != "" or crit != "": + warn = saveint(warn) + crit = saveint(crit) + + # go red if we're over crit + if value > crit: + color = "#f44" + # yellow + elif value > warn: + color = "#f84" + else: + # all green lights + color = "#2d3" + else: + # use a brown-ish color if we have no levels. + # otherwise it could be "green" all the way to 100% + color = "#f4a460" + + used = value / threshold * 100 + + return "%.0f%%" % (used), perfometer_linear(used, color) + +perfometers["check_mk-hpux_tunables.nproc"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.nkthread"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.maxfiles_lim"] = perfometer_hpux_tunables +# this one still doesn't load. I need more test data to find out why. +perfometers["check_mk-hpux_tunables.semmni"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.semmns"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.shmseg"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.nkthread"] = perfometer_hpux_tunables +perfometers["check_mk-hpux_tunables.nkthread"] = perfometer_hpux_tunables +

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 91a434f4b5d5863105302d5cdea10a07cfac008e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=91a434f4b5d586… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Fri Jul 13 18:21:04 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years, 2 months

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

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 9ac8ec7074da967bd62d563a0588017546be21f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ac8ec7074da96… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Jul 13 16:49:58 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 2 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits