Checkmk git commits June 2014

checkmk-commits@lists.checkmk.com

6 participants
135 discussions

Check_MK Git: check_mk: Fixed .f12 in checkman directory

by Mathias Kettner

Module: check_mk Branch: master Commit: addbeab97746f1dd4ca3a712b363efef985306cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=addbeab97746f1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 4 16:54:16 2014 +0200 Fixed .f12 in checkman directory --- checkman/.f12 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checkman/.f12 b/checkman/.f12 index cff63d9..05632be 100644 --- a/checkman/.f12 +++ b/checkman/.f12 @@ -1,3 +1,5 @@ +#!/bin/bash +SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} sudo rsync -var --delete ./ /omd/sites/$SITE/share/check_mk/checkman/ sudo rm -f /omd/sites/$SITE/share/check_mk/checkman/.f12

10 years

Check_MK Git: check_mk: Added first inline snmp statistics recording code

by Lars Michelsen

Module: check_mk Branch: master Commit: 3368304ffdc6c010ec720364f0c7f90c839169ab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3368304ffdc6c0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 4 14:18:34 2014 +0200 Added first inline snmp statistics recording code --- modules/check_mk.py | 3 ++- modules/check_mk_base.py | 3 +++ web/plugins/wato/check_mk_configuration.py | 15 +++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 9ee89ac..eb34e88 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -243,6 +243,7 @@ max_num_processes = 50 # SNMP communities and encoding has_inline_snmp = False # is set to True by inline_snmp module, when available use_inline_snmp = True +record_inline_snmp_stats = False snmp_default_community = 'public' snmp_communities = [] snmp_timing = [] @@ -3294,7 +3295,7 @@ no_inventory_possible = None 'piggyback_max_cachefile_age', 'simulation_mode', 'agent_simulator', 'aggregate_check_mk', 'debug_log', 'check_mk_perfdata_with_times', 'livestatus_unix_socket', - 'has_inline_snmp', 'use_inline_snmp', + 'has_inline_snmp', 'use_inline_snmp', 'record_inline_snmp_stats', ]: output.write("%s = %r\n" % (var, globals()[var])) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index e57a3e7..511adf0 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -1015,6 +1015,9 @@ def do_check(hostname, ipaddress, only_check_types = None): else: output += "execution time %.1f sec|execution_time=%.3f\n" % (run_time, run_time) + if record_inline_snmp_stats and has_inline_snmp and use_inline_snmp: + save_snmp_stats() + if opt_keepalive: global total_check_output total_check_output += output diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index e5f02b9..6e034b0 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -1131,6 +1131,21 @@ register_configvar(group, need_restart = True ) +register_configvar(group, + "record_inline_snmp_stats", + Checkbox( + title = _("Record statistics of Inline SNMP"), + label = _("Enable recording of Inline SNMP statistics"), + help = _("When you have enabled Inline SNMP, you can use this flag to enable recording of " + "some performance related values. The recorded values are stored in a single file " + "at <tt>var/check_mk/snmp.stats</tt>.<br><br>" + "<i>Please note:</i> Only enable this for a short period, because it will " + "decrease the performance of your monitoring."), + default_value = False + ), + need_restart = True +) + group = _("Service discovery") register_configvar(group,

10 years

Check_MK Git: check_mk: mk_mysql: Cleaned up comment folding

by Lars Michelsen

