Checkmk git commits March 2016

checkmk-commits@lists.checkmk.com

7 participants
275 discussions

3259 FIX ad_replication: fixed wrong timestamp handling

by Simon Betz

Module: check_mk Branch: master Commit: 6767560fa3e9dbae617b60c4a50bb424c39d6e09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6767560fa3e9db… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Mar 8 14:09:37 2016 +0100 3259 FIX ad_replication: fixed wrong timestamp handling --- .werks/3259 | 10 ++++++++++ ChangeLog | 1 + checks/ad_replication | 31 +++++++++++++++---------------- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/.werks/3259 b/.werks/3259 new file mode 100644 index 0000000..4c0693b --- /dev/null +++ b/.werks/3259 @@ -0,0 +1,10 @@ +Title: ad_replication: fixed wrong timestamp handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457442486 + + diff --git a/ChangeLog b/ChangeLog index 71547a6..eb82124 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ * 3277 FIX: veeam_jobs: Handling missing state "Postprocessing" now * 3278 FIX: fritz_wan_if: Fixed incorrect unit Bit used in check * 3092 FIX: isc_dhcpd: fixed incorrect handling of timezones + * 3259 FIX: ad_replication: fixed wrong timestamp handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ad_replication b/checks/ad_replication index 7e85bc8..9217837 100644 --- a/checks/ad_replication +++ b/checks/ad_replication @@ -38,9 +38,11 @@ ad_replication_default_params = (15,20) def parse_ad_replication_dates(s): if s == '0' or s == '(never)': - return None + return None, "unknown" else: - return time.mktime(time.strptime(s, '%Y-%m-%d %H:%M:%S')) + s_val = time.mktime(time.strptime(s, '%Y-%m-%d %H:%M:%S')) + s_txt = get_relative_date_human_readable(s_val) + return s_val, s_txt def parse_ad_replication_info(info): lines = [] @@ -87,8 +89,8 @@ def check_ad_replication(item, params, info): if lineType == 'showrepl_INFO' and source_site+'/'+source_dc == item: foundLine = True - time_last_failure = parse_ad_replication_dates(time_last_failure) - time_last_success = parse_ad_replication_dates(time_last_success) + time_last_failure, time_last_failure_txt = parse_ad_replication_dates(time_last_failure) + time_last_success, time_last_success_txt = parse_ad_replication_dates(time_last_success) max_failures_warn = params[0] max_failures_crit = params[1] @@ -96,30 +98,27 @@ def check_ad_replication(item, params, info): if int(num_failures) > max_failures_warn: status = 1 output += '(!) %s/%s replication of context %s reached ' \ - ' the threshold of maximum failures (%s) (last success: %s, ' \ - 'last failure: %s, num failures: %s Status: %s), ' % \ + ' the threshold of maximum failures (%s) (Last success: %s, ' \ + 'Last failure: %s, Num failures: %s, Status: %s), ' % \ (source_site, source_dc, naming_context, max_failures_warn, - get_relative_date_human_readable(time_last_success), - get_relative_date_human_readable(time_last_failure), num_failures, statusLastFailure) + time_last_success_txt, time_last_failure_txt, num_failures, statusLastFailure) if int(num_failures) > max_failures_crit: status = 2 output += '(!!) %s/%s replication of context %s reached ' \ - ' the threshold of maximum failures (%s) (last success: %s, ' \ - 'last failure: %s, num failures: %s, status: %s), ' % \ + ' the threshold of maximum failures (%s) (Last success: %s, ' \ + 'Last failure: %s, Num failures: %s, Status: %s), ' % \ (source_site, source_dc, naming_context, max_failures_crit, - get_relative_date_human_readable(time_last_success), - get_relative_date_human_readable(time_last_failure), num_failures, statusLastFailure) + time_last_success_txt, time_last_failure_txt, num_failures, statusLastFailure) if time_last_failure != None and time_last_success != None \ and time_last_failure > time_last_success: status = 2 output += '(!!) %s/%s replication of context %s failed ' \ - '(last success: %s, last failure: %s num_failures: %s, status: %s), ' % \ + '(Last success: %s, Last failure: %s, Num failures: %s, Status: %s), ' % \ (source_site, source_dc, naming_context, - get_relative_date_human_readable(time_last_success), - get_relative_date_human_readable(time_last_failure), - num_failures, statusLastFailure) + time_last_success_txt, time_last_failure_txt, num_failures, statusLastFailure) + if not foundLine: return (3, 'Replication information for %s not found' % item)

