Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: For host graphs always use pnp

by Lars Michelsen

Module: check_mk Branch: master Commit: 39366884fca31cac34861c53ba61dd272be5987e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=39366884fca31c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 24 12:58:47 2015 +0100 For host graphs always use pnp --- web/plugins/icons/builtin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 0471e1e..893718a 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -195,7 +195,7 @@ def pnp_icon(row, what): url = "" import metrics - if not hasattr(metrics, 'render_graph_html'): + if not hasattr(metrics, 'render_graph_html') or what == 'host': # Directly ask PNP for all data, don't try to use the new graph fetching mechanism # to keep the number of single requests low hover_content_func = 'pnp_hover_contents(\'%s\')' % pnp_popup_url(row, what)

9 years, 3 months

Check_MK Git: check_mk: #2156 Interface-Checks: Can now be configured to use predictive traffic levels

by Lars Michelsen

Module: check_mk Branch: master Commit: b9811fd1b46da123b8749aa878e2566333fd8735 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9811fd1b46da1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 24 12:15:45 2015 +0100 #2156 Interface-Checks: Can now be configured to use predictive traffic levels --- .werks/2156 | 9 +++++++++ ChangeLog | 1 + checks/if.include | 46 ++++++++++++++++++++++++++-------------------- modules/check_mk_base.py | 11 ++++++++--- 4 files changed, 44 insertions(+), 23 deletions(-) diff --git a/.werks/2156 b/.werks/2156 new file mode 100644 index 0000000..0627f8f --- /dev/null +++ b/.werks/2156 @@ -0,0 +1,9 @@ +Title: Interface-Checks: Can now be configured to use predictive traffic levels +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1427195721 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 0716df1..2b2592d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -140,6 +140,7 @@ * 2154 Interface-Checks: Separate traffic thresholds for in and out are now possible... * 2155 siemens_plc_counter: added new check for monitoring increasing counter values * 2106 aix_sap_processlist: new check and agent plugin to monitor the process list of SAP Application Server Instances on AIX systems + * 2156 Interface-Checks: Can now be configured to use predictive traffic levels * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/checks/if.include b/checks/if.include index 3aefbca..d2e81bd 100644 --- a/checks/if.include +++ b/checks/if.include @@ -165,7 +165,13 @@ def if_get_traffic_levels(params): def get_specific_traffic_levels(general_traffic_levels, unit, ref_speed, assumed_speed_in, assumed_speed_out): traffic_levels = {} - for (traffic_dir, up_or_low), (level_type, (warn, crit)) in general_traffic_levels.items(): + for (traffic_dir, up_or_low), (level_type, levels) in general_traffic_levels.items(): + if type(levels) != tuple: + traffic_levels[(traffic_dir, 'predictive')] = levels + continue # don't convert predictive levels config + else: + warn, crit = levels + for what, level_value in [('warn', warn), ('crit', crit)]: # If the measurement unit is set to bit and the bw levels # are of type absolute, convert these 'bit' entries to byte @@ -656,7 +662,7 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n if wrapped: # If there is a threshold on the bandwidth, we cannot proceed # further (the check would be flapping to green on a wrap) - if bw_crit != None: + if any(traffic_levels.values()): raise MKCounterWrapped("Counter wrap, skipping checks this time") perfdata = [] else: @@ -674,10 +680,15 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n infotext += ", %s: %s" % (what, format_value(traffic)) - bw_warn = traffic_levels[(what, 'upper', 'warn')] - bw_crit = traffic_levels[(what, 'upper', 'crit')] - bw_warn_min = traffic_levels[(what, 'lower', 'warn')] - bw_crit_min = traffic_levels[(what, 'lower', 'crit')] + if (what, 'predictive') in traffic_levels: + params = traffic_levels[(what, 'predictive')] + bw_warn, bw_crit = None, None + else: + bw_warn = traffic_levels[(what, 'upper', 'warn')] + bw_crit = traffic_levels[(what, 'upper', 'crit')] + bw_warn_min = traffic_levels[(what, 'lower', 'warn')] + bw_crit_min = traffic_levels[(what, 'lower', 'crit')] + params = (bw_warn, bw_crit, bw_warn_min, bw_crit_min) if speed: perc_used = 100.0 * traffic / speed @@ -691,22 +702,17 @@ def check_if_common_single(item, params, info, force_counter_wrap = False, has_n if average: traffic_avg = get_average("if.%s.%s.avg" % (what, item), this_time, traffic, average) infotext += ", %dmin avg: %s" % (average, format_value(traffic_avg)) - perfdata.append( ("%s_avg_%d" % (what, average), traffic_avg, bw_warn, bw_crit, 0, speed) ) + dsname = "%s_avg_%d" % (what, average) + perfdata.append((dsname, traffic_avg, bw_warn, bw_crit, 0, speed)) traffic = traffic_avg # apply levels to average traffic + else: + dsname = what - # Check bandwidth thresholds - if bw_crit != None and traffic >= bw_crit: - state = 2 - infotext += ' (!!) >= ' + format_value(bw_crit) - elif bw_warn != None and traffic >= bw_warn: - state = max(state, 1) - infotext += ' (!) >= ' + format_value(bw_warn) - if bw_crit_min != None and traffic < bw_crit_min: - state = 2 - infotext += ' (!!) < ' + format_value(bw_crit_min) - elif bw_warn_min != None and traffic < bw_warn_min: - state = max(state, 1) - infotext += ' (!) >= ' + format_value(bw_warn_min) + # Check bandwidth thresholds incl. prediction + result = check_levels(traffic, dsname, params, statemarkers=True) + state = max(state, result[0]) + infotext += result[1] + perfdata += result[2] # check percentage of error packets pacrate = urate + nurate + errorrate diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 4b0c130..7ac6737 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1793,18 +1793,23 @@ def regex(pattern): def check_levels(value, dsname, params, unit="", factor=1.0, scale=1.0, statemarkers=False): if unit: unit = " " + unit # Insert space before MB, GB, etc. - perfdata = [] infotexts = [] + scale_value = lambda v: v != None and v * factor * scale or None + # None or (None, None) -> do not check any levels if params == None or params == (None, None): return 0, "", [] # Pair of numbers -> static levels elif type(params) == tuple: - warn_upper, crit_upper = params[0] * factor * scale, params[1] * factor * scale, - warn_lower, crit_lower = None, None + if len(params) == 2: # upper warn and crit + warn_upper, crit_upper = scale_value(params[0]), scale_value(params[1]) + warn_lower, crit_lower = None, None + else: # uppwer and lower warn and crit + warn_upper, crit_upper = scale_value(params[0]), scale_value(params[1]) + warn_lower, crit_lower = scale_value(params[2]), scale_value(params[3]) ref_value = None # Dictionary -> predictive levels

