Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64477 discussions

Check_MK Git: check_mk: * Add: Require unique alias names in between the following elements:

by Andreas Boesl

Module: check_mk Branch: master Commit: 253c075d8917e03901b1a821ee4b2141fc993e4b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=253c075d8917e0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Jul 24 16:16:24 2013 +0200 * Add: Require unique alias names in between the following elements: Host/Service/Contact Groups, Timeperiods and Roles --- ChangeLog | 2 ++ web/htdocs/wato.py | 39 ++++++++++++++++++++++++++++++++++++--- 2 files changed, 38 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d19de41..b92bf12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -106,6 +106,8 @@ * Custom user attributes can now be managed using WATO * FIX: do validation of check items in rule editor * FIX: More consistent handling of folderpath select in rule editor + * Add: Require unique alias names in between the following elements: + Host/Service/Contact Groups, Timeperiods and Roles Notifications: * Flexible Notification can now filter service levels diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 9b610f4..c5cf0e6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -5860,9 +5860,11 @@ def mode_edit_group(phase, what): alias = html.var_utf8("alias").strip() if not alias: raise MKUserError("alias", _("Please specify an alias name.")) - for key, value in groups.items(): - if alias == value and name != key: - raise MKUserError("alias", _("This alias is already used in the group %s .") % key) + + unique, info = is_alias_used(what, name, alias) + if not unique: + raise MKUserError("alias", info) + if new: name = html.var("name").strip() if len(name) == 0: @@ -6204,6 +6206,10 @@ def mode_edit_timeperiod(phase): if not alias: raise MKUserError("alias", _("Please specify an alias name for your timeperiod.")) + unique, info = is_alias_used("timeperiods", name, alias) + if not unique: + raise MKUserError("alias", info) + timeperiod.clear() # extract time ranges of weekdays @@ -8642,6 +8648,11 @@ def mode_edit_role(phase): if phase == "action": alias = html.var_utf8("alias") + + unique, info = is_alias_used("roles", id, alias) + if not unique: + raise MKUserError("alias", info) + new_id = html.var("id") if len(new_id) == 0: raise MKUserError("id", _("Please specify an ID for the new role.")) @@ -13556,6 +13567,28 @@ def may_see_hosts(): return config.may("wato.use") and \ (config.may("wato.seeall") or config.may("wato.hosts")) +def is_alias_used(my_group, my_name, aliasname): + # Host / Service / Contact groups + all_groups = userdb.load_group_information() + for groupname, group in all_groups.items(): + for key, value in group.items(): + if value == aliasname and (my_group != groupname or my_name != key): + return False, _("This alias is already used in the %s group %s .") % (groupname, key) + + # Timeperiods + timeperiods = load_timeperiods() + for key, value in timeperiods.items(): + if value.get("alias") == aliasname and (my_group != "timeperiod" or my_name != key): + return False, _("This alias is already used in timeperiod %s.") % key + + # Roles + roles = userdb.load_roles() + for key, value in roles.items(): + if value.get("alias") == aliasname and (my_group != "roles" or my_name != key): + return False, _("This alias is already used in the role %s.") % key + + return True, None + #. # .-Plugins--------------------------------------------------------------. # | ____ _ _ |

11 years, 2 months

Check_MK Git: check_mk: custom user attributes can now be shown in overview tables / added to other topics

by Lars Michelsen