Module: check_mk Branch: master Commit: 038be82cb7fb076e85eefa0eb88ee427cdc972c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=038be82cb7fb07… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 4 13:47:58 2014 +0200 mk_mysql: Cleaned up comment folding --- checks/mysql | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/checks/mysql b/checks/mysql index 4c217a0..f002407 100644 --- a/checks/mysql +++ b/checks/mysql @@ -38,7 +38,7 @@ # Com_alter_db 0 # Com_alter_db_upgrade 0 -# .----------------------------------------------------------------------. +# .--Helpers-------------------------------------------------------------. # | _ _ _ | # | | | | | ___| |_ __ ___ _ __ ___ | # | | |_| |/ _ \ | '_ \ / _ \ '__/ __| | @@ -67,8 +67,8 @@ def parse_mysql(info): values[varname] = value return values - -# .----------------------------------------------------------------------. +#. +# .--Sessions------------------------------------------------------------. # | ____ _ | # | / ___| ___ ___ ___(_) ___ _ __ ___ | # | \___ \ / _ \/ __/ __| |/ _ \| '_ \/ __| | @@ -125,8 +125,8 @@ check_info['mysql.sessions'] = { "group" : "mysql_sessions", } - -# .----------------------------------------------------------------------. +#. +# .--InnoDB-IO-----------------------------------------------------------. # | ___ ____ ____ ___ ___ | # | |_ _|_ __ _ __ ___ | _ \| __ ) |_ _/ _ \ | # | | || '_ \| '_ \ / _ \| | | | _ \ _____| | | | | | @@ -155,6 +155,7 @@ check_info['mysql.innodb_io'] = { "group" : "mysql_innodb_io", } +#. # .--Connections---------------------------------------------------------. # | ____ _ _ | # | / ___|___ _ __ _ __ ___ ___| |_(_) ___ _ __ ___ |

10 years

Check_MK Git: check_mk: MySQL agent: Preparation for monitoring slave state

by Lars Michelsen

Module: check_mk Branch: master Commit: 22d28fd2f5a624eb69417a6ee34cae223f714356 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22d28fd2f5a624… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 4 13:48:38 2014 +0200 MySQL agent: Preparation for monitoring slave state --- agents/plugins/mk_mysql | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/agents/plugins/mk_mysql b/agents/plugins/mk_mysql index de28d4c..8f9707f 100755 --- a/agents/plugins/mk_mysql +++ b/agents/plugins/mk_mysql @@ -31,5 +31,13 @@ then mysqladmin --defaults-extra-file=$MK_CONFDIR/mysql.cfg ping 2>&1 mysql --defaults-extra-file=$MK_CONFDIR/mysql.cfg -sN \ - -e "select '<<<mysql>>>' ; show global status; show global variables; select '<<<mysql_capacity>>>' ; SELECT table_schema, sum( data_length + index_length ), sum( data_free ) FROM information_schema.TABLES GROUP BY table_schema;" + -e "select '<<<mysql>>>' ; + show global status ; show global variables ; + + select '<<<mysql_capacity>>>' ; + SELECT table_schema, sum(data_length + index_length), sum(data_free) + FROM information_schema.TABLES GROUP BY table_schema ; + + SELECT '<<<mysql_slave>>>' ; + show slave status\G" fi

10 years

Check_MK Git: check_mk: Fixed syntax error in check catalog

by Lars Michelsen