9 years, 3 months

Check_MK Git: check_mk: Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: 793f1344eb3506b09287fa10ea5aa9b6bd449a85 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=793f1344eb3506… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 24 10:36:37 2015 +0100 Removed debug output --- livestatus/src/module.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 6118bc2..d54f6ee 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -729,10 +729,8 @@ void livestatus_parse_arguments(const char *args_orig) } else if (!strcmp(left, "pnp_path")) { g_pnp_path = strndup(right, 4096); - logger(LOG_WARNING, "%s", g_pnp_path); if (right[strlen(right) - 1] != '/') strncat(g_pnp_path, "/", sizeof(&g_pnp_path) - strlen(g_pnp_path) - 1 ); // make sure, that trailing slash is always there - logger(LOG_WARNING, "%s", g_pnp_path); check_path("PNP perfdata directory", g_pnp_path); } else if (!strcmp(left, "mk_inventory_path")) {

9 years, 3 months

Check_MK Git: check_mk: Using new graphs in hover menus (when available)

by Lars Michelsen

Module: check_mk Branch: master Commit: a200a63756139121a0cad031f7863a8b479041f1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a200a637561391… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 24 11:31:37 2015 +0100 Using new graphs in hover menus (when available) --- web/htdocs/check_mk.css | 101 +++--------------------------------------- web/htdocs/htmllib.py | 5 ++- web/htdocs/js/checkmk.js | 33 ++++++++------ web/htdocs/js/hover.js | 17 +++---- web/htdocs/metrics.py | 76 +++++++++++++++++++++++++++++-- web/plugins/icons/builtin.py | 13 +++++- web/plugins/pages/shipped.py | 6 ++- 7 files changed, 124 insertions(+), 127 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a200a63756…

9 years, 3 months

Check_MK Git: check_mk: aix_sap_processlist: check now displays start time and elapsed time of processes, incl. performance data

by Goetz Golla

Module: check_mk Branch: master Commit: d0309f31c890c4abe61b9bd9d392275621d31831 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0309f31c890c4… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Tue Mar 24 10:57:54 2015 +0100 aix_sap_processlist: check now displays start time and elapsed time of processes, incl. performance data --- checkman/aix_sap_processlist | 7 +++++++ checks/aix_sap_processlist | 19 +++++++++++++++---- web/plugins/metrics/check_mk.py | 21 +++++++++++++++++++++ 3 files changed, 43 insertions(+), 4 deletions(-) diff --git a/checkman/aix_sap_processlist b/checkman/aix_sap_processlist index 5cab3d7..7dc6c6d 100644 --- a/checkman/aix_sap_processlist +++ b/checkman/aix_sap_processlist @@ -8,8 +8,15 @@ description: Application Server on AIX systems. The check requires the mk_sap.aix agent plugin to be installed on your AIX system. + The check uses the status information retrieved from the device to determine + the state of the service. In addition it shows the start time of the + process and the elapsed time since then. + item: The description and instance number of each process. inventory: One service is created for each discovered process on each instance. + +perfdata: + The runtime of the process. diff --git a/checks/aix_sap_processlist b/checks/aix_sap_processlist index 9c12159..f30099b 100644 --- a/checks/aix_sap_processlist +++ b/checks/aix_sap_processlist @@ -50,9 +50,15 @@ def parse_aix_sap_processlist(info): instance = line[0][1:-1] elif instance and line[0].startswith("FAIL:"): instance = None - elif instance and len(line) >= 7 and line[-1] != " pid": + elif instance and len(line) == 7 and line[-1] != " pid": + description, status, textstatus, start = map(lambda x: re.sub("^ ","",x), line[1:5]) + start_time = time.strptime(start, "%Y %m %d %H:%M:%S") + new_info.append([instance, description, status, textstatus, start_time]) + elif instance and len(line) == 9: description, status, textstatus = map(lambda x: re.sub("^ ","",x), line[1:4]) - new_info.append([instance, description, status, textstatus]) + start = re.sub("^ ","",line[6]) + start_time = time.strptime(start, "%Y %m %d %H:%M:%S") + new_info.append([instance, description, status, textstatus, start_time]) return new_info def inventory_aix_sap_processlist(info): @@ -61,16 +67,20 @@ def inventory_aix_sap_processlist(info): yield item, None def check_aix_sap_processlist(item, _no_params, info): + now = time.time() for line in info: if item == "%s on Instance %s" % (line[1], line[0]): - infotext = line[3] + start = time.strftime("%c", line[4]) + elapsed = now - time.mktime(line[4]) + infotext = "%s, Start Time: %s, Elapsed Time: %s" % (line[3], start, get_age_human_readable(elapsed)) + perfdata = [ ("runtime", elapsed) ] if line[2] == "GREEN": state = 0 elif line[2] == "YELLOW": state = 1 else: state = 2 - return state, infotext + return state, infotext, perfdata check_info["aix_sap_processlist"] = { @@ -78,4 +88,5 @@ check_info["aix_sap_processlist"] = { 'check_function' : check_aix_sap_processlist, 'parse_function' : parse_aix_sap_processlist, 'service_description' : 'SAP Process %s', + 'has_perfdata' : True, } diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 0b0bc97..6b8f4c9 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -191,6 +191,12 @@ metric_info["uptime"] = { "color" : "#80f000", } +metric_info["runtime"] = { + "title" : _("Process Runtime"), + "unit" : "s", + "color" : "#80f000", +} + metric_info["hit_ratio"] = { "title" : _("Cache hit ratio"), "unit" : "ratio", @@ -710,6 +716,7 @@ check_metrics["check_mk-blade_bx_load"] = {} check_metrics["check_mk-cpu.threads"] = {} check_metrics["check_mk-mem.linux"] = {} +check_metrics["check_mk-aix_sap_processlist"] = {} check_metrics["check_mk-aix_memory"] = { "ramused" : { "name" : "mem_used", "scale": MB }, "swapused" : { "name" : "swap_used", "scale": MB }} check_metrics["check_mk-mem.win"] = { "memory" : { "name" : "mem_used", "scale" : MB }, "pagefile" : { "name" : "pagefile_used", "scale" : MB }} @@ -880,6 +887,13 @@ perfometer_info.append({ "exponent" : 2, }) +perfometer_info.append({ + "type" : "logarithmic", + "metric" : "runtime", + "half_value" : 864000.0, + "exponent" : 2, +}) + perfometer_info.append(("logarithmic", ( "rta", 0.1, 4))) perfometer_info.append(("linear", ( ["execution_time"], 90.0, None))) perfometer_info.append(("logarithmic", ( "load1", 4.0, 2.0))) @@ -1039,6 +1053,13 @@ graph_info.append({ }) graph_info.append({ + "title" : _("Process Runtime"), + "metrics" : [ + ( "runtime", "area" ), + ] +}) + +graph_info.append({ "title" : _("CPU Load - %(load1:max@count) CPU Cores"), "metrics" : [ ( "load1", "area" ),

9 years, 3 months

Check_MK Git: check_mk: Fixed HTML encoding on crash report page

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e5d6a12e300d354c17bdd8d86a67e5242c905c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e5d6a12e300d3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 24 08:31:16 2015 +0100 Fixed HTML encoding on crash report page --- web/htdocs/crashed_check.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/crashed_check.py b/web/htdocs/crashed_check.py index 76ddcd4..5eda8ed 100644 --- a/web/htdocs/crashed_check.py +++ b/web/htdocs/crashed_check.py @@ -36,7 +36,7 @@ def fetch_file_from_tar(tardata, filename): def output_box(title, content): html.write('<h3>%s</h3>' % title) html.write('<div class=log_output>%s</div>' - % html.attrencode(content).replace("\n", "<br>")) + % html.attrencode(content).replace("\n", "<br>").replace(' ', ' ')) def page_crashed_check(): html.header(_("Crashed Check Report"), stylesheets=["status", "pages",]) @@ -90,7 +90,7 @@ def page_crashed_check(): html.context_button(_("Submit Report"), mailto_url, "email") html.end_context_buttons() - output_box(_("Crash report"), trace.replace(" ", " ")) + output_box(_("Crash report"), trace) if agent_output: output_box(_("Agent output"), agent_output)

9 years, 3 months

Check_MK Git: check_mk: Fixed pnp graph detection for nagios based installations

by Lars Michelsen

Module: check_mk Branch: master Commit: 7a5de593014c9d909f3cdfecf69073dd390893e8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7a5de593014c9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 24 09:34:16 2015 +0100 Fixed pnp graph detection for nagios based installations --- livestatus/src/module.c | 11 +++++------ livestatus/src/pnp4nagios.cc | 31 +++++++++++++------------------ 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/livestatus/src/module.c b/livestatus/src/module.c index 7115cd8..6118bc2 100644 --- a/livestatus/src/module.c +++ b/livestatus/src/module.c @@ -97,7 +97,7 @@ void *g_nagios_handle; int g_unix_socket = -1; int g_max_fd_ever = 0; char g_socket_path[4096]; -char g_pnp_path[4096]; // base path for PNP4Nagios graphs +char *g_pnp_path = 0; // base path for PNP4Nagios graphs char g_mk_inventory_path[4096]; // base path of Check_MK inventor files char g_logfile_path[4096]; int g_debug_level = 0; @@ -637,9 +637,6 @@ void livestatus_parse_arguments(const char *args_orig) else strcpy(slash + 1, "livestatus.log"); - /* there is no default PNP path */ - g_pnp_path[0] = 0; - if (!args_orig) return; // no arguments, use default options @@ -731,9 +728,11 @@ void livestatus_parse_arguments(const char *args_orig) } } else if (!strcmp(left, "pnp_path")) { - strncpy(g_pnp_path, right, sizeof(g_pnp_path) - 1); + g_pnp_path = strndup(right, 4096); + logger(LOG_WARNING, "%s", g_pnp_path); if (right[strlen(right) - 1] != '/') - strncat(g_pnp_path, "/", sizeof(g_pnp_path) - strlen(g_pnp_path) - 1 ); // make sure, that trailing slash is always there + strncat(g_pnp_path, "/", sizeof(&g_pnp_path) - strlen(g_pnp_path) - 1 ); // make sure, that trailing slash is always there + logger(LOG_WARNING, "%s", g_pnp_path); check_path("PNP perfdata directory", g_pnp_path); } else if (!strcmp(left, "mk_inventory_path")) { diff --git a/livestatus/src/pnp4nagios.cc b/livestatus/src/pnp4nagios.cc index e001c06..ae1dd2e 100644 --- a/livestatus/src/pnp4nagios.cc +++ b/livestatus/src/pnp4nagios.cc @@ -32,7 +32,7 @@ #include "pnp4nagios.h" -extern char g_pnp_path[]; +extern char *g_pnp_path; char *cleanup_pnpname(char *name) { @@ -51,28 +51,23 @@ int pnpgraph_present(const char *host, const char *service) if (!g_pnp_path[0]) return -1; - char path[4096]; - size_t needed_size = strlen(g_pnp_path) + strlen(host) + 16; - if (service) - needed_size += strlen(service); - if (needed_size > sizeof(path)) - return -1; + string path = g_pnp_path; + char *cleaned_up; + cleaned_up = cleanup_pnpname(strdup(host)); + path += cleaned_up; + free(cleaned_up); + path += "/"; - strcpy(path, g_pnp_path); - char *end = path + strlen(path); - strcpy(end, host); - cleanup_pnpname(end); - strcat(end, "/"); - end = end + strlen(end); if (service) { - strcat(end, service); - cleanup_pnpname(end); - strcat(end, ".xml"); + cleaned_up = cleanup_pnpname(strdup(service)); + path += cleaned_up; + path += ".xml"; + free(cleaned_up); } else - strcat(end, "_HOST_.xml"); + path += "_HOST_.xml"; - if (0 == access(path, R_OK)) + if (0 == access(path.c_str(), R_OK)) return 1; else return 0;

9 years, 3 months

Check_MK Git: check_mk: ibm_imm_fan: FIX for other formats of the FAN rpms

by Goetz Golla

Module: check_mk Branch: master Commit: ec2fb87a6a06f5a9fd14f3ec9abc61a99b63312c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec2fb87a6a06f5… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Mar 23 17:28:59 2015 +0100 ibm_imm_fan: FIX for other formats of the FAN rpms --- checks/ibm_imm_fan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/ibm_imm_fan b/checks/ibm_imm_fan index 898567b..fe9d2a2 100644 --- a/checks/ibm_imm_fan +++ b/checks/ibm_imm_fan @@ -39,7 +39,7 @@ def check_ibm_imm_fan(item, _no_params, info): return 2, "is offline" # speed can be "34 %", or "34%", or "34 % of maximum" - rpm_perc = int(speed.replace("%", " ").split(" ")[0]) + rpm_perc = int(speed.replace("[\"%]", " ").split(" ")[0]) infotext = "%d%% of max rpm" % rpm_perc warn, crit = (28, 25) # preliminary estimates of levels

9 years, 3 months

Check_MK Git: check_mk: #2106 aix_sap_processlist: new check and agent plugin to monitor the process list of SAP Application Server Instances on AIX systems

by Goetz Golla

Module: check_mk Branch: master Commit: f66d3d636cf71a80d8c8366ebdb5c5dac18adc90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f66d3d636cf71a… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Mon Mar 23 17:28:17 2015 +0100 #2106 aix_sap_processlist: new check and agent plugin to monitor the process list of SAP Application Server Instances on AIX systems --- .werks/2106 | 9 +++++ ChangeLog | 1 + agents/plugins/mk_sap.aix | 56 +++++++++++++++++++++++++++++ checkman/aix_sap_processlist | 15 ++++++++ checks/aix_sap_processlist | 81 ++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 162 insertions(+) diff --git a/.werks/2106 b/.werks/2106 new file mode 100644 index 0000000..e188710 --- /dev/null +++ b/.werks/2106 @@ -0,0 +1,9 @@ +Title: aix_sap_processlist: new check and agent plugin to monitor the process list of SAP Application Server Instances on AIX systems +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1427128023 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 94a7a9c..0716df1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -139,6 +139,7 @@ * 2063 winperf_if: now also able to detect the interface port state 'lowerLayerDown'... * 2154 Interface-Checks: Separate traffic thresholds for in and out are now possible... * 2155 siemens_plc_counter: added new check for monitoring increasing counter values + * 2106 aix_sap_processlist: new check and agent plugin to monitor the process list of SAP Application Server Instances on AIX systems * 1457 FIX: logins: new check renamed from "users" check... NOTE: Please refer to the migration notes! * 1762 FIX: lnx_thermal: Now ignoring trip points with level 0... diff --git a/agents/plugins/mk_sap.aix b/agents/plugins/mk_sap.aix new file mode 100755 index 0000000..fb49227 --- /dev/null +++ b/agents/plugins/mk_sap.aix @@ -0,0 +1,56 @@ +#!/bin/bash +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2014 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. + +sapservices="/usr/sap/sapservices" + +if [ -r "$sapservices" ]; then + echo "<<<aix_sap_processlist>>>" + # loop over ids + cat $sapservices | while read LINE + do + command=$(echo $LINE | grep "^LIBPATH=/usr/sap/" | grep -v "^LIBPATH=/usr/sap/D" | awk -F" " '{print $5}') + if [ -n "$command" ]; then + id2=$(echo $command | awk -F"/" '{print $4}') + path=$(echo "/sapmnt/$id2/exe") + id=$(LIBPATH=$LIBPATH:$path $path/sappfpar SAPSYSTEM $command) + echo -n "[$id]" + LIBPATH=$LIBPATH:$path $path/sapcontrol -nr $id -function GetProcessList + fi + done +fi + + +# 16.02.2015 16:39:40 +# GetProcessList +# OK +# name, description, dispstatus, textstatus, starttime, elapsedtime, pid +# msg_server, MessageServer, GREEN, Running, 2015 02 16 16:30:39, 0:09:01, 26345666 +# enserver, EnqueueServer, GREEN, Running, 2015 02 16 16:30:39, 0:09:01, 27787298 + +# 16.03.2015 16:23:24 +# GetProcessList +# FAIL: NIECONN_REFUSED (Connection refused), NiRawConnect failed in plugin_fopen() + + diff --git a/checkman/aix_sap_processlist b/checkman/aix_sap_processlist new file mode 100644 index 0000000..5cab3d7 --- /dev/null +++ b/checkman/aix_sap_processlist @@ -0,0 +1,15 @@ +title: SAP Process List on AIX +agents: aix +catalog: app/sap +license: GPL +distribution: check_mk +description: + This check monitors the SAP process list of instances running on a SAP + Application Server on AIX systems. The check requires the mk_sap.aix + agent plugin to be installed on your AIX system. + +item: + The description and instance number of each process. + +inventory: + One service is created for each discovered process on each instance. diff --git a/checks/aix_sap_processlist b/checks/aix_sap_processlist new file mode 100644 index 0000000..9c12159 --- /dev/null +++ b/checks/aix_sap_processlist @@ -0,0 +1,81 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2015 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. + +# Example output from agent: +# <<<aix_sap_processlist:sep(44)>>> +# [01] +# 23.03.2015 13:49:27 +# GetProcessList +# OK +# name, description, dispstatus, textstatus, starttime, elapsedtime, pid +# msg_server, MessageServer, GREEN, Running, 2015 03 23 05:03:45, 8:45:42, 17563666 +# disp+work, Dispatcher, GREEN, Running, Message Server connection ok, Dialog Queue time: 0.00 sec, 2015 03 23 05:03:45, 8:45:42, 15335532 +# igswd_mt, IGS Watchdog, GREEN, Running, 2015 03 23 05:03:45, 8:45:42, 31326312 +# +# <<<aix_sap_processlist:sep(44)>>> +# [02] +# 23.03.2015 13:59:27 +# GetProcessList +# FAIL: NIECONN_REFUSED (Connection refused), NiRawConnect failed in plugin_fopen() + + +def parse_aix_sap_processlist(info): + instance = None + new_info = [] + for line in info: + if line[0].startswith('['): + instance = line[0][1:-1] + elif instance and line[0].startswith("FAIL:"): + instance = None + elif instance and len(line) >= 7 and line[-1] != " pid": + description, status, textstatus = map(lambda x: re.sub("^ ","",x), line[1:4]) + new_info.append([instance, description, status, textstatus]) + return new_info + +def inventory_aix_sap_processlist(info): + for line in info: + item = "%s on Instance %s" % (line[1], line[0]) + yield item, None + +def check_aix_sap_processlist(item, _no_params, info): + for line in info: + if item == "%s on Instance %s" % (line[1], line[0]): + infotext = line[3] + if line[2] == "GREEN": + state = 0 + elif line[2] == "YELLOW": + state = 1 + else: + state = 2 + return state, infotext + + +check_info["aix_sap_processlist"] = { + 'inventory_function' : inventory_aix_sap_processlist, + 'check_function' : check_aix_sap_processlist, + 'parse_function' : parse_aix_sap_processlist, + 'service_description' : 'SAP Process %s', +}

9 years, 3 months

Check_MK Git: check_mk: Fixed folder view in WATO configuration with HTML entities

by Sven Rueß

Module: check_mk Branch: master Commit: c16a63365782faf238fd4a107865579e5b1bc6b0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c16a63365782fa… Author: Sven Rueß <sr(a)mathias-kettner.de> Date: Mon Mar 23 16:06:49 2015 +0100 Fixed folder view in WATO configuration with HTML entities --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7aa60c6..b58f738 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -14455,7 +14455,7 @@ def folder_selection(folder, depth=0): title_prefix = "   " * depth + "` " + "- " * depth else: title_prefix = "" - sel = [ (folder[".path"], title_prefix + folder["title"]) ] + sel = [ (folder[".path"], HTML(title_prefix + html.attrencode(folder["title"]))) ] subfolders = sorted(folder[".folders"].values(), cmp = lambda x,y : cmp(x.get("title").lower(), y.get("title").lower())) for subfolder in subfolders:

9 years, 3 months

← Newer
1
...
5
6
7
8
9
10
11
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015