Module: check_mk Branch: master Commit: 788b094d6b76a836d6dbeee345db1a68fe0bd535 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=788b094d6b76a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 24 15:19:42 2013 +0200 custom user attributes can now be shown in overview tables / added to other topics --- web/htdocs/userdb.py | 10 ++++-- web/htdocs/wato.py | 86 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 70 insertions(+), 26 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index 1b60826..64c82e9 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -153,10 +153,12 @@ multisite_dir = defaults.default_config_dir + "/multisite.d/wato/" # | | # +----------------------------------------------------------------------+ -def declare_user_attribute(name, vs, user_editable = True, permission = None): +def declare_user_attribute(name, vs, user_editable = True, permission = None, show_in_table = False, topic = None): user_attributes[name] = { 'valuespec': vs, 'user_editable': user_editable, + 'show_in_table': show_in_table, + 'topic': topic and topic or 'personal', } # Permission needed for editing this attribute if permission: @@ -540,7 +542,11 @@ def declare_custom_user_attrs(): attrs = all_attrs.setdefault('user', []) for attr in attrs: vs = globals()[attr['type']](title = attr['title'], help = attr['help']) - declare_user_attribute(attr['name'], vs, attr['user_editable']) + declare_user_attribute(attr['name'], vs, + user_editable = attr['user_editable'], + show_in_table = attr['show_in_table'], + topic = attr['topic'], + ) # .----------------------------------------------------------------------. # | _ _ _ | diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 614f47c..9b610f4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -7954,6 +7954,9 @@ def mode_users(phase): return None + visible_custom_attrs = [ (name, attr) for name, attr in userdb.get_user_attributes() + if attr.get('show_in_table', False) ] + entries = users.items() entries.sort(cmp = lambda a, b: cmp(a[1].get("alias", a[0]).lower(), b[1].get("alias", b[0]).lower())) @@ -8041,6 +8044,12 @@ def mode_users(phase): tp = _("Always") html.write(tp) + # the visible custom attributes + for name, attr in visible_custom_attrs: + vs = attr['valuespec'] + table.cell(vs.title()) + html.write(vs.value_to_text(user.get(name, vs.default_value()))) + table.end() if not userdb.load_group_information().get("contact", {}): @@ -8084,6 +8093,24 @@ def mode_edit_user(phase): def is_locked(attr): return not new and attr in locked_attributes + def custom_user_attributes(topic = None): + for name, attr in userdb.get_user_attributes(): + if topic is not None and topic != attr['topic']: + continue # skip attrs of other topics + + if not attr.get("permission") or config.may(attr["permission"]): + vs = attr['valuespec'] + forms.section(vs.title()) + if attr['user_editable'] and not is_locked(name): + vs.render_input("ua_" + name, user.get(name, vs.default_value())) + else: + html.write(vs.value_to_text(user.get(name, vs.default_value()))) + # Render hidden to have the values kept after saving + html.write('<div style="display:none">') + vs.render_input("ua_" + name, user.get(name, vs.default_value())) + html.write('</div>') + html.help(vs.help()) + # Load data that is referenced - in order to display dropdown # boxes and to check for validity. contact_groups = userdb.load_group_information().get("contact", {}) @@ -8273,6 +8300,7 @@ def mode_edit_user(phase): forms.section(_("Pager address")) lockable_input('pager', '') html.help(_("The pager address is optional ")) + custom_user_attributes('ident') forms.header(_("Security")) forms.section(_("Authentication")) @@ -8344,6 +8372,7 @@ def mode_edit_user(phase): html.hidden_field("role_" + role_id, is_member and '1' or '') if is_locked('roles') and not is_member_of_at_least_one: html.write('<i>%s</i>' % _('No roles assigned.')) + custom_user_attributes('security') # Contact groups forms.header(_("Contact Groups"), isopen=False) @@ -8436,22 +8465,11 @@ def mode_edit_user(phase): forms.section(_("Notification Method")) vs_notification_method.render_input("notification_method", user.get("notification_method")) + custom_user_attributes('notify') forms.header(_("Personal Settings"), isopen = False) select_language(user.get('language', '')) - for name, attr in userdb.get_user_attributes(): - if not attr.get("permission") or config.may(attr["permission"]): - vs = attr['valuespec'] - forms.section(vs.title()) - if attr['user_editable'] and not is_locked(name): - vs.render_input("ua_" + name, user.get(name, vs.default_value())) - else: - html.write(vs.value_to_text(user.get(name, vs.default_value()))) - # Render hidden to have the values kept after saving - html.write('<div style="display:none">') - vs.render_input("ua_" + name, user.get(name, vs.default_value())) - html.write('</div>') - html.help(vs.help()) + custom_user_attributes('personal') # TODO: Later we could add custom macros here, which # then could be used for notifications. On the other hand, @@ -12864,8 +12882,10 @@ def mode_edit_custom_attr(phase, what): if title == this_attr['title'] and name != this_attr['name']: raise MKUserError("alias", _("This alias is already used by the attribute %s.") % this_attr['name']) - help = html.var_utf8('help').strip() + topic = html.var('topic', '').strip() + help = html.var_utf8('help').strip() user_editable = html.get_checkbox('user_editable') + show_in_table = html.get_checkbox('show_in_table') if new: name = html.var("name", '').strip() @@ -12882,19 +12902,23 @@ def mode_edit_custom_attr(phase, what): if ty not in [ t[0] for t in custom_attr_types ]: raise MKUserError('type', _('The choosen attribute type is invalid.')) - attrs.append({ - 'name' : name, - 'title' : title, - 'type' : ty, - 'help' : help, - 'user_editable' : user_editable, - }) + attr = { + 'name' : name, + 'type' : ty, + } + attrs.append(attr) + log_pending(SYNCRESTART, None, "edit-%sattr" % what, _("Create new %s attribute %s") % (what, name)) else: - attr['title'] = title - attr['help'] = help - attr['user_editable'] = user_editable, log_pending(SYNCRESTART, None, "edit-%sattr" % what, _("Changed title of %s attribute %s") % (what, name)) + attr.update({ + 'title' : title, + 'topic' : topic, + 'help' : help, + 'user_editable' : user_editable, + 'show_in_table' : show_in_table, + }) + save_custom_attrs(all_attrs) return what + "_attrs" @@ -12915,6 +12939,15 @@ def mode_edit_custom_attr(phase, what): html.help(_("The title is used to label this attribute.")) html.text_input("title", attr.get('title')) + forms.section(_('Topic')) + html.help(_('The attribute is added to this section in the edit dialog.')) + html.select('topic', [ + ('ident', _('Identity')), + ('security', _('Security')), + ('notify', _('Notifications')), + ('personal', _('Personal Settings')), + ], attr.get('topic', 'personal')) + forms.section(_('Help Text')) html.help(_('You might want to add some helpful description for the attribute.')) html.text_area('help', attr.get('help', '')) @@ -12930,6 +12963,11 @@ def mode_edit_custom_attr(phase, what): html.help(_('It is possible to let users edit their custom attributes.')) html.checkbox('user_editable', attr.get('user_editable', True)) + forms.section(_('Show in Table')) + html.help(_('This attribute is only visibile on the detail pages by default, but ' + 'you can also make it visible in the overview tables.')) + html.checkbox('show_in_table', attr.get('show_in_table', False)) + forms.end() html.button("save", _("Save")) html.hidden_fields()

