Checkmk git commits August 2013

checkmk-commits@lists.checkmk.com

6 participants
167 discussions

Check_MK Git: check_mk: Free/Used space and growth of filesystem_elements

by Andreas Boesl

Module: check_mk Branch: master Commit: f8037ac1fb08015dd1786358a7817f8c2f535893 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8037ac1fb0801… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 26 18:00:04 2013 +0200 Free/Used space and growth of filesystem_elements now configurable with percentage / absolute / dynamic levels --- ChangeLog | 5 +- web/plugins/wato/check_parameters.py | 127 ++++++++++++++++++++++------------ 2 files changed, 85 insertions(+), 47 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee96682..84cf24e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,9 +66,8 @@ (output buffer now grows dynamically) * jolokia_metrics: fixed incorrect plugin output for high warn/crit levels * hyperv: Added a check for checking state changes. - * df / esx_vsphere_datastore: filesystem levels configuration gets even easier - now able to set absolute levels and levels depending - on total disk space + * df / esx_vsphere_datastore: now able to set absolute levels and levels depending + on total disk space of used and free space * cisco_wlc: New check for monitoring cisco wireless lan access points * cisco_wlc_clients: New check for the nummber of clients in a wlc wifi * df: Negative integer levels for MB left on a device diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b1a0602..9e3e0c6 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1337,55 +1337,94 @@ register_check_parameters( "first" ) -filesystem_elements = [ - ("levels", - Alternative( - title = _("Levels for filesystem usage"), - default_value = (80.0, 90.0), - elements = [ - Tuple( - title = _("Percentage used space"), - elements = [ - Percentage(title = _("Warning if above"), unit = _("% usage")), - Percentage(title = _("Critical if above"), unit = _("% usage")), - ] - ), - Tuple( - title = _("Absolute used space"), - elements = [ - Integer(title = _("Warning if above"), unit = _("MB")), - Integer(title = _("Critical if above"), unit = _("MB")), - ] - ), - ListOf( - Tuple( - orientation = "horizontal", +def get_filesystem_valuespec(what): + if what == "used": + title = _("used space") + course = _("above") + else: + title = _("free space") + course = _("below") + + + vs_subgroup = [ + Tuple( title = _("Percentage %s") % title, elements = [ - Filesize(title = _("Filesystem larger than")), - Alternative( - title = _("Levels for the filesystem usage"), - elements = [ - Tuple( - title = _("Percentage used space"), - elements = [ - Percentage(title = _("Warning if above"), unit = _("% usage")), - Percentage(title = _("Critical if above"), unit = _("% usage")), - ] - ), + Percentage(title = _("Warning if %s") % course, unit = _("%"), minvalue = 0.0), + Percentage(title = _("Critical if %s") % course, unit = _("%"), minvalue = 0.0), + ] + ), + Tuple( title = _("Absolute %s") % title, + elements = [ + Integer(title = _("Warning if %s") % course, unit = _("MB"), minvalue = 0), + Integer(title = _("Critical if %s") % course, unit = _("MB"), minvalue = 0), + ] + ) + ] + + return Alternative( + title = _("Levels for filesystem %s") % title, + show_alternative_title = True, + default_value = (80.0, 90.0), + elements = vs_subgroup + [ + ListOf( Tuple( - title = _("Absolute used space"), + orientation = "horizontal", elements = [ - Integer(title = _("Warning if above"), unit = _("MB")), - Integer(title = _("Critical if above"), unit = _("MB")), + Filesize(title = _("Filesystem larger than")), + Alternative( + title = _("Levels for %s") % title, + elements = vs_subgroup + ) ] ), - ] - ), - ], - ), - title = _('Dynamic levels'), - ),]), - ), + title = _('Dynamic levels'), + )], + ) + +def match_filesystem_level_type(value): + if type(value) == list: + for entry in value: + if entry[1][0] < 0 or entry[1][1] < 0: + return 1 + else: + return 0 + else: + if value[0] < 0 or value[1] < 0: + return 1 + else: + return 0 + +def transform_filesystem_levels(value): + tuple_convert = lambda val: tuple(map(lambda x: -x, val)) + + if type(value) == tuple: + return tuple_convert(value) + else: + result = [] + for item in value: + result.append((item[0], tuple_convert(item[1]))) + return result + + +filesystem_elements = [ + ("levels", + Alternative( + title = _("Levels for filesystem"), + show_alternative_title = True, + default_value = (80.0, 90.0), + match = match_filesystem_level_type, + elements = [ + get_filesystem_valuespec("used"), + Transform( + get_filesystem_valuespec("free"), + title = _("Levels for filesystem free space"), + allow_empty = False, + forth = transform_filesystem_levels, + back = transform_filesystem_levels + ) + ] + ) + ), ( "flex_levels", FixedValue( None,

10 years, 10 months

Check_MK Git: check_mk: new alternative vs option: show_alternative_title

by Andreas Boesl

Module: check_mk Branch: master Commit: 34948e0a6771713f19d9cb1070b0423353547d5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34948e0a677171… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 26 17:51:15 2013 +0200 new alternative vs option: show_alternative_title --- web/htdocs/valuespec.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 1a02992..25886fa 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1849,6 +1849,7 @@ class Alternative(ValueSpec): self._elements = kwargs["elements"] self._match = kwargs.get("match") # custom match function self._style = kwargs.get("style", "radio") # alternative: "dropdown" + self._show_alternative_title = kwargs.get("show_alternative_title") # Return the alternative (i.e. valuespec) # that matches the datatype of a given value. We assume @@ -1933,7 +1934,10 @@ class Alternative(ValueSpec): def value_to_text(self, value): vs = self.matching_alternative(value) if vs: - return vs.value_to_text(value) + output = "" + if self._show_alternative_title and vs.title(): + output = "%s<br>" % vs.title() + return output + vs.value_to_text(value) else: return _("invalid:") + " " + str(value)

10 years, 10 months

Check_MK Git: check_mk: wording change in wato text

by Götz Golla

Module: check_mk Branch: master Commit: 28014abedf48fdee15690fb55011842cb495a868 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=28014abedf48fd… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 26 17:19:40 2013 +0200 wording change in wato text --- web/plugins/wato/check_parameters.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index b9472f2..b1a0602 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1253,7 +1253,7 @@ register_check_parameters( "tcp_connections", _("Monitor specific TCP/UDP connections and listeners"), Dictionary( - help = _("This rule allows to monitor the existance of specify TCP connections or " + help = _("This rule allows to monitor the existence of specific TCP connections or " "TCP/UDP listeners."), elements = [ ( "proto", @@ -1811,26 +1811,26 @@ register_check_parameters( "You can change this behaviour on a per-state-base here."), optional_keys = False, elements = [ - ( "states", + ( "states", Dictionary( title = _("Target states"), optional_keys = False, elements = [ - ( "poweredOn", + ( "poweredOn", MonitoringState( title = _("Powered ON"), help = _("Check result if the host or VM is powered on"), default_value = 0, ) ), - ( "poweredOff", + ( "poweredOff", MonitoringState( title = _("Powered OFF"), help = _("Check result if the host or VM is powered off"), default_value = 1, ) ), - ( "suspended", + ( "suspended", MonitoringState( title = _("Suspended"), help = _("Check result if the host or VM is suspended"), @@ -1872,7 +1872,7 @@ register_check_parameters( register_check_parameters( subgroup_printing, "windows_printer_queues", - _("Number of open jobs of a printer on windows" ), + _("Number of open jobs of a printer on windows" ), Tuple( help = _("This rule is applied to the number of print jobs " "currently waiting in windows printer queue."), @@ -2005,7 +2005,7 @@ register_check_parameters( help = _("A tablespace is a container for segments (tables, indexes, etc). A " "database consists of one or more tablespaces, each made up of one or " "more data files. Tables and indexes are created within a particular " - "tablespace. " + "tablespace. " "This rule allows you to define checks on the size of tablespaces."), elements = [ ("levels", @@ -3672,7 +3672,7 @@ register_check_parameters( help = _("Leave this empty, if the user does not matter"), none_is_empty = True, )), - ( "cpulevels", + ( "cpulevels", Tuple( title = _("Levels on CPU utilization"), elements = [

10 years, 10 months

Check_MK Git: check_mk: trailing spaces removed

by Götz Golla

10 years, 10 months

Check_MK Git: check_mk: look for special agents also in local/ structure

by Mathias Kettner

Module: check_mk Branch: master Commit: 94042530ac9c9c1d37891f70de4f28b349919201 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=94042530ac9c9c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 26 17:13:32 2013 +0200 look for special agents also in local/ structure --- modules/check_mk.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 5638b8f..4e7f164 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1033,6 +1033,8 @@ def get_sorted_check_table(hostname): # be None in most cases -> to TCP connect on port 6556 # HACK: special_agent_dir = agents_dir + "/special" +special_agent_local_dir = local_agents_dir + "/special" + def get_datasource_program(hostname, ipaddress): # First check WATO-style special_agent rules for agentname, ruleset in special_agents.items(): @@ -1040,7 +1042,12 @@ def get_datasource_program(hostname, ipaddress): if params: # rule match! # Create command line using the special_agent_info cmd_arguments = special_agent_info[agentname](params[0], hostname, ipaddress) - return '%s/agent_%s %s' % ( special_agent_dir, agentname, cmd_arguments) + if special_agent_local_dir and \ + os.path.exists(special_agent_local_dir + "/agent_" + agentname): + path = special_agent_local_dir + "/agent_" + agentname + else: + path = special_agent_dir + "/agent_" + agentname + return path + " " + cmd_arguments programs = host_extra_conf(hostname, datasource_programs) if len(programs) == 0:

10 years, 10 months

Check_MK Git: check_mk: esx_vsphere_datastores: fix plugin output in case of unaccessible

by Mathias Kettner

Module: check_mk Branch: master Commit: 260870b53c5c2dc5f54662d98c092668707ab06b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=260870b53c5c2d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Aug 26 17:05:29 2013 +0200 esx_vsphere_datastores: fix plugin output in case of unaccessible --- checks/esx_vsphere_datastores | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/esx_vsphere_datastores b/checks/esx_vsphere_datastores index 40c6900..8dec7cb 100644 --- a/checks/esx_vsphere_datastores +++ b/checks/esx_vsphere_datastores @@ -97,7 +97,7 @@ def check_esx_vsphere_datastores(item, params, info): if not store["accessible"]: state = 2 - infotext += " unaccessible(!!), " + infotext + infotext = "unaccessible(!!), " + infotext return state, infotext, perfdata

10 years, 10 months

Check_MK Git: check_mk: service dependencies for legacy, active and custom checks implemented

by Götz Golla

Module: check_mk Branch: master Commit: 42a0c4c0502784d081f0f4771e35311591dee620 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42a0c4c0502784… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Mon Aug 26 17:03:19 2013 +0200 service dependencies for legacy, active and custom checks implemented --- modules/check_mk.py | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 5638b8f..8e9efd3 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1801,6 +1801,21 @@ def create_nagios_servicedefs(outfile, hostname): return True return False + def get_dependencies(hostname,servicedesc): + result = "" + for dep in service_deps(hostname, servicedesc): + result += """ +define servicedependency { + use\t\t\t\t%s + host_name\t\t\t%s + service_description\t%s + dependent_host_name\t%s + dependent_service_description %s +}\n +""" % (service_dependency_template, hostname, dep, hostname, servicedesc) + + return result + host_checks = get_check_table(hostname).items() host_checks.sort() # Create deterministic order aggregated_services_conf = set([]) @@ -1942,7 +1957,7 @@ define service { define service { use\t\t\t\t%s host_name\t\t\t%s - normal_check_interval\t\t%d + normal_check_interval\t\t%d retry_check_interval\t\t%d %s service_description\t\tCheck_MK inventory } @@ -1992,6 +2007,9 @@ define service { %s} """ % (template, hostname, make_utf8(description), simulate_command(command), extraconf)) + # write service dependencies for legacy checks + outfile.write(get_dependencies(hostname,description)) + # legacy checks via active_checks actchecks = [] needed_commands = [] @@ -2043,6 +2061,8 @@ define service { %s} """ % (template, hostname, make_utf8(description), simulate_command(command), extraconf)) + # write service dependencies for active checks + outfile.write(get_dependencies(hostname,description)) # Legacy checks via custom_checks custchecks = host_extra_conf(hostname, custom_checks) @@ -2111,6 +2131,9 @@ define service { """ % (template, hostname, make_utf8(description), simulate_command(command), (command_line and not freshness) and 1 or 0, extraconf, freshness)) + # write service dependencies for custom checks + outfile.write(get_dependencies(hostname,description)) + # Levels for host check if is_cluster(hostname): ping_command = 'check-mk-ping-cluster'

10 years, 10 months

Check_MK Git: check_mk: vsphere: agent_vsphere.fast, faster version of agent_vsphere (under development, need to rename filename)

by Andreas Boesl

Module: check_mk Branch: master Commit: c466e4cb06375c7986c5a2b8d3246d81a5b2985e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c466e4cb06375c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 26 16:38:29 2013 +0200 vsphere: agent_vsphere.fast, faster version of agent_vsphere (under development, need to rename filename) --- agents/special/agent_vsphere.fast | 425 +++++++++++++++++++++++++++++++++++++ 1 file changed, 425 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c466e4cb06…

10 years, 10 months

Check_MK Git: check_mk: Cleaned up wmic_process check

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3d0dd242c70acf405612e6124d37ff96f02f116a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3d0dd242c70acf… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Aug 26 15:04:21 2013 +0200 Cleaned up wmic_process check --- checks/wmic_process | 55 ++++++++++++++++++++++----------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/checks/wmic_process b/checks/wmic_process index 0b99e40..4363a88 100644 --- a/checks/wmic_process +++ b/checks/wmic_process @@ -56,45 +56,38 @@ def check_wmic_process(item, params, info): ("user", user_perc, cpuwarn, cpucrit, 0, 100), ("kernel", kernel_perc, cpuwarn, cpucrit, 0, 100) ] - infos = [ - "%d processes" % count, - "", # 1 - ", %.1fMB RAM" % mem_mb, - "", # 3 - ", %1.fMB Page" % page_mb, - "", # 5 - ", %.0f%%/%.0f%% User/Kernel" % (user_perc, kernel_perc), - "", # 7 - ] - + messages = [] + messages.append("%d processes" % count) + state = 0 + + msg = "%.0f%%/%.0f%% User/Kernel" % (user_perc, kernel_perc) if cpu_perc >= cpucrit: state = 2 - infos[7] = "(!!) - critical at %d%%" % cpucrit - - elif page_mb >= pagecrit: - state = 2 - infos[5] = "(!!) critical at %d MB" % pagecrit - - elif mem_mb >= memcrit: - state = 2 - infos[3] = "(!!) critical at %d MB" % memcrit - + msg += "(!!) (critical at %d%%)" % cpucrit elif cpu_perc >= cpuwarn: state = 1 - infos[7] = "(!) warning at %d%%" % cpuwarn + msg += "(!) (warning at %d%%)" % cpuwarn + messages.append(msg) - elif mem_mb >= memwarn: - state = 1 - infos[3] = "(!) warning at %d MB" % memwarn + msg = "%.1fMB RAM" % mem_mb + if mem_mb >= memcrit and memcrit > 0: + state = 2 + msg += "(!!) (critical at %d MB)" % memcrit + elif mem_mb >= memwarn and memwarn > 0: + state = max(1, state) + msg += "(!) (warning at %d MB)" % memwarn + messages.append(msg) + msg = "%1.fMB Page" % page_mb + if page_mb >= pagecrit: + state = 2 + msg += "(!!) (critical at %d MB)" % pagecrit elif page_mb >= pagewarn: - state = 1 - infos[5] = "(!) warning at %d MB" % pagewarn - - else: - state = 0 + state = max(state, 1) + msg += "(!) (warning at %d MB)" % pagewarn + messages.append(msg) - return (state, "".join(infos), perfdata) + return (state, ", ".join(messages), perfdata) check_info["wmic_process"] = { 'check_function': check_wmic_process,

10 years, 10 months

Check_MK Git: check_mk: Updated bug entries #1029, #1030, #1031

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 217f542b660fb05f57a301193dd1d61b228b0b83 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=217f542b660fb0… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Mon Aug 26 14:21:46 2013 +0200 Updated bug entries #1029, #1030, #1031 --- .bugs/1029 | 36 ++++++++++++++++++++++++++++++++++++ .bugs/1030 | 43 +++++++++++++++++++++++++++++++++++++++++++ .bugs/1031 | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+) diff --git a/.bugs/1029 b/.bugs/1029 new file mode 100644 index 0000000..be38d11 --- /dev/null +++ b/.bugs/1029 @@ -0,0 +1,36 @@ +Title: monitor I/O for md raidsets too +Component: checks +State: open +Date: 2013-08-26 12:30:45 +Targetversion: 1.2.3 +Class: feature + +patch came in via feedback@ // original mail still available in feeedback/gitbug folder + + +Date: Tue, 2 Jul 2013 14:46:10 -0400 +Message-ID: <CANzfhcfnDOKnRqdDeiyubh1Ph+6ihNap7nOv4ZOdPSQWR5hk8w(a)mail.gmail.com> +Subject: [Bug]: agent does not monitor io for md raidsets +From: Philip Kubat <philip(a)kubat.com> + +the egrep needs updated ti include md arrays + +# Performancecounter Platten +echo '<<<diskstat>>>' +date +%s +egrep ' (md[0-9]|x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*) ' < /proc/diskstats +if type dmsetup >/dev/null ; then + echo '[dmsetup_info]' + dmsetup info -c --noheadings --separator ' ' -o name,devno,vg_name,lv_name +fi +if [ -d /dev/vx/dsk ] ; then + echo '[vx_dsk]' + stat -c "%t %T %n" /dev/vx/dsk/*/* +fi + + + +============= + +-egrep ' (md[0-9]|x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*) ' < /proc/diskstats ++egrep ' (x?[shv]d[a-z]*|cciss/c[0-9]+d[0-9]+|emcpower[a-z]+|dm-[0-9]+|VxVM.*) ' < /proc/diskstats diff --git a/.bugs/1030 b/.bugs/1030 new file mode 100644 index 0000000..ff65073 --- /dev/null +++ b/.bugs/1030 @@ -0,0 +1,43 @@ +Title: Bug in hr_mem with swap not yet fixed +Component: checks +State: open +Date: 2013-08-26 12:46:09 +Targetversion: 1.2.3 +Class: bug + +came in by email to mk@ // original mail still available in feedback/gitbug folder + + +Subject: Fehler in hr_mem mit Swap +From: =?utf-8?Q?Christof_Musik?= <christof(a)senfdax.de> +To: =?utf-8?Q?mk=40mathias-kettner=2Ede?= <mk(a)mathias-kettner.de> +Date: Wed, 10 Jul 2013 21:24:50 +0200 + + +Hallo Mathias, + +vor einiger Zeit wurde ein Fehler im hr_mem Check auf der ML gemeldet. (http://www.mail-archive.com/checkmk-en@lists.mathias-kettner.de/msg06808.ht…) +Daraufhin hast du geantwortet das der Bug #1 behoben wäre. Dies ist allerdings nicht der Fall. +Ich habe gerade 1.2.2p2 installiert und mir auch git angeschaut. Dort ist kein Fix für den Fehler zu erkennen. + +Das Problem ist sollte wohl mit c505863948d2e2df9e93d94c1c91b17f773c0516 gefixed sein. Dies tut es aber leider nicht. +Ich weiß jetzt leider auch keine elegante Lösung, als mit hrStorageDescr zu arbeiten. Hast du vielleicht noch eine Idee? Den Patch kann ich gerne umsetzen. + +Um das Problem noch mal kurz zu erklären: In der aktuellen Version wird geprüft ob ein Wert von hrStorageVirtualMemory ausgelesen wurde oder nicht. Der erste +Wert gewinnt. Auf manchen System ist es aber "Virtual memory" und nicht "Swap space". Damit kommen falsche Werte zustande und der Check meldet falsche Zustände. + +HOST-RESOURCES-MIB::hrStorageType.1 = OID: HOST-RESOURCES-TYPES::hrStorageRam +HOST-RESOURCES-MIB::hrStorageType.3 = OID: HOST-RESOURCES-TYPES::hrStorageVirtualMemory +HOST-RESOURCES-MIB::hrStorageType.6 = OID: HOST-RESOURCES-TYPES::hrStorageOther +HOST-RESOURCES-MIB::hrStorageType.7 = OID: HOST-RESOURCES-TYPES::hrStorageOther +HOST-RESOURCES-MIB::hrStorageType.8 = OID: HOST-RESOURCES-TYPES::hrStorageOther +HOST-RESOURCES-MIB::hrStorageType.10 = OID: HOST-RESOURCES-TYPES::hrStorageVirtualMemory +HOST-RESOURCES-MIB::hrStorageDescr.1 = STRING: Physical memory +HOST-RESOURCES-MIB::hrStorageDescr.3 = STRING: Virtual memory +HOST-RESOURCES-MIB::hrStorageDescr.6 = STRING: Memory buffers +HOST-RESOURCES-MIB::hrStorageDescr.7 = STRING: Cached memory +HOST-RESOURCES-MIB::hrStorageDescr.8 = STRING: Shared memory +HOST-RESOURCES-MIB::hrStorageDescr.10 = STRING: Swap space + +Gruß +Christof diff --git a/.bugs/1031 b/.bugs/1031 new file mode 100644 index 0000000..49b7d84 --- /dev/null +++ b/.bugs/1031 @@ -0,0 +1,49 @@ +Title: Patch for setup.sh: fix DESTDIR +Component: core +State: open +Date: 2013-08-26 13:01:12 +Targetversion: 1.2.3 +Class: cleanup + +came in via checkmk-de@ // original mail available in feedback/gitbug folder + +Date: Mon, 15 Jul 2013 13:44:02 +0200 +From: Marcel =?UTF-8?B?UGVubmV3acOf?= <mailinglists(a)pennewiss.de> +To: checkmk-de(a)lists.mathias-kettner.de +Message-ID: <20130715134402.5743e494(a)marcel.intern.exa-edv.de> +X-Mailer: Claws Mail 3.8.1 (GTK+ 2.24.10; x86_64-suse-linux-gnu) +Mime-Version: 1.0 +Content-Type: multipart/mixed; boundary="MP_/diqzEXo3x_6IHPojiKv3M6F" +Subject: [Check_mk (deutsch)] =?utf-8?q?BUG=3A_setup=2Esh_-_Erstellung_der?= + =?utf-8?q?_auth=2Eserials_au=C3=9Ferhalb_von_DESTDIR?= + + +Hallo, + +ich verwende check_mk und check_mk-agent auch unter Gentoo. Der +Build-Prozess wird dort in einer Sandbox vollzogen, was die +Beachtung von DESTDIR als Grundvoraussetzung mit sich bringt. + +Im Commit 2657b3ee wurde die Erstellung der auth.serials implementiert, +welches jedoch außerhalb des DESTDIR erfolgt und somit mindestens unter +Gentoo zu Problem führt. + +Anbei ein passender Patch. + +Grüße, +Marcel + + +setup.sh.patch + +--- setup.sh.old 2013-07-02 15:49:46.269385640 +0200 ++++ setup.sh 2013-07-02 15:49:40.089462901 +0200 +@@ -1004,7 +1004,7 @@ + done && + # make htpasswd writable by apache, since we need this for + # WATO. Also create an empty and Apache-writable auth.serials +- serials_file=${htpasswd_file%/*}/auth.serials && ++ serials_file=$DESTDIR${htpasswd_file%/*}/auth.serials && + touch "$serials_file" && + chown $wwwuser "$serials_file" && + chown $wwwuser "$htpasswd_file" &&

10 years, 10 months

← Newer
1
2
3
4
5
6
7
8
...
17
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2013