8 years, 6 months

Minor cleanup: Renamed function to something more meaningful

by Lars Michelsen

Module: check_mk Branch: master Commit: 3a48a4b7b1127f1c1e44a8e49e84500e64a0afc1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3a48a4b7b1127f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 8 13:49:33 2016 +0100 Minor cleanup: Renamed function to something more meaningful --- modules/automation.py | 2 +- modules/check_mk.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index c54604e..18d7ee0 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -475,7 +475,7 @@ def automation_restart(job = "restart"): try: backup_path = None - if not lock_objects_file(): + if another_activation_is_in_progress(): raise MKAutomationError("Cannot activate changes. " "Another activation process is currently in progresss") diff --git a/modules/check_mk.py b/modules/check_mk.py index 4e21946..9d98341 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4127,7 +4127,7 @@ def do_restart(only_reload = False): try: backup_path = None - if not lock_objects_file(): + if another_activation_is_in_progress(): sys.stderr.write("Other restart currently in progress. Aborting.\n") sys.exit(1) @@ -4178,7 +4178,7 @@ def do_restart(only_reload = False): sys.exit(1) restart_lock_fd = None -def lock_objects_file(): +def another_activation_is_in_progress(): global restart_lock_fd # In some bizarr cases (as cmk -RR) we need to avoid duplicate locking! if restart_locking and restart_lock_fd == None: @@ -4194,8 +4194,8 @@ def lock_objects_file(): fcntl.flock(restart_lock_fd, fcntl.LOCK_EX | ( restart_locking == "abort" and fcntl.LOCK_NB or 0)) except: - return False - return True + return True + return False def do_donation():

8 years, 6 months

added missing script from WK3002

by Andreas Boesl

