Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64161 discussions

Check_MK Git: check_mk: Performance snapin: add livechecks data

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2878f5df491c8fe16dd7667721c93a8e0534a0b3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2878f5df491c8f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 21 19:50:55 2011 +0100 Performance snapin: add livechecks data --- livestatus/src/TableStatus.cc | 15 +++++++++++++++ livestatus/src/global_counters.h | 20 +++++++++++--------- livestatus/src/livechecking.c | 3 +++ web/plugins/sidebar/shipped.py | 7 +++++-- 4 files changed, 34 insertions(+), 11 deletions(-) diff --git a/livestatus/src/TableStatus.cc b/livestatus/src/TableStatus.cc index b09d83d..3c6eab8 100644 --- a/livestatus/src/TableStatus.cc +++ b/livestatus/src/TableStatus.cc @@ -56,6 +56,8 @@ extern int num_cached_log_messages; extern int interval_length; extern int g_num_hosts; extern int g_num_services; +extern int livechecks_performed; +extern int livecheck_overflows; extern circular_buffer external_command_buffer; extern int external_command_buffer_slots; @@ -102,6 +104,17 @@ TableStatus::TableStatus() addColumn(new GlobalCountersColumn("external_commands_rate", "the averaged number of external commands per second", COUNTER_COMMANDS, true)); + addColumn(new GlobalCountersColumn("livechecks", + "The number of checks executed via livecheck", COUNTER_LIVECHECKS, false)); + addColumn(new GlobalCountersColumn("livechecks_rate", + "The averaged number of livechecks executes per second", COUNTER_LIVECHECKS, true)); + + addColumn(new GlobalCountersColumn("livecheck_overflows", + "The number of times a check could not be executed " + "because now livecheck helper was free", COUNTER_LIVECHECK_OVERFLOWS, false)); + addColumn(new GlobalCountersColumn("livecheck_overflows_rate", + "The number of livecheck overflows per second", COUNTER_LIVECHECK_OVERFLOWS, true)); + // Nagios program status data addColumn(new IntPointerColumn("nagios_pid", "The process ID of the Nagios main process", &nagios_pid )); @@ -164,6 +177,8 @@ TableStatus::TableStatus() "The current number of log messages MK Livestatus keeps in memory", &num_cached_log_messages )); addColumn(new StringPointerColumn("livestatus_version", "The version of the MK Livestatus module", (char *)VERSION)); + + // Livecheck } void TableStatus::answerQuery(Query *query) diff --git a/livestatus/src/global_counters.h b/livestatus/src/global_counters.h index 4d0a63d..fbe953a 100644 --- a/livestatus/src/global_counters.h +++ b/livestatus/src/global_counters.h @@ -35,15 +35,17 @@ typedef uint64_t counter_t; -#define COUNTER_NEB_CALLBACKS 0 -#define COUNTER_REQUESTS 1 -#define COUNTER_CONNECTIONS 2 -#define COUNTER_SERVICE_CHECKS 3 -#define COUNTER_HOST_CHECKS 4 -#define COUNTER_FORKS 5 -#define COUNTER_LOG_MESSAGES 6 -#define COUNTER_COMMANDS 7 -#define NUM_COUNTERS 8 +#define COUNTER_NEB_CALLBACKS 0 +#define COUNTER_REQUESTS 1 +#define COUNTER_CONNECTIONS 2 +#define COUNTER_SERVICE_CHECKS 3 +#define COUNTER_HOST_CHECKS 4 +#define COUNTER_FORKS 5 +#define COUNTER_LOG_MESSAGES 6 +#define COUNTER_COMMANDS 7 +#define COUNTER_LIVECHECKS 8 +#define COUNTER_LIVECHECK_OVERFLOWS 9 +#define NUM_COUNTERS 10 EXTERN counter_t g_counters[NUM_COUNTERS]; EXTERN counter_t g_last_counter[NUM_COUNTERS]; diff --git a/livestatus/src/livechecking.c b/livestatus/src/livechecking.c index f4b2d42..a51a274 100644 --- a/livestatus/src/livechecking.c +++ b/livestatus/src/livechecking.c @@ -29,6 +29,7 @@ #include "nagios.h" #include "logger.h" +#include "global_counters.h" extern int g_debug_level; @@ -62,6 +63,7 @@ void execute_livecheck(struct live_helper *lh, const char *host_name, fprintf(lh->fsock, "%s\n%s\n%.3f\n%s\n", host_name, service_description, latency, command); fflush(lh->fsock); + g_counters[COUNTER_LIVECHECKS]++; } struct live_helper *get_free_live_helper() @@ -151,6 +153,7 @@ int broker_service_livecheck(int event_type __attribute__ ((__unused__)), void * if (!lh) { logger(LG_INFO, "No livecheck helper free."); // Let the core handle this check himself + g_counters[COUNTER_LIVECHECK_OVERFLOWS]++; return NEB_OK; } diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 04a9154..5f127b1 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -560,6 +560,7 @@ def render_performance(): data = html.live.query("GET status\nColumns: service_checks_rate host_checks_rate " "external_commands_rate connections_rate forks_rate " + "livechecks_rate livecheck_overflows_rate " "log_messages_rate cached_log_messages\n") for what, col, format in \ [("Service checks", 0, "%.2f/s"), @@ -567,8 +568,10 @@ def render_performance(): ("External commands", 2, "%.2f/s"), ("Livestatus-conn.", 3, "%.2f/s"), ("Process creations", 4, "%.2f/s"), - ("New log messages", 5, "%.2f/s"), - ("Cached log messages", 6, "%d")]: + ("Livechecks", 5, "%.2f/s"), + ("Livecheck overflows", 6, "%.2f/s"), + ("New log messages", 7, "%.2f/s"), + ("Cached log messages", 8, "%d")]: write_line(what + ":", format % sum([row[col] for row in data])) if len(config.allsites()) == 1:

12 years, 10 months

Check_MK Git: check_mk: Multisite: swapped order of bottom page status icons

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 172744a4b0072fb5198b6e3c815ad1189cd0d5cc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=172744a4b0072f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 21 16:17:15 2011 +0100 Multisite: swapped order of bottom page status icons --- web/htdocs/htmllib.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index b3f7f5a..111f391 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -669,13 +669,13 @@ class html: def render_status_icons(self): h = "" - for img, tooltip in self.status_icons.items(): - h += '<img class=statusicon src="images/status_%s.png" title="%s">\n' % (img, tooltip) if True: # self.req.method == "GET": h += '<a target="_blank" href="%s"><img class=statusicon src="images/status_frameurl.png" title="URL to this frame"></a>\n' % \ self.makeuri([]) h += '<a target="_blank" href="%s"><img class=statusicon src="images/status_pageurl.png" title="URL to this page including sidebar"></a>\n' % \ ("index.py?" + urlencode_vars([("start_url", self.makeuri([]))])) + for img, tooltip in self.status_icons.items(): + h += '<img class=statusicon src="images/status_%s.png" title="%s">\n' % (img, tooltip) return h def show_error(self, msg):

12 years, 10 months

Check_MK Git: check_mk: Icons with link to page URL at bottom of each page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: b3c491d4ae1dc8dc8bbe1ee6aba7ff51c8b2ad28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b3c491d4ae1dc8… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 21 14:03:39 2011 +0100 Icons with link to page URL at bottom of each page --- ChangeLog | 1 + web/htdocs/dashboard.py | 2 +- web/htdocs/htmllib.py | 7 ++++++- web/htdocs/images/status_frameurl.png | Bin 0 -> 3154 bytes web/htdocs/images/status_pageurl.png | Bin 0 -> 3021 bytes 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5e16b7b..e582625 100644 --- a/ChangeLog +++ b/ChangeLog @@ -39,6 +39,7 @@ * Show icon if user has modified a view's filter settings * New config option debug_livestatus_queries, normal debug mode does not include this anymore + * Icons with link to page URL at bottom of each page WATO: * Evolved to full featured monitoring configuration tool! diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index 9763f24..0910be9 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -156,7 +156,7 @@ window.onresize = function () { set_dashboard_size(); } dashboard_scheduler(1); """ % (header_height, screen_margin, title_height, dashlet_padding, refresh_dashlets, name)) - html.footer() + html.body_end() # omit regular footer with status icons, etc. # Create the HTML code for one dashlet. Each dashlet has an id "dashlet_%d", # where %d is its index (in board["dashlets"]). Javascript uses that id diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 7e68376..b3f7f5a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -670,7 +670,12 @@ class html: def render_status_icons(self): h = "" for img, tooltip in self.status_icons.items(): - h += '<img class=statusicon src="images/status_%s.png" title="%s">' % (img, tooltip) + h += '<img class=statusicon src="images/status_%s.png" title="%s">\n' % (img, tooltip) + if True: # self.req.method == "GET": + h += '<a target="_blank" href="%s"><img class=statusicon src="images/status_frameurl.png" title="URL to this frame"></a>\n' % \ + self.makeuri([]) + h += '<a target="_blank" href="%s"><img class=statusicon src="images/status_pageurl.png" title="URL to this page including sidebar"></a>\n' % \ + ("index.py?" + urlencode_vars([("start_url", self.makeuri([]))])) return h def show_error(self, msg): diff --git a/web/htdocs/images/status_frameurl.png b/web/htdocs/images/status_frameurl.png new file mode 100644 index 0000000..395aab0 Binary files /dev/null and b/web/htdocs/images/status_frameurl.png differ diff --git a/web/htdocs/images/status_pageurl.png b/web/htdocs/images/status_pageurl.png new file mode 100644 index 0000000..a272aba Binary files /dev/null and b/web/htdocs/images/status_pageurl.png differ