11 years, 2 months

Check_MK Git: check_mk: ldap: Always using lower case ldap attributes

by Lars Michelsen

Module: check_mk Branch: master Commit: c6e0110652125e79aca6e66d715c1d5882545bd6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6e0110652125e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 24 14:30:51 2013 +0200 ldap: Always using lower case ldap attributes --- web/plugins/userdb/ldap.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 85c4069..60f6aae 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -311,8 +311,9 @@ def ldap_filter(key, handle_config = True): # Returns the ldap attribute name depending on the configured ldap directory type # If a key is not present in the map, the assumption is, that the key matches 1:1 +# Always use lower case here, just to prevent confusions. def ldap_attr(key): - return ldap_attr_map[config.ldap_connection['type']].get(key, key) + return ldap_attr_map[config.ldap_connection['type']].get(key, key).lower() # Returns the given distinguished name template with replaced vars def ldap_replace_macros(tmpl): @@ -718,6 +719,8 @@ def ldap_sync(add_to_changelog, only_username): ldap_connect() + ldap_log(' SYNC PLUGINS: %s' % ', '.join(config.ldap_active_plugins.keys())) + # Unused at the moment, always sync all users #filt = None #if only_username:

11 years, 2 months

Check_MK Git: check_mk: Fixed pnp-template of ps. perf when no cpu usage thresholds are set

by Lars Michelsen