Module: check_mk Branch: master Commit: 5813e0966f54f014ec33f9613c29d96dd6f892ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5813e0966f54f0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 8 13:44:20 2016 +0100 added missing script from WK3002 --- doc/treasures/wato_import.py | 106 ++++++++++++++++++++++++++++-------------- 1 file changed, 72 insertions(+), 34 deletions(-) diff --git a/doc/treasures/wato_import.py b/doc/treasures/wato_import.py index 0550190..ee3d821 100644 --- a/doc/treasures/wato_import.py +++ b/doc/treasures/wato_import.py @@ -19,71 +19,109 @@ # 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- -# tails. You should have received a copy of the GNU General Public +# 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. -#Author: Bastian Kuhn bk(a)mathias-kettner.de +# Author : Bastian Kuhn bk(a)mathias-kettner.de -import os -import sys +# Author : Andreas Boesl ab(a)mathias-kettner.de +# Updated: Set correct host_tag group for given tags + +import os, pprint, sys, subprocess try: path = os.environ.pop('OMD_ROOT') pathlokal = "~/etc/check_mk/conf.d/wato/" pathlokal = os.path.expanduser(pathlokal) - datei = open(sys.argv[1],'r') + csv_file = open(sys.argv[1],'r') except: print """Run this script inside a OMD site Usage: ./wato_import.py csvfile.csv CSV Example: - wato_foldername,hostname|tags,host_alias,(ipaddress|None)""" + wato_foldername;hostname|tag1 tag2;host_alias;ipaddress|None""" sys.exit() folders = {} -for line in datei: - if line.startswith('#') or len(line.split(',')) < 4: +for line in csv_file: + if line.startswith('#'): continue - ordner, name, alias, ipaddress = line.split(',')[:4] - if ordner: + target_folder, name, alias, ipaddress = line.split(';')[:5] + if target_folder: try: - os.makedirs(pathlokal+ordner) + os.makedirs(pathlokal+target_folder) except os.error: pass - folders.setdefault(ordner,[]) + folders.setdefault(target_folder,[]) ipaddress = ipaddress.strip() if ipaddress == "None": ipaddress = False - folders[ordner].append((name,alias,ipaddress)) -datei.close() + folders[target_folder].append((name, alias, ipaddress)) +csv_file.close() + +host_tags_info = { "wato_aux_tags": [], "wato_host_tags": [] } +execfile("%s/../../multisite.d/wato/hosttags.mk" % pathlokal, globals(), host_tags_info) + +host_tag_mapping = {} +aux_tag_mapping = {} +for tag_group, tag_descr, tag_choices in host_tags_info["wato_host_tags"]: + for choice in tag_choices: + host_tag_mapping[choice[0]] = tag_group # tag name + aux_tag_mapping[choice[0]] = choice[2] # aux tags for folder in folders: all_hosts = "" host_attributes = "" ips = "" for name, alias, ipaddress in folders[folder]: - realname = name.split("|")[0] - all_hosts += "'%s',\n" % (name) + name_tokens = name.split("|") + real_name = name_tokens[0] + + extra_infos = [] + # WATO Tag extra info + host_aux_tags = set() + if len(name_tokens) > 1: + for tag in name_tokens[1].split(): + host_aux_tags |= set(aux_tag_mapping.get(tag, [])) + if tag not in host_tag_mapping: + print "Unknown host tag: %s" % tag + else: + extra_infos.append("'tag_%s': '%s'" % (host_tag_mapping[tag], tag)) + + extra_aux_tags = "" + if host_aux_tags: + extra_aux_tags = "|".join(host_aux_tags) + "|" + all_hosts += "'%s|%swato|/' + FOLDER_PATH + '/',\n" % (name.replace(" ","|"), extra_aux_tags) + + + # WATO Alias extra info + if alias: + extra_infos.append("'alias' : u'%s'" % alias) + if ipaddress: - host_attributes += "'%s' : {'alias' : u'%s', 'ipaddress' : '%s' },\n" % (realname, alias, ipaddress) - ips += "'%s' : '%s'," % ( realname, ipaddress ) + host_attributes += "'%s' : {'ipaddress' : '%s', %s},\n" % (real_name, ipaddress, ", ".join(extra_infos)) + ips += "'%s' : '%s',\n" % ( real_name, ipaddress ) else: - host_attributes += "'%s' : {'alias' : u'%s' },\n" % (realname, alias) + host_attributes += "'%s' : {%s},\n" % (real_name, ", ".join(extra_infos)) + + hosts_mk_file = open(pathlokal + folder + '/hosts.mk','w') + hosts_mk_file.write('all_hosts += [\n') + hosts_mk_file.write(all_hosts) + hosts_mk_file.write(']\n\n') - ziel = open(pathlokal + folder + '/hosts.mk','w') - ziel.write('all_hosts += [') - ziel.write(all_hosts) - ziel.write(']\n\n') - ziel.write('host_attributes.update({') - ziel.write(host_attributes) - ziel.write('})\n\n') if len(ips) > 0: - ziel.write('ipaddresses.update({') - ziel.write(ips) - ziel.write('})\n\n') - ziel.close() - - wato = open(pathlokal + folder + '/.wato','w') - wato.write("{'attributes': {}, 'num_hosts': %d, 'title': '%s'}\n" % ( len(folders[folder]), folder) ) - wato.close() + hosts_mk_file.write('ipaddresses.update({\n') + hosts_mk_file.write(ips) + hosts_mk_file.write('})\n\n') + + hosts_mk_file.write('host_attributes.update({\n') + hosts_mk_file.write(host_attributes) + hosts_mk_file.write('})\n\n') + hosts_mk_file.close() + + + wato_file = open(pathlokal + folder + '/.wato','w') + wato_file.write("{'attributes': {}, 'num_hosts': %d, 'title': '%s'}\n" % ( len(folders[folder]), folder) ) + wato_file.close() +