Module: check_mk Branch: master Commit: a0151c846d30cfd5f1dead929a5c4df264c804b7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a0151c846d30cf… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jun 4 12:12:58 2014 +0200 Fixed syntax error in check catalog --- modules/catalog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/catalog.py b/modules/catalog.py index 23c3eb5..962d3b3 100644 --- a/modules/catalog.py +++ b/modules/catalog.py @@ -59,7 +59,7 @@ manpage_catalog_titles = { "db2" : "IBM DB2", "exchange" : "Microsoft Exchange", "java" : "Java (Tomcat, Weblogic, JBoss, etc.)", - "libelle" : "Libelle Business Shadow" + "libelle" : "Libelle Business Shadow", "mailman" : "Mailman", "mssql" : "Microsoft SQL Server", "mysql" : "MySQL",

10 years

Check_MK Git: check_mk: Availability: display phases of freqent state changes as "chaos"

by Mathias Kettner

Module: check_mk Branch: master Commit: 4718aa0ba52120c9719dd3c6fbcb1936ab0cecb8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4718aa0ba52120… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 4 11:30:11 2014 +0200 Availability: display phases of freqent state changes as "chaos" This makes sure that phases with thousand state changes with in a short time are being displayed as correctly as possible. --- .werks/985 | 9 +++++++++ ChangeLog | 3 +++ web/htdocs/views.css | 4 ++++ web/plugins/views/availability.py | 34 +++++++++++++++++++++++++++++++--- 4 files changed, 47 insertions(+), 3 deletions(-) diff --git a/.werks/985 b/.werks/985 new file mode 100644 index 0000000..dde292a --- /dev/null +++ b/.werks/985 @@ -0,0 +1,9 @@ +Title: Availability: display phases of freqent state changes as "chaos" +Level: 1 +Component: reporting +Version: 1.2.5i4 +Date: 1401874149 +Class: feature + +This makes sure that phases with thousand state changes with in a +short time are being displayed as correctly as possible. diff --git a/ChangeLog b/ChangeLog index 154f620..0e66b5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,9 @@ WATO: * 0813 FIX: LDAP: Improved slightly missleading logging of LDAP sync actions... + Reporting & Availability: + * 0985 Availability: display phases of freqent state changes as "chaos"... + 1.2.5i3: Core & Setup: diff --git a/web/htdocs/views.css b/web/htdocs/views.css index 1d07c68..2f5a724 100644 --- a/web/htdocs/views.css +++ b/web/htdocs/views.css @@ -586,6 +586,10 @@ table.timeline td { border-style: none; } +table.timeline td.chaos { + background-color: #8844ff; +} + table.timeline.standalone td { border: 1px solid #444; } diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index f8fa9a4..9d211c3 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -839,7 +839,7 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, # Render graphical representation # Make sure that each cell is visible, if possible - min_percentage = min(100.0 / len(timeline_rows), style == "inline" and 0.1 or 0.5) + min_percentage = min(100.0 / len(timeline_rows), style == "inline" and 0.0 or 0.5) rest_percentage = 100 - len(timeline_rows) * min_percentage html.write('<div class="timelinerange %s">' % style) if style == "standalone": @@ -848,6 +848,19 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, html.write('<table class="timeline %s">' % style) html.write('<tr class=timeline>') + chaos_begin = None + chaos_end = None + chaos_count = 0 + chaos_width = 0 + + def output_chaos_period(chaos_begin, chaos_end, chaos_count, chaos_width): + title = _("%d chaotic state changes from %s until %s (%s)") % ( + chaos_count, + render_date(chaos_begin), render_date(chaos_end), + render_number(chaos_end - chaos_begin, considered_duration)) + html.write('<td style="width: %.3f%%" title="%s" class="chaos"></td>' % ( + max(0.2, chaos_width), html.attrencode(title))) + for row_nr, (row, state_id) in enumerate(timeline_rows): for sid, css, sname, help in availability_columns: if sid == state_id: @@ -857,9 +870,24 @@ def render_timeline(timeline_rows, from_time, until_time, considered_duration, help and help or sname) if row["log_output"]: title += " - " + row["log_output"] - width = min_percentage + rest_percentage * row["duration"] / considered_duration + width = rest_percentage * row["duration"] / considered_duration + if style == "inline" and width < 0.05: + if not chaos_begin: + chaos_begin = row["from"] + chaos_width += width + chaos_count += 1 + chaos_end = row["until"] + continue + elif chaos_begin and chaos_count > 1: + output_chaos_period(chaos_begin, chaos_end, chaos_count, chaos_width) + chaos_begin = None + chaos_count = 0 + chaos_width = 0 + continue + + width += min_percentage html.write('<td onmouseover="timeline_hover(%d, 1);" onmouseout="timeline_hover(%d, 0);" ' - 'style="width: %.1f%%" title="%s" class="%s"></td>' % ( + 'style="width: %.3f%%" title="%s" class="%s"></td>' % ( row_nr, row_nr, width, html.attrencode(title), css)) html.write('</tr></table>')

10 years

Check_MK Git: check_mk: apc_symmetra: check now also monitors the battery replacement status

by Goetz Golla

Module: check_mk Branch: master Commit: a04bee7734dbed6888cb6bf6d2a5d3d78af44ef9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a04bee7734dbed… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Jun 4 10:30:28 2014 +0200 apc_symmetra: check now also monitors the battery replacement status --- .werks/615 | 8 ++++++++ ChangeLog | 1 + checkman/apc_symmetra | 31 +++++++++++++++++++------------ checks/apc_symmetra | 39 ++++++++++++++++++++++++++++----------- 4 files changed, 56 insertions(+), 23 deletions(-) diff --git a/.werks/615 b/.werks/615 new file mode 100644 index 0000000..86cc707 --- /dev/null +++ b/.werks/615 @@ -0,0 +1,8 @@ +Title: apc_symmetra: check now also monitors the battery replacement status +Level: 1 +Component: checks +Version: 1.2.5i3 +Date: 1401870579 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 8e4e1b2..4fc1d94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -64,6 +64,7 @@ * 0926 windows agent: local / plugin scripts now get the REMOTE_HOST as environment variable * 0163 kaspersky_av_quarantine,kaspersky_av_tasks,kaspersky_av_updates: New checks for kaspersky anti virus on linux * 0164 symantec_av_progstate,symantec_av_quarantine, symantec_av_updates: New checks for Symantec Anti Virus on Linux + * 0615 apc_symmetra: check now also monitors the battery replacement status * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection diff --git a/checkman/apc_symmetra b/checkman/apc_symmetra index a04a997..a05c1d6 100644 --- a/checkman/apc_symmetra +++ b/checkman/apc_symmetra @@ -4,20 +4,27 @@ catalog: hw/power/apc license: GPL distribution: check_mk description: - This check monitors eight aspects of an APC Symmetra UPS: {(1)} the battery status, - {(2)} the output status, {(3)} the battery capacity, {(4)} the battery - temperature, {(5)} the battery current, {(6)} the output voltage and - {(7)} the output current, {(8)} the remaing run time. The output current and - remaining run time are not checked against a level but are just displayed, {(9)} the current - load in percent. + + This check monitors ten aspects of an APC Symmetra UPS: {(1)} the + battery status, {(2)} the battery replacement status including the number + of batteries to be replaced, {(3)} the output status, {(4)} the battery + capacity, {(5)} the battery temperature, {(6)} the battery current, {(7)} + the output voltage, {(8)} the output current, {(9)} the remaing run time, + and {(10)} the current load in percent. + + The output current and remaining run time are not checked against a level, + but just displayed. {(2)} is only displayed if a problem is found, the level + is {WARN} if one battery needs to be replaced and {CRIT} if more than one + battery needs to be replaced. {(1)} is not displayed if the state is normal + but a problem in {(2)} was found. The check output includes the calibration status of the UPS. During a - calibration the check result in section {(2)} is OK even though the UPS is running - on battery. - The check reads the date of the last calibration and optionally applies an alternative - level for the battery capacity on the day of the calibration. This is because the battery - capacity is reduced after calibration and may cause an unwanted critical condition - with the standard level. In addition a time span after the day of the calibration + calibration the check result in section {(2)} is OK even though the UPS is + running on battery. The check reads the date of the last calibration and + optionally applies an alternative level for the battery capacity on the + day of the calibration. This is because the battery capacity is reduced + after calibration and may cause an unwanted critical condition with the + standard level. In addition a time span after the day of the calibration can be configured during which the post-calibration phase still persists. examples: diff --git a/checks/apc_symmetra b/checks/apc_symmetra index f7a32d3..dda0fcd 100644 --- a/checks/apc_symmetra +++ b/checks/apc_symmetra @@ -29,6 +29,8 @@ # PowerNet-MIB::upsBasicOutputStatus.0 .1.3.6.1.4.1.318.1.1.1.4.1.1.0 # PowerNet-MIB::upsAdvBatteryCapacity.0 .1.3.6.1.4.1.318.1.1.1.2.2.1.0 # PowerNet-MIB::upsAdvBatteryTemperature.0 .1.3.6.1.4.1.318.1.1.1.2.2.2.0 +# PowerNet-MIB::upsAdvBatteryReplaceIndicator.0 .1.3.6.1.4.1.318.1.1.1.2.2.4.0 +# PowerNet-MIB::upsAdvBatteryNumOfBadBattPacks.0 .1.3.6.1.4.1.318.1.1.1.2.2.6.0 # PowerNet-MIB::upsAdvBatteryCurrent.0 .1.3.6.1.4.1.318.1.1.1.2.2.9.0 # PowerNet-MIB::upsAdvOutputVoltage.0 .1.3.6.1.4.1.318.1.1.1.4.2.1.0 # PowerNet-MIB::upsAdvOutputCurrent.0 .1.3.6.1.4.1.318.1.1.1.4.2.4.0 @@ -78,9 +80,10 @@ factory_settings["apc_default_levels"] = { def check_apc(item, params, info): BasicBatteryStatus, BasicOutputStatus, AdvBatteryCapacity, \ - AdvBatteryTemperature, AdvBatteryCurrent, AdvInputVoltage, AdvOutputVoltage, \ + AdvBatteryTemperature, AdvBatteryReplaceIndicator, AdvBatteryNumOfBadBattPacks, \ + AdvBatteryCurrent, AdvInputVoltage, AdvOutputVoltage, \ AdvOutputCurrent, AdvBatteryRunTimeRemaining, AdvTestCalibrationResults, AdvOutputLoad \ - = [ saveint(x) for x in info[0][:11] ] + = [ saveint(x) for x in info[0][:13] ] LastDiagnosticsDate = info[0][-1] RunTimeRemaining = AdvBatteryRunTimeRemaining / 100 @@ -110,11 +113,23 @@ def check_apc(item, params, info): if BasicBatteryStatus != 2: state = 2 infotxt += "(!!)" + single_states.append( (state, infotxt, None) ) else: state = 0 - single_states.append( (state, infotxt, None) ) - # 2. Check basic output status + # 2. Check battery replacement status + if AdvBatteryReplaceIndicator == 2: + if AdvBatteryNumOfBadBattPacks == 1: + infotxt = "one battery needs replacement(!)" + state = 1 + else: + infotxt = "%i batteries need replacement(!!)" % AdvBatteryNumOfBadBattPacks + state = 2 + single_states.append( (state, infotxt, None) ) + elif state == 0: # if normal only print when replacement status is also OK, to save on service output text + single_states.append( (state, infotxt, None) ) + + # 3. Check basic output status status_text = { 1:"unknown", 2:"online", 3:"on battery", 4:"on smart boost", 5:"timed sleeping", 6:"software bypass", 7:"off", 8:"rebooting", 9:"switched bypass", 10:"hardware failure bypass", 11:"sleeping until power return", @@ -129,7 +144,7 @@ def check_apc(item, params, info): state = 0 single_states.append( (state, infotxt, None) ) - # 3. Check battery capacity + # 4. Check battery capacity state = 0 infotxt = "capacity %d%% (crit at " % AdvBatteryCapacity @@ -146,7 +161,7 @@ def check_apc(item, params, info): single_states.append( (state, infotxt, ("capacity", AdvBatteryCapacity, "", crit_capacity, 0, 100)) ) - # 4. Check System temperature + # 5. Check System temperature # The Name AdvBatteryTemperature is a wrong naming in the vendor mib. infotxt = "sys. temp. %dC" % AdvBatteryTemperature if AdvBatteryTemperature >= crit_sys_temp: @@ -156,7 +171,7 @@ def check_apc(item, params, info): state = 0 single_states.append( (state, infotxt, ("systemp", AdvBatteryTemperature, "", crit_sys_temp) ) ) - # 5. Check battery current + # 6. Check battery current infotxt = "bat. curr. %dA" % AdvBatteryCurrent if AdvBatteryCurrent >= crit_batt_curr: state = 2 @@ -168,7 +183,7 @@ def check_apc(item, params, info): # 6a. Simply show input voltage (no performance data) single_states.append( (0, "input voltage %dV" % AdvInputVoltage, None) ) - # 6. Check output voltage + # 7. Check output voltage infotxt = "output voltage %dV" % AdvOutputVoltage if AdvOutputVoltage <= crit_voltage: state = 2 @@ -177,17 +192,17 @@ def check_apc(item, params, info): state = 0 single_states.append( (state, infotxt, ("voltage", AdvOutputVoltage, "", crit_voltage, 0) ) ) - # 7. Simply add output current as perfdata + # 8. Simply add output current as perfdata single_states.append( (0, "output current %dA" % AdvOutputCurrent, ("current", AdvOutputCurrent)) ) - # 8. run time remaining + # 9. run time remaining # RunTimeRemaining formatiert == "26:00.00" hrs = int(RunTimeRemaining) / 3600 mins, secs = divmod(int(RunTimeRemaining) % 3600, 60) single_states.append( (0, "run time remaining: %02d:%02d:%02d" % (hrs, mins, secs), ("runtime", RunTimeRemaining/60)) ) - # 9. Adv Output load (load in percent) + # 10. Adv Output load (load in percent) load_state = 0 loadwarn, loadcrit = None, None label = "" @@ -227,6 +242,8 @@ check_info['apc_symmetra'] = { "4.1.1.0", # BasicOutputStatus, "2.2.1.0", # AdvBatteryCapacity, "2.2.2.0", # AdvBatteryTemperature, + "2.2.4.0", # AdvBatteryReplaceIndicator, + "2.2.6.0", # AdvBatteryNumOfBadBattPacks, "2.2.9.0", # AdvBatteryCurrent, "3.2.1.0", # AdvInputVoltage, "4.2.1.0", # AdvOutputVoltage,

10 years

Check_MK Git: check_mk: A few adaptions for the stathist cache

by Mathias Kettner

Module: check_mk Branch: master Commit: 799aeddc8b028020cab9d177a3641e571f8e6c53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=799aeddc8b0280… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Jun 4 09:51:40 2014 +0200 A few adaptions for the stathist cache --- livestatus/src/LogCache.cc | 11 ++++++---- livestatus/src/LogEntry.h | 4 ++-- livestatus/src/Logfile.cc | 48 ++++++++++++++++++++++++++++++++++++++++++++ livestatus/src/Logfile.h | 1 + 4 files changed, 58 insertions(+), 6 deletions(-) diff --git a/livestatus/src/LogCache.cc b/livestatus/src/LogCache.cc index 900ce25..0d23a8d 100644 --- a/livestatus/src/LogCache.cc +++ b/livestatus/src/LogCache.cc @@ -22,13 +22,15 @@ // to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, // Boston, MA 02110-1301 USA. -#include <time.h> -#include <sys/types.h> #include <dirent.h> -#include <unistd.h> -#include <stddef.h> +#include <fcntl.h> #include <stdarg.h> +#include <stddef.h> #include <stdlib.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <time.h> +#include <unistd.h> #include "nagios.h" #include "logger.h" @@ -297,3 +299,4 @@ void LogCache::handleNewMessage(Logfile *logfile, time_t since __attribute__ ((_ num_cached_log_messages, _max_cached_messages); } + diff --git a/livestatus/src/LogEntry.h b/livestatus/src/LogEntry.h index 7c45f87..305cced 100644 --- a/livestatus/src/LogEntry.h +++ b/livestatus/src/LogEntry.h @@ -87,6 +87,8 @@ struct LogEntry LogEntry(unsigned lineno, char *line); ~LogEntry(); unsigned updateReferences(); + static int serviceStateToInt(char *s); + static int hostStateToInt(char *s); private: bool handleStatusEntry(); @@ -98,8 +100,6 @@ private: bool handleLogversionEntry(); bool handleInfoEntry(); bool handleTextEntry(); - int serviceStateToInt(char *s); - int hostStateToInt(char *s); }; #endif // LogEntry_h diff --git a/livestatus/src/Logfile.cc b/livestatus/src/Logfile.cc index 8895845..8a56e77 100644 --- a/livestatus/src/Logfile.cc +++ b/livestatus/src/Logfile.cc @@ -267,3 +267,51 @@ void Logfile::updateReferences() #endif } +// Read complete file into newly allocated buffer. Returns a pointer +// to a malloced buffer, that the caller must free (or 0, in case of +// an error). The buffer is 2 bytes larger then the file. One byte +// at the beginning and at the end of the buffer are '\0'. +char *Logfile::readIntoBuffer(int *size) +{ + int fd = open(_path, O_RDONLY); + if (fd < 0) { + logger(LOG_WARNING, "Cannot open %s for reading: %s", _path, strerror(errno)); + return 0; + } + + off_t o = lseek(fd, 0, SEEK_END); + if (o == -1) { + logger(LOG_WARNING, "Cannot seek to end of %s: %s", _path, strerror(errno)); + close(fd); + return 0; + } + + *size = o; + lseek(fd, 0, SEEK_SET); + + char *buffer = (char *)malloc(*size + 2); // add space for binary 0 at beginning and end + if (!buffer) { + logger(LOG_WARNING, "Cannot malloc buffer for reading %s: %s", _path, strerror(errno)); + close(fd); + return 0; + } + + int r = read(fd, buffer + 1, *size); + if (r < 0) { + logger(LOG_WARNING, "Cannot read %d bytes from %s: %s", *size, _path, strerror(errno)); + free(buffer); + close(fd); + return 0; + } + else if (r != *size) { + logger(LOG_WARNING, "Read only %d out of %d bytes from %s", r, *size, _path); + free(buffer); + close(fd); + return 0; + } + buffer[0] = 0; + buffer[*size+1] = 0; // zero-terminate + + close(fd); + return buffer; +} diff --git a/livestatus/src/Logfile.h b/livestatus/src/Logfile.h index 931b03a..8c4994d 100644 --- a/livestatus/src/Logfile.h +++ b/livestatus/src/Logfile.h @@ -61,6 +61,7 @@ public: ~Logfile(); char *path() { return _path; } + char *readIntoBuffer(int *size); void load(LogCache *LogCache, time_t since, time_t until, unsigned logclasses); void flush(); time_t since() { return _since; }

10 years

Check_MK Git: check_mk: Added missing Livestatus file to Makefile.am

by Mathias Kettner

Module: check_mk Branch: master Commit: a17e34f09e144feecb5c74b8431da6a5b45aa582 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a17e34f09e144f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 3 10:52:58 2014 +0200 Added missing Livestatus file to Makefile.am --- livestatus/src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/livestatus/src/Makefile.am b/livestatus/src/Makefile.am index f89bd58..a22d9b7 100644 --- a/livestatus/src/Makefile.am +++ b/livestatus/src/Makefile.am @@ -48,7 +48,7 @@ livestatus_so_SOURCES = \ OffsetStringHostMacroColumn.cc StatsColumn.cc IntAggregator.cc CountAggregator.cc \ DoubleAggregator.cc AttributelistColumn.cc AttributelistFilter.cc \ global_counters.c module.c logger.c waittriggers.c TimeperiodsCache.cc pnp4nagios.cc \ - ContactgroupsColumn.cc CustomTimeperiodColumn.cc opids.cc auth.cc + ContactgroupsColumn.cc CustomTimeperiodColumn.cc HostServiceState.cc opids.cc auth.cc livestatus_so_CXXFLAGS = -I$(top_srcdir)/$(nagios_headers) -fPIC livestatus_so_CFLAGS = $(livestatus_so_CXXFLAGS)

10 years

Check_MK Git: check_mk: Added missing Livestatus file

by Mathias Kettner

Module: check_mk Branch: master Commit: c7785bb91864f27eaf52134e741a963bf4a2dc61 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7785bb91864f2… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Jun 3 10:51:58 2014 +0200 Added missing Livestatus file --- livestatus/src/HostServiceState.cc | 68 +++++++++++++++++++++++++ livestatus/src/HostServiceState.h | 97 ++++++++++++++++++++++++++++++++++++ 2 files changed, 165 insertions(+) diff --git a/livestatus/src/HostServiceState.cc b/livestatus/src/HostServiceState.cc new file mode 100644 index 0000000..eff4561 --- /dev/null +++ b/livestatus/src/HostServiceState.cc @@ -0,0 +1,68 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2013 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. + +#include "HostServiceState.h" + +HostServiceState::~HostServiceState() +{ + if (_log_output != 0) + free(_log_output); +} + +void HostServiceState::computePerStateDurations() +{ + _duration_state_UNMONITORED = 0; + _duration_part_UNMONITORED = 0; + _duration_state_OK = 0; + _duration_part_OK = 0; + _duration_state_WARNING = 0; + _duration_part_WARNING = 0; + _duration_state_CRITICAL = 0; + _duration_part_CRITICAL = 0; + _duration_state_UNKNOWN = 0; + _duration_part_UNKNOWN = 0; + + switch (_state) { + case -1: + _duration_state_UNMONITORED = _duration; + _duration_part_UNMONITORED = _duration_part; + break; + case 0: + _duration_state_OK = _duration; + _duration_part_OK = _duration_part; + break; + case 1: + _duration_state_WARNING = _duration; + _duration_part_WARNING = _duration_part; + break; + case 2: + _duration_state_CRITICAL = _duration; + _duration_part_CRITICAL = _duration_part; + break; + case 3: + _duration_state_UNKNOWN = _duration; + _duration_part_UNKNOWN = _duration_part; + break; + } +} diff --git a/livestatus/src/HostServiceState.h b/livestatus/src/HostServiceState.h new file mode 100644 index 0000000..8dec7e5 --- /dev/null +++ b/livestatus/src/HostServiceState.h @@ -0,0 +1,97 @@ +// +------------------------------------------------------------------+ +// | ____ _ _ __ __ _ __ | +// | / ___| |__ ___ ___| | __ | \/ | |/ / | +// | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +// | | |___| | | | __/ (__| < | | | | . \ | +// | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +// | | +// | Copyright Mathias Kettner 2013 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. + +#ifndef HostServiceState_h +#define HostServiceState_h + +#include <time.h> +#include <string.h> +#include <nagios.h> +#include <vector> +using namespace std; + +struct HostServiceState; +typedef vector<HostServiceState*> HostServices; + +typedef void* HostServiceKey; + +struct HostServiceState { + bool _is_host; + time_t _time; + int _lineno; + time_t _from; + time_t _until; + + time_t _duration; + double _duration_part; + + // Do not change order within this block! + // These durations will be bzero'd + time_t _duration_state_UNMONITORED; + double _duration_part_UNMONITORED; + time_t _duration_state_OK; + double _duration_part_OK; + time_t _duration_state_WARNING; + double _duration_part_WARNING; + time_t _duration_state_CRITICAL; + double _duration_part_CRITICAL; + time_t _duration_state_UNKNOWN; + double _duration_part_UNKNOWN; + + // State information + int _host_down; // used if service + int _state; // -1/0/1/2/3 + int _in_notification_period; + int _in_service_period; + int _in_downtime; + int _in_host_downtime; + int _is_flapping; + + // Service information + HostServices _services; + + // Absent state handling + bool _may_no_longer_exist; + bool _has_vanished; + time_t _last_known_time; + + + const char *_debug_info; + // Pointer to dynamically allocated strings (strdup) that live here. + // These pointers are 0, if there is no output (e.g. downtime) + char *_log_output; + char *_notification_period; // may be "": -> no period known, we assume "always" + char *_service_period; // may be "": -> no period known, we assume "always" + host *_host; + service *_service; + const char *_host_name; // Fallback if host no longer exists + const char *_service_description; // Fallback if service no longer exists + + HostServiceState() { bzero(this, sizeof(HostServiceState)); } + ~HostServiceState(); + void computePerStateDurations(); + void debug_me(const char *loginfo, ...); +}; + +#endif // HostServiceState_h

10 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits June 2014