Module: check_mk Branch: master Commit: f04de0990d42225ae1ab3eea1918ec3349a42783 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f04de0990d4222… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jul 24 12:12:19 2013 +0200 Fixed pnp-template of ps.perf when no cpu usage thresholds are set --- pnp-templates/check_mk-ps.perf.php | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pnp-templates/check_mk-ps.perf.php b/pnp-templates/check_mk-ps.perf.php index 1a00285..eaa3503 100644 --- a/pnp-templates/check_mk-ps.perf.php +++ b/pnp-templates/check_mk-ps.perf.php @@ -76,24 +76,24 @@ if (isset($RRD["vsz"])) { } if (isset($RRD["pcpu"])) { - $opt[3] = " --vertical-label \"CPU(%)\" -l 0 -u 100 --title \"CPU Usage\" "; - $def[3] = "" - . "DEF:pcpu=$RRD[pcpu] " - . "AREA:pcpu#30ff80:\"CPU usage (%) \" " - . "LINE:pcpu#20a060:\"\" " - . "GPRINT:pcpu:LAST:\"Current\: %4.1lf%%\" " - . "GPRINT:pcpu:MIN:\"Min\: %4.1lf%%\" " - . "GPRINT:pcpu:MAX:\"Max\: %4.1lf%%\\n\" " - . "HRULE:$WARN[pcpu]#FFFF00:\"Warning at $WARN[pcpu]%\" " - . "HRULE:$CRIT[pcpu]#FF0000:\"Critical at $CRIT[pcpu]%\" " - ; - if (isset($RRD["pcpuavg"])) { - $def[3] .= - "DEF:pcpuavg=$RRD[pcpuavg] ". - "LINE:pcpuavg#000000:\"Average over $MAX[pcpuavg] minutes\\n\" " - ; - } -} + $opt[3] = " --vertical-label \"CPU(%)\" -l 0 -u 100 --title \"CPU Usage\" "; + $def[3] = "" + . "DEF:pcpu=$RRD[pcpu] " + . "AREA:pcpu#30ff80:\"CPU usage (%) \" " + . "LINE:pcpu#20a060:\"\" " + . "GPRINT:pcpu:LAST:\"Current\: %4.1lf%%\" " + . "GPRINT:pcpu:MIN:\"Min\: %4.1lf%%\" " + . "GPRINT:pcpu:MAX:\"Max\: %4.1lf%%\\n\" "; + + if ($WARN['pcpu'] != '') + $def[3] .= "HRULE:$WARN[pcpu]#FFFF00:\"Warning at $WARN[pcpu]%\" "; + if ($CRIT['pcpu'] != '') + $def[3] .= "HRULE:$CRIT[pcpu]#FF0000:\"Critical at $CRIT[pcpu]%\" "; + if (isset($RRD["pcpuavg"])) { + $def[3] .= "DEF:pcpuavg=$RRD[pcpuavg] " + "LINE:pcpuavg#000000:\"Average over $MAX[pcpuavg] minutes\\n\" "; + } +} ?>

11 years, 2 months

Check_MK Git: check_mk: Fix DST error in AbsoluteDate Valuespec wit new time feature

by Mathias Kettner

Module: check_mk Branch: master Commit: f30bc9a6d619d742d54b07e67e8e62187fecc1bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f30bc9a6d619d7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jul 24 12:02:26 2013 +0200 Fix DST error in AbsoluteDate Valuespec wit new time feature --- web/htdocs/valuespec.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 2803593..4cad688 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1522,7 +1522,16 @@ class AbsoluteDate(ValueSpec): if part < mmin or part > mmax: raise MKUserError(varname, _("The value for %s must be between %d and %d" % (_(what), mmin, mmax))) parts.append(part) + + # Construct broken time from input fields. Assume no-dst parts += [0] * (self._include_time and 3 or 6) + # Convert to epoch + epoch = time.mktime(tuple(parts)) + # Convert back to localtime in order to know DST setting + localtime = time.localtime(epoch) + # Enter DST setting of that time + parts[-1] = localtime.tm_isdst + # Convert to epoch again return time.mktime(tuple(parts)) def validate_datatype(self, value, varprefix):

11 years, 2 months

Check_MK Git: check_mk: windows agent: some fixes with possible script buffer overflows

by Andreas Boesl

Module: check_mk Branch: master Commit: bbcd81eb28ec3dcab8100ae7efac504698247d7d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bbcd81eb28ec3d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 16:43:59 2013 +0200 windows agent: some fixes with possible script buffer overflows --- agents/windows/check_mk_agent-64.exe | Bin 178688 -> 178688 bytes agents/windows/check_mk_agent.cc | 9 ++++++--- agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/install_agent-64.exe | Bin 148906 -> 148888 bytes agents/windows/install_agent.exe | Bin 146421 -> 146432 bytes 5 files changed, 6 insertions(+), 3 deletions(-) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index e8a9f86..33cc7da 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index d419e02..efeeaf6 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -103,11 +103,11 @@ // Maximum heap buffer for a single local/plugin script // This buffer contains the check output -#define SCRIPT_BUFFER_HEAP 65536 +#define SCRIPT_BUFFER_HEAP 524288 // Maximum timeout for a single local/plugin script #define DEFAULT_PLUGIN_TIMEOUT 60 -#define DEFAULT_LOCAL_TIMEOUT 60 +#define DEFAULT_LOCAL_TIMEOUT 60 // Check compilation environment 32/64 bit #if _WIN32 || _WIN64 @@ -2289,6 +2289,9 @@ int launch_program(script_container* cont) } } + if (out_offset >= SCRIPT_BUFFER_HEAP) + break; + if (exit != STILL_ACTIVE) break; @@ -2309,7 +2312,7 @@ int launch_program(script_container* cont) DWORD WINAPI ScriptWorkerThread(LPVOID lpParam) { script_container* cont = (script_container*) lpParam; - cont->buffer_work = (char*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SCRIPT_BUFFER_HEAP); + cont->buffer_work = (char*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, SCRIPT_BUFFER_HEAP + 1); // Execute script int result = launch_program(cont); diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index ee73ef2..f8a42ac 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 34093dd..802e583 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 6865768..6623c5b 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