8 years, 6 months

3002 Treasure script wato_import.py: now able to set wato host tag groups

by Andreas Boesl

Module: check_mk Branch: master Commit: b01ae2ad96ea08eef046d7c88c684f5d8b7d1379 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b01ae2ad96ea08… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 8 13:40:39 2016 +0100 3002 Treasure script wato_import.py: now able to set wato host tag groups --- .werks/3002 | 9 +++++++++ ChangeLog | 1 + 2 files changed, 10 insertions(+) diff --git a/.werks/3002 b/.werks/3002 new file mode 100644 index 0000000..13604c0 --- /dev/null +++ b/.werks/3002 @@ -0,0 +1,9 @@ +Title: Treasure script wato_import.py: now able to set wato host tag groups +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.9i1 +Date: 1457440808 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 59a564f2..71547a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -86,6 +86,7 @@ WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... + * 3002 Treasure script wato_import.py: now able to set wato host tag groups * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery...

8 years, 6 months

3093 isc_dhcpd: now interprets include statements when parsing the configuration file

by Sebastian Herbord

Module: check_mk Branch: master Commit: 57bbbdb88fd5a4877b0d7e006c52ab5741ae9702 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=57bbbdb88fd5a4… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 8 13:18:29 2016 +0100 3093 isc_dhcpd: now interprets include statements when parsing the configuration file --- .werks/3093 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/isc_dhcpd | 18 +++++++++++++----- 3 files changed, 24 insertions(+), 5 deletions(-) diff --git a/.werks/3093 b/.werks/3093 new file mode 100644 index 0000000..5f958b1 --- /dev/null +++ b/.werks/3093 @@ -0,0 +1,10 @@ +Title: isc_dhcpd: now interprets include statements when parsing the configuration file +Level: 1 +Component: checks +Class: feature +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457439448 + + diff --git a/ChangeLog b/ChangeLog index 5881654..59a564f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * 3257 dell_idrac_virtdisks: new check which monitors the virtual disks of a Dell IDrac Device * 3001 fileinfo: now able to configure the checks status if the file is missing * 3088 rstcli, rstcli.pdisks: new checks to monitor Intel RST raids + * 3093 isc_dhcpd: now interprets include statements when parsing the configuration file * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/agents/plugins/isc_dhcpd b/agents/plugins/isc_dhcpd index 87af321..3278460 100755 --- a/agents/plugins/isc_dhcpd +++ b/agents/plugins/isc_dhcpd @@ -1,6 +1,6 @@ #!/usr/bin/python -import os, sys, time, calendar +import os, sys, time, re, calendar conf_file = None for path in [ '/etc/dhcpd.conf', '/etc/dhcp/dhcpd.conf', '/usr/local/etc/dhcpd.conf' ]: @@ -27,10 +27,18 @@ pidof_dhcpd = os.popen("pidof dhcpd").read().strip() sys.stdout.write('<<<isc_dhcpd>>>\n[general]\nPID: %s\n' % pidof_dhcpd) sys.stdout.write('[pools]\n') -for line in file(conf_file): - line = line.strip().rstrip(";").rstrip() - if line.startswith("range"): - sys.stdout.write(line[5:].strip() + "\n") + + +def parse_config(filename): + for line in file(filename): + if line.startswith("include"): + included_file = re.search('include\s+"(.*)"', line).group(1) + parse_config(included_file) + elif line.startswith("range"): + sys.stdout.write(line[5:].strip() + "\n") + +parse_config(conf_file) + # lease 10.1.1.81 { # starts 3 2015/09/09 11:42:20;

8 years, 6 months

3268 FIX Availability options were invalid after resetting them

by Mathias Kettner