12 years, 10 months

Check_MK Git: check_mk: Add simple notification mechanism

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: e7f220734c97b17c1bd2c406ea2f53b232375a63 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e7f220734c97b1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 21 12:07:12 2011 +0100 Add simple notification mechanism --- .bugs/437 | 10 ++ ChangeLog | 1 + doc/.f12 | 13 +++ doc/check_mk_templates.cfg | 28 ++++++ modules/check_mk.py | 11 ++- modules/notify.py | 150 ++++++++++++++++++++++++++++++ web/htdocs/check_mk.css | 16 ++- web/htdocs/htmllib.py | 6 +- web/htdocs/wato.py | 18 ++++ web/plugins/wato/globals_notification.py | 143 ++++++++++++++++++++++++++++ 10 files changed, 385 insertions(+), 11 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=e7f220734c…

12 years, 10 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: 0dc3dcb89ecf78406f648838e5140ca775a8a31c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dc3dcb89ecf78… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Nov 21 12:07:19 2011 +0100 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years, 10 months

Check_MK Git: check_mk: WATO: API updated. api.get_all_hosts(self, folder)

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 0ffbce29fbdd3a1b1f6841b940a0b43e1608e9a9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0ffbce29fbdd3a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Nov 21 00:06:14 2011 +0100 WATO: API updated. api.get_all_hosts(self, folder) --- web/htdocs/wato.py | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index efa7184..4c9a71d 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -9524,10 +9524,12 @@ class API: g_hooks.setdefault(name, []).append(func) # Get a (flat) dictionary containing all hosts with their *effective* - # attributes (containing all inherited and default values where appropriate). - def get_all_hosts(self): + # attributes (containing all inherited and default values where appropriate) + # of the given folder. If folder is None, returns all hosts from the root folder + # Folder must be returned by get_folder() + def get_all_hosts(self, folder=None): load_all_folders() - return collect_hosts(g_root_folder) + return collect_hosts(folder or g_root_folder) # Find a folder by its path. Raise an exception if it does # not exist.

12 years, 10 months