11 years, 2 months

Check_MK Git: check_mk: windows agent: cache_age parameter also applies when async/sync caching is disabled

by Andreas Boesl

Module: check_mk Branch: master Commit: c24e7078bf2b14457127e14b8f1383d7de18798f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c24e7078bf2b14… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 16:34:44 2013 +0200 windows agent: cache_age parameter also applies when async/sync caching is disabled --- agents/windows/check_mk_agent-64.exe | Bin 178688 -> 178688 bytes agents/windows/check_mk_agent.cc | 2 +- agents/windows/check_mk_agent.exe | Bin 151040 -> 151040 bytes agents/windows/crash.exe | Bin 20024 -> 20024 bytes agents/windows/install_agent-64.exe | Bin 148924 -> 148906 bytes agents/windows/install_agent.exe | Bin 146405 -> 146421 bytes agents/windows/nowin.exe | Bin 22511 -> 22511 bytes 7 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 0b4e707..e8a9f86 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 4c9fda2..d419e02 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -2380,7 +2380,7 @@ void run_external_programs(char *dirname, script_type type, bool dry_run = false cont->should_terminate = 0; cont->timeout = get_script_timeout(name, type); cont->max_retries = get_script_max_retries(name, type); - cont->max_age = g_caching_method == CACHE_OFF ? 0 : get_script_cache_age(name, type); + cont->max_age = get_script_cache_age(name, type); cont->status = SCRIPT_IDLE; cont->last_problem = SCRIPT_NONE; script_containers[cont->path] = cont; diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 86fc5cd..ee73ef2 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/crash.exe b/agents/windows/crash.exe index 1b7e962..656ef00 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index e55d5fa..34093dd 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index b71b869..6865768 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index f1e64ac..3c18eb6 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ

11 years, 2 months

Check_MK Git: check_mk: removed useless code

by Andreas Boesl

Module: check_mk Branch: master Commit: 14e73d2ab812262c4791d2ed0d9bc8a92dfdda5b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14e73d2ab81226… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 12:41:35 2013 +0200 removed useless code --- checks/win_netstat | 5 ----- 1 file changed, 5 deletions(-) diff --git a/checks/win_netstat b/checks/win_netstat index 4b221f6..1f03b39 100644 --- a/checks/win_netstat +++ b/checks/win_netstat @@ -59,11 +59,6 @@ win_netstat_states = { "WARTEND" : "TIME_WAIT", # Add further states in any required language here. Sorry, Windows # has no "unset LANG" ;-) - - # English - "LISTENING" : "LISTENING", - "ESTABLISHED" : "ESTABLISHED", - "TIME_WAIT" : "TIME_WAIT", }

11 years, 2 months

Check_MK Git: check_mk: win_netstat: new checkgroup params min_states/ max_states. add english language for basic states

by Andreas Boesl

Module: check_mk Branch: master Commit: c6b94e02bd2d3cc6b0306e8a68b9567355b8c425 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c6b94e02bd2d3c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 11:48:41 2013 +0200 win_netstat: new checkgroup params min_states/max_states. add english language for basic states --- checkman/win_netstat | 9 +++++++-- checks/win_netstat | 37 +++++++++++++++++++++++++++++----- web/plugins/wato/check_parameters.py | 19 +++++++++++++++++ 3 files changed, 58 insertions(+), 7 deletions(-) diff --git a/checkman/win_netstat b/checkman/win_netstat index 3c1f0ab..f49a580 100644 --- a/checkman/win_netstat +++ b/checkman/win_netstat @@ -66,7 +66,12 @@ parameters (dict): A dictionary with the following keys, all of which are {"proto"} {TCP} or {UDP} are possible values: The protocol used for the connection or the listener. - {"state"} {"ESTABLISHED"}, {"LISTEN"}, {"TIME_WAIT"}, {"SYN_SENT"}, {"SYN_RECV"}, + {"state"} {"ESTABLISHED"}, {"LISTENING"}, {"TIME_WAIT"}, {"SYN_SENT"}, {"SYN_RECV"}, {"LAST_ACK"}, {"CLOSE_WAIT"}, {"TIME_WAIT"}, {"CLOSED"}, {"CLOSING"}, {"FIN_WAIT1"}, {"FIN_WAIT2"}, or {"BOUND"}: The expected state of the TCP/UDP socket. You most probably will use either - {"ESTABLISHED"} or {"LISTEN"}. + {"ESTABLISHED"} or {"LISTENING"}. + + {"min_states"} Tuple(warn, crit) The minimum allowed entries of the required state + + {"min_states"} Tuple(warn, crit) The maximum allowed entries of the required state + diff --git a/checks/win_netstat b/checks/win_netstat index 5cdba4a..4b221f6 100644 --- a/checks/win_netstat +++ b/checks/win_netstat @@ -53,11 +53,17 @@ # UDP 127.0.0.1:1900 *:* win_netstat_states = { - "ABH\x99REN" : "LISTEN", + # German + "ABH\x99REN" : "LISTENING", "HERGESTELLT" : "ESTABLISHED", "WARTEND" : "TIME_WAIT", # Add further states in any required language here. Sorry, Windows # has no "unset LANG" ;-) + + # English + "LISTENING" : "LISTENING", + "ESTABLISHED" : "ESTABLISHED", + "TIME_WAIT" : "TIME_WAIT", } @@ -105,11 +111,32 @@ def check_win_netstat(item, params, info): if match: found += 1 - if found: - state = 0 - else: + # Check if found connections are within limits + state = 0 + extra_info = "" + + if params["min_states"]: + min_warn, min_crit = params["min_states"] + if found <= min_crit: + state = max(state, 2) + extra_info += '(!!) Minimum at %d ' % min_crit + elif found <= min_warn: + state = max(state, 1) + extra_info += '(!) Minimum at %d ' % min_warn + + if params["max_states"]: + max_warn, max_crit = params["max_states"] + if found >= max_crit: + state = max(state, 2) + extra_info += '(!!) Maximum at %d ' % max_crit + elif found >= max_warn: + state = max(state, 1) + extra_info += '(!) Maximum at %d ' % max_warn + + if not found: state = 2 - return state, "Found %d matching entries" % found + + return state, "Found %d matching entries %s" % (found, extra_info) check_info["win_netstat"] = { 'check_function' : check_win_netstat, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1381579..93084e8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1184,6 +1184,7 @@ register_check_parameters( title = _("State"), choices = [ ( "ESTABLISHED", "ESTABLISHED" ), + ( "LISTENING", "LISTENING" ), ( "SYN_SENT", "SYN_SENT" ), ( "SYN_RECV", "SYN_RECV" ), ( "LAST_ACK", "LAST_ACK" ), @@ -1201,6 +1202,24 @@ register_check_parameters( ( "local_port", Integer(title = _("Local port number"), minvalue = 1, maxvalue = 65535, )), ( "remote_ip", IPv4Address(title = _("Remote IP address"))), ( "remote_port", Integer(title = _("Remote port number"), minvalue = 1, maxvalue = 65535, )), + ( "min_states", + Tuple( + title = _("Number of minimum connections or listeners"), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), + ], + ), + ), + ( "max_states", + Tuple( + title = _("Number of maximum connections or listeners"), + elements = [ + Integer(title = _("Warning at")), + Integer(title = _("Critical at")), + ], + ), + ), ] ), TextAscii(title = _("Connection name"), help = _("Specify an arbitrary name of this connection here"), allow_empty = False),

11 years, 2 months

Check_MK Git: check_mk: win_netstat: correct splitting of ipv6 adresses

by Andreas Boesl

Module: check_mk Branch: master Commit: 0ed906479e9d533c5da82b947fe0be8fdfe59fc3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ed906479e9d53… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Jul 23 11:16:05 2013 +0200 win_netstat: correct splitting of ipv6 adresses --- checks/win_netstat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/win_netstat b/checks/win_netstat index 76876c2..5cdba4a 100644 --- a/checks/win_netstat +++ b/checks/win_netstat @@ -71,7 +71,7 @@ def parse_win_netstat(info): connstate = "LISTEN" else: continue - connections.append( (proto, local.split(":"), remote.split(":"), + connections.append( (proto, local.rsplit(":", 1), remote.rsplit(":", 1), win_netstat_states.get(connstate, connstate)) ) return connections

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