Module: check_mk Branch: master Commit: c8ec861ab936bdf125addff046891bb47c843850 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8ec861ab936bd… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 8 13:15:23 2016 +0100 3268 FIX Availability options were invalid after resetting them In certain work flows the availability options would not be correctly reset on {{Reset to defaults}} but all checkboxes would be unchecked. That e.g. lead to the column {{N/A}} missing. This has been fixed. --- .werks/3268 | 12 ++++++++++++ ChangeLog | 1 + web/htdocs/availability.py | 1 - web/plugins/views/availability.py | 2 +- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/3268 b/.werks/3268 new file mode 100644 index 0000000..c15176e --- /dev/null +++ b/.werks/3268 @@ -0,0 +1,12 @@ +Title: Availability options were invalid after resetting them +Level: 2 +Component: reporting +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457439239 + +In certain work flows the availability options would not be correctly reset +on {{Reset to defaults}} but all checkboxes would be unchecked. That e.g. +lead to the column {{N/A}} missing. This has been fixed. diff --git a/ChangeLog b/ChangeLog index 1f7d894..5881654 100644 --- a/ChangeLog +++ b/ChangeLog @@ -114,6 +114,7 @@ Reporting & Availability: * 3267 New availability option for reclassifying host state "unreachable"... * 3249 FIX: Fix missing filter for non-OK services when report is called via context button + * 3268 FIX: Availability options were invalid after resetting them... Event Console: * 2999 The contact name is now included in Event Console notifications... diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index e73ca4f..40fb346 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -1487,7 +1487,6 @@ def compute_tree_state(tree, status): # to CRIT because of state grouping, then the WARN column should not be # displayed. def cell_active(sid, avoptions): - #html.debug((sid, "aktiv?")) # Some columns might be unneeded due to state treatment options sg = avoptions["state_grouping"] hsg = avoptions["host_state_grouping"] diff --git a/web/plugins/views/availability.py b/web/plugins/views/availability.py index 038f71d..f6bf86d 100644 --- a/web/plugins/views/availability.py +++ b/web/plugins/views/availability.py @@ -97,7 +97,7 @@ def render_availability_options(what): begin_floating_options("avoptions", is_open) for name, height, show_in_reporting, vs in avoption_entries: render_floating_option(name, height, "avo_", vs, avoptions.get(name)) - end_floating_options(reset_url = html.makeuri([("_reset", "1")], remove_prefix="avo_")) + end_floating_options(reset_url = html.makeuri([("_reset", "1")], remove_prefix="avo_", delvars=["apply", "filled_in"])) html.hidden_fields() html.end_form()

8 years, 6 months

3267 New availability option for reclassifying host state "unreachable"

by Mathias Kettner