Check_MK Git: check_mk: WATO: fixed download of 'latest' wato-snapshot

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: c0332581524849167fc2d21715784a4583ea955e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c0332581524849… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sun Nov 20 23:59:48 2011 +0100 WATO: fixed download of 'latest' wato-snapshot --- web/htdocs/wato.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 2ecc2e5..efa7184 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3948,6 +3948,7 @@ def mode_snapshot(phase): # Find the latest snapshot file if download_file == 'latest': snapshots = os.listdir(snapshot_dir) + snapshots.sort() if not snapshots: return False download_file = snapshots[-1]

12 years, 10 months

Check_MK Git: check_mk: WATO: add inheritance for dependent attributes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 7dda352e0461eb80c0844d8000dc9e26146c3c88 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dda352e0461eb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Sun Nov 20 23:57:54 2011 +0100 WATO: add inheritance for dependent attributes --- web/htdocs/js/wato.js | 9 +++++++++ web/htdocs/wato.py | 9 +++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index ae99f42..e86abea 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -76,6 +76,15 @@ function wato_fix_visibility() { for (var i in oTable.childNodes) { var oTr = oTable.childNodes[i]; if (oTr.nodeName == 'TR') { + /* If the Checkbox is unchecked try to get a value from the inherited_tags */ + var oCheckbox = oTr.childNodes[1].childNodes[0] + if( oCheckbox.checked == false ){ + attrname = oCheckbox.parentNode.parentNode.id + if( attrname in inherited_tags ){ + currentTags = currentTags.concat(inherited_tags[oCheckbox.parentNode.parentNode.id].split("|")) + } + continue + } /* Find the <select>/<checkbox> object in this tr */ /* td.content div select/checkbox */ var oElement = oTr.childNodes[2].childNodes[0].childNodes[0]; diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 91cd94e..2ecc2e5 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3669,6 +3669,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute # Collect dependency mapping for attributes (attributes that are only # visible, if certain host tags are set). dependency_mapping = {} + inherited_tags = {} for topic in topics: if len(topics) > 1: @@ -3743,6 +3744,8 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute inherited_from = _("Inherited from ") + '<a href="%s">%s</a>' % (url, container["title"]) inherited_value = container["attributes"][attrname] has_inherited = True + if topic == _("Host tags"): + inherited_tags["attr_%s" % attrname] = inherited_value break container = container.get(".parent") @@ -3809,7 +3812,7 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute html.hidden_field(checkbox_name, "on") else: html.checkbox(checkbox_name, active, - onclick = "wato_toggle_attribute(this, '%s');" % attrname ) # Only select if value is unique + onclick = "wato_fix_visibility(); wato_toggle_attribute(this, '%s');" % attrname) # Only select if value is unique html.write("</td>") # Now comes the input fields and the inherited / default values @@ -3862,7 +3865,9 @@ def configure_attributes(hosts, for_what, parent, myself=None, without_attribute # Provide Javascript world with the tag dependency information # of all attributes. - html.javascript("var wato_depends_on = %r;\nwato_fix_visibility();\n" % dependency_mapping) + html.javascript("var inherited_tags = %r;\n"\ + "var wato_depends_on = %r;\n"\ + "wato_fix_visibility();\n" % (inherited_tags, dependency_mapping)) # Check if at least one host in a folder (or its subfolders)

12 years, 10 months

Check_MK Git: check_mk: WATO: dependent attributes for checkbox elements

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 700212a2c513f58b749c22b88f0bfe3a247be57f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=700212a2c513f5… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri Nov 18 21:50:33 2011 +0100 WATO: dependent attributes for checkbox elements --- web/htdocs/htmllib.py | 6 +++--- web/htdocs/js/wato.js | 14 +++++++++----- web/htdocs/wato.py | 14 +++++++++----- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index bfdae94..8d83daa 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -440,7 +440,7 @@ class html: (varname, value, checked_text, text)) self.form_vars.append(varname) - def checkbox(self, varname, deflt=False, cssclass = '', onclick = None): + def checkbox(self, varname, deflt=False, cssclass = '', onclick = None, add_attr = []): error = self.user_errors.get(varname) if error: html = "<x class=inputerror>" @@ -457,8 +457,8 @@ class html: if cssclass: cssclass = ' class="%s"' % cssclass onclick_code = onclick and " onclick=\"%s\"" % (onclick) or "" - self.write("<input type=checkbox name=\"%s\"%s%s%s>" % - (varname, checked, cssclass, onclick_code)) + self.write("<input type=checkbox name=\"%s\"%s%s%s%s>" % + (varname, checked, cssclass, onclick_code, " ".join(add_attr))) self.form_vars.append(varname) if error: html += "</x>" diff --git a/web/htdocs/js/wato.js b/web/htdocs/js/wato.js index cef4bb1..ae99f42 100644 --- a/web/htdocs/js/wato.js +++ b/web/htdocs/js/wato.js @@ -76,11 +76,15 @@ function wato_fix_visibility() { for (var i in oTable.childNodes) { var oTr = oTable.childNodes[i]; if (oTr.nodeName == 'TR') { - /* Find the <select> object in this tr */ - /* td.content div select */ - var oSelect = oTr.childNodes[2].childNodes[0].childNodes[0]; - tags = oSelect.value.split("|"); - currentTags = currentTags.concat(tags); + /* Find the <select>/<checkbox> object in this tr */ + /* td.content div select/checkbox */ + var oElement = oTr.childNodes[2].childNodes[0].childNodes[0]; + if( oElement.type == 'checkbox' && oElement.checked ){ // <checkbox> + currentTags = currentTags.concat(oElement.getAttribute('tags').split("|")); + } + else{ // <select> + currentTags = currentTags.concat(oElement.value.split("|")); + } } } diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 929d2aa..91cd94e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -3445,11 +3445,10 @@ class HostTagAttribute(Attribute): secondary_tags = e[2] else: secondary_tags = [] - value = "|".join([ tagvalue ] + secondary_tags) - choices.append((value, e[1])) + choices.append(("|".join([ tagvalue ] + secondary_tags), e[1])) varname = "attr_" + self.name() if len(choices) == 1: - html.checkbox(varname, value != None, onchange='wato_fix_visibility();') + html.checkbox(varname, value != None, cssclass = '', onclick='wato_fix_visibility();', add_attr = ["tags=%s"%choices[0][0]]) html.write(" " + choices[0][1]) else: html.select(varname, choices, value, onchange='wato_fix_visibility();') @@ -7947,7 +7946,9 @@ def mode_edit_hosttag(phase): raise MKUserError("tag_id", _("Please specify an ID for your tag group.")) if not re.match("^[-a-z0-9A-Z_]*$", tag_id): raise MKUserError("tag_id", _("Invalid tag group ID. Only the characters a-z, A-Z, 0-9, _ and - are allowed.")) - for tgid, tit, ch in config.wato_host_tags: + for entry in config.wato_host_tags: + tgid = entry[0] + tit = entry[1] if tgid == tag_id: raise MKUserError("tag_id", _("The tag group ID %s is already used by the tag group '%s'.") % (tag_id, tit)) @@ -7974,7 +7975,10 @@ def mode_edit_hosttag(phase): new_choices.append((id, descr)) if id: # Make sure this ID is not used elsewhere - for tgid, tit, ch in config.wato_host_tags: + for entry in config.wato_host_tags: + tgid = entry[0] + tit = entry[1] + ch = entry[2] if tgid != tag_id: for e in ch: # Check primary and secondary tags

12 years, 10 months

Check_MK Git: check_mk: WATO: begin implementation of dependent attributes

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a38179eac3c9385f274f0ac9f919f7880ff783cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a38179eac3c938… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Nov 18 14:55:27 2011 +0100 WATO: begin implementation of dependent attributes --- multisite.mk | 6 ++-- web/htdocs/js/wato.js | 43 ++++++++++++++++++++++++- web/htdocs/wato.py | 82 +++++++++++++++++++++++++++++++++++++++++-------- 3 files changed, 113 insertions(+), 18 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a38179eac3…

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