Module: check_mk Branch: master Commit: 46d91ee843abf1a643ea1cf2d4ea74154825afd2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46d91ee843abf1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 8 12:05:36 2016 +0100 3267 New availability option for reclassifying host state "unreachable" The host state UNREACH can now be reclassified as UP or DOWN. --- .werks/3267 | 10 ++++++++ ChangeLog | 1 + web/htdocs/availability.py | 61 ++++++++++++++++++++++++++++++++++---------- 3 files changed, 59 insertions(+), 13 deletions(-) diff --git a/.werks/3267 b/.werks/3267 new file mode 100644 index 0000000..fb0fe95 --- /dev/null +++ b/.werks/3267 @@ -0,0 +1,10 @@ +Title: New availability option for reclassifying host state "unreachable" +Level: 1 +Component: reporting +Class: feature +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457435081 + +The host state UNREACH can now be reclassified as UP or DOWN. diff --git a/ChangeLog b/ChangeLog index 2e50386..1f7d894 100644 --- a/ChangeLog +++ b/ChangeLog @@ -112,6 +112,7 @@ * 3232 FIX: BI: Only querying site of host for specific host status info... Reporting & Availability: + * 3267 New availability option for reclassifying host state "unreachable"... * 3249 FIX: Fix missing filter for non-OK services when report is called via context button Event Console: diff --git a/web/htdocs/availability.py b/web/htdocs/availability.py index 8495a16..e73ca4f 100644 --- a/web/htdocs/availability.py +++ b/web/htdocs/availability.py @@ -126,6 +126,9 @@ def get_avoption_entries(what): ( "service_groups", _("By Service group") ), ] + def aligned_label(text): + return "<div style=\"width: 196px; display: inline-block;\">%s:</div>" % text + return [ # Time range selection ( "rangespec", @@ -208,17 +211,16 @@ def get_avoption_entries(what): ), ), - # Optionally group some states together ( "state_grouping", "double", True, Dictionary( - title = _("Status Grouping"), + title = _("Service Status Grouping"), columns = 2, elements = [ ( "warn", DropdownChoice( - label = _("Treat Warning as: "), + label = aligned_label(_("Treat Warning as")), choices = [ ( "ok", _("OK") ), ( "warn", _("WARN") ), @@ -230,7 +232,7 @@ def get_avoption_entries(what): ), ( "unknown", DropdownChoice( - label = _("Treat Unknown as: "), + label = aligned_label(_("Treat Unknown/Unreachable as")), choices = [ ( "ok", _("OK") ), ( "warn", _("WARN") ), @@ -242,7 +244,7 @@ def get_avoption_entries(what): ), ( "host_down", DropdownChoice( - label = _("Treat Host Down as: "), + label = aligned_label(_("Treat Host Down as")), choices = [ ( "ok", _("OK") ), ( "warn", _("WARN") ), @@ -325,6 +327,31 @@ def get_avoption_entries(what): ) ), + # Optionally group some states together + ( "host_state_grouping", + "single", + True, + Dictionary( + title = _("Host Status Grouping"), + columns = 2, + elements = [ + ( "unreach", + DropdownChoice( + label = aligned_label(_("Treat Unreachable as")), + choices = [ + ( "up", _("UP") ), + ( "down", _("DOWN") ), + ( "unreach", _("UNREACH") ), + ], + default_value = "unreach", + ), + ), + ], + optional_keys = False, + ), + ), + + # Omit all non-OK columns ( "av_mode", "single", @@ -499,6 +526,10 @@ def get_default_avoptions(): "unmonitored" : True, }, + "host_state_grouping" : { + "unreach" : "unreach", + }, + "state_grouping" : { "warn" : "warn", "unknown" : "unknown", @@ -670,12 +701,13 @@ def compute_availability(what, av_rawdata, avoptions): s = { 0: "ok", 1:"warn", 2:"crit", 3:"unknown" }.get(state, "unmonitored") else: s = { 0: "up", 1:"down", 2:"unreach" }.get(state, "unmonitored") - if s == "warn": - s = avoptions["state_grouping"]["warn"] - elif s == "unknown": - s = avoptions["state_grouping"]["unknown"] - elif s == "host_down": - s = avoptions["state_grouping"]["host_down"] + + # Reclassification due to state grouping + if s in avoptions["state_grouping"]: + s = avoptions["state_grouping"][s] + + elif s in avoptions["host_state_grouping"]: + s = avoptions["host_state_grouping"][s] total_duration += span["duration"] if consider: @@ -1455,9 +1487,10 @@ def compute_tree_state(tree, status): # to CRIT because of state grouping, then the WARN column should not be # displayed. def cell_active(sid, avoptions): + #html.debug((sid, "aktiv?")) # Some columns might be unneeded due to state treatment options sg = avoptions["state_grouping"] - state_groups = [ sg["warn"], sg["unknown"], sg["host_down"] ] + hsg = avoptions["host_state_grouping"] if sid not in [ "up", "ok" ] and avoptions["av_mode"]: return False @@ -1473,7 +1506,9 @@ def cell_active(sid, avoptions): return False elif sid == "host_down" and not avoptions["consider"]["host_down"]: return False - elif sid in [ "warn", "unknown", "host_down" ] and sid not in state_groups: + elif sid in sg and sid not in sg.values(): + return False + elif sid in hsg and sid not in hsg.values(): return False else: return True

8 years, 6 months

Better styling of CRIT in stale services

by Mathias Kettner

Module: check_mk Branch: master Commit: 4461df1e3c1453d5fbf887248bbadf85d524d72b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4461df1e3c1453… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Mar 8 11:34:04 2016 +0100 Better styling of CRIT in stale services --- web/htdocs/status.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index f69d02c..5d0eb83 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -54,6 +54,11 @@ table.data td.perfometer.stale div.title { text-shadow: 0.8px 0.8px 0.8px #fff; } +table.data tr.data td.stale.state2, +table.data tr.data td.stale.hstate1 { + color: #a00; + text-shadow: 0.8px 0.8px 0.8px #f88; +} /* OK/UP */ @@ -69,6 +74,7 @@ table.data td.perfometer.stale div.title { } + .hstate { white-space: nowrap; }

8 years, 6 months

isc_dhcpd: configuration file in /usr/local is now also discovered

by Sebastian Herbord

Module: check_mk Branch: master Commit: cd63b6ce1f346d9c7123ea23dd843dc1f2bd502e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cd63b6ce1f346d… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 8 11:59:52 2016 +0100 isc_dhcpd: configuration file in /usr/local is now also discovered --- agents/plugins/isc_dhcpd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/plugins/isc_dhcpd b/agents/plugins/isc_dhcpd index e94f0d1..87af321 100755 --- a/agents/plugins/isc_dhcpd +++ b/agents/plugins/isc_dhcpd @@ -3,7 +3,7 @@ import os, sys, time, calendar conf_file = None -for path in [ '/etc/dhcpd.conf', '/etc/dhcp/dhcpd.conf' ]: +for path in [ '/etc/dhcpd.conf', '/etc/dhcp/dhcpd.conf', '/usr/local/etc/dhcpd.conf' ]: if os.path.exists(path): conf_file = path break

8 years, 6 months

3092 FIX isc_dhcpd: fixed incorrect handling of timezones

by Sebastian Herbord

Module: check_mk Branch: master Commit: cda451bd8e282a91567805da0458bb12309d6d28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cda451bd8e282a… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Tue Mar 8 11:56:31 2016 +0100 3092 FIX isc_dhcpd: fixed incorrect handling of timezones --- .werks/3092 | 10 ++++++++++ ChangeLog | 1 + agents/plugins/isc_dhcpd | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3092 b/.werks/3092 new file mode 100644 index 0000000..88ae563 --- /dev/null +++ b/.werks/3092 @@ -0,0 +1,10 @@ +Title: isc_dhcpd: fixed incorrect handling of timezones +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1457434558 + + diff --git a/ChangeLog b/ChangeLog index 36a51e7..2e50386 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ * 3276 FIX: esx_vsphere_vm.snapshot: Graphs now scale the age of the scnapshots correctly * 3277 FIX: veeam_jobs: Handling missing state "Postprocessing" now * 3278 FIX: fritz_wan_if: Fixed incorrect unit Bit used in check + * 3092 FIX: isc_dhcpd: fixed incorrect handling of timezones Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/plugins/isc_dhcpd b/agents/plugins/isc_dhcpd index 297d328..e94f0d1 100755 --- a/agents/plugins/isc_dhcpd +++ b/agents/plugins/isc_dhcpd @@ -1,6 +1,6 @@ #!/usr/bin/python -import os, sys, time +import os, sys, time, calendar conf_file = None for path in [ '/etc/dhcpd.conf', '/etc/dhcp/dhcpd.conf' ]: @@ -58,7 +58,7 @@ for line in file(leases_file): ip_address = parts[1] elif parts[0] == "ends": ends_date_string = parts[2] + " " + parts[3] - ends_date = time.mktime(time.strptime(ends_date_string, "%Y/%m/%d %H:%M:%S")) + ends_date = calendar.timegm(time.strptime(ends_date_string, "%Y/%m/%d %H:%M:%S")) if ends_date < now: ip_address = None # skip this address, this lease is outdated

8 years, 6 months

← Newer
1
...
17
18
19
20
21
22
23
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2016