Checkmk git commits September 2014

checkmk-commits@lists.checkmk.com

5 participants
195 discussions

Check_MK Git: check_mk: Remove some trailing spaces in Windows agent

by Mathias Kettner

Module: check_mk Branch: master Commit: 72db20cde91259edab7016c92187eaffc322205d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72db20cde91259… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 8 15:10:17 2014 +0200 Remove some trailing spaces in Windows agent --- Makefile | 2 +- agents/windows/check_mk_agent.cc | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 847971e..9ccd4aa 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ LIVESTATUS_SOURCES = configure aclocal.m4 config.guess config.h.in config.sub \ # Files that are checked for trailing spaces HEAL_SPACES_IN = checkman/* modules/* checks/* notifications/* inventory/* \ - $$(find -name Makefile) livestatus/src/*{cc,c,h} \ + $$(find -name Makefile) livestatus/src/*{cc,c,h} agents/windows/*.cc \ web/htdocs/*.{py,css} web/htdocs/js/*.js web/plugins/*/*.py \ doc/helpers/* scripts/setup.sh scripts/autodetect.py \ $$(find pnp-templates -type f -name "*.php") \ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index 2bbfe69..2e45de0 100755 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -599,7 +599,7 @@ void df_output_filesystem(SOCKET &out, char *volid) if (total.QuadPart > 0) perc_used = 100 - (100 * free_avail.QuadPart / total.QuadPart); - if (volume[0]) // have a volume name + if (volume[0]) // have a volume name char_replace(' ', '_', volume); else strncpy(volume, volid, sizeof(volume)); @@ -1161,7 +1161,7 @@ void process_eventlog_entries(SOCKET &out, const char *logname, char *buffer, EVENTLOGRECORD *event = (EVENTLOGRECORD *)buffer; while (bytesread > 0) { - crash_log(" - record %d: process_eventlog_entries bytesread %d, event->Length %d", *record_number, bytesread, event->Length); + crash_log(" - record %d: process_eventlog_entries bytesread %d, event->Length %d", *record_number, bytesread, event->Length); *record_number = event->RecordNumber; char type_char; @@ -1973,7 +1973,7 @@ void update_or_create_logwatch_textfile(const char *full_filename, glob_token* t } // Process a single expression (token) of a globline and try to find matching files -void process_glob_expression(glob_token *glob_token, condition_patterns_t *patterns) +void process_glob_expression(glob_token *glob_token, condition_patterns_t *patterns) { WIN32_FIND_DATA data; char full_filename[512]; @@ -2068,7 +2068,7 @@ bool globmatch(const char *pattern, char *astring); // Remove missing files from list void cleanup_logwatch_textfiles() -{ +{ for (logwatch_textfiles_t::iterator it_tf = g_logwatch_textfiles.begin(); it_tf != g_logwatch_textfiles.end();) { if ((*it_tf)->missing) { @@ -2081,7 +2081,7 @@ void cleanup_logwatch_textfiles() } // Called on program exit -void cleanup_logwatch() +void cleanup_logwatch() { // cleanup textfiles for (logwatch_textfiles_t::iterator it_tf = g_logwatch_textfiles.begin(); @@ -2755,7 +2755,7 @@ int launch_program(script_container* cont) while (out_offset + bread > current_heap_size) { // Increase heap buffer if (current_heap_size * 2 <= HEAP_BUFFER_MAX) { - cont->buffer_work = (char *) HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + cont->buffer_work = (char *) HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cont->buffer_work, current_heap_size * 2); current_heap_size = HeapSize(GetProcessHeap(), 0, cont->buffer_work); } @@ -4178,7 +4178,7 @@ void stop_threads() it_cont->second->should_terminate = 1; } it_cont++; - } + } WaitForMultipleObjects(active_thread_count, hThreadArray, TRUE, 5000); TerminateJobObject(g_workers_job_object, 0); } @@ -4366,7 +4366,7 @@ void usage() "check_mk_agent remove -- remove Windows NT service\n" "check_mk_agent adhoc -- open TCP port %d and answer request until killed\n" "check_mk_agent test -- test output of plugin, do not open TCP port\n" - "check_mk_agent debug -- similar to test, but with lots of debug output\n", + "check_mk_agent debug -- similar to test, but with lots of debug output\n", check_mk_version, g_port); exit(1); }

10 years

Check_MK Git: check_mk: #1178 arris_cmts_mem: New check for Memory usage on arris cmts modules.

by Bastian Kuhn

Module: check_mk Branch: master Commit: a737672f0fc2d9699dfed996b6d29f268ceb8192 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a737672f0fc2d9… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 8 14:00:56 2014 +0200 #1178 arris_cmts_mem: New check for Memory usage on arris cmts modules. --- .werks/1178 | 9 ++++ ChangeLog | 1 + checkman/arris_cmts_mem | 23 ++++++++++ checks/arris_cmts_mem | 84 ++++++++++++++++++++++++++++++++++++ web/plugins/perfometer/check_mk.py | 1 + 5 files changed, 118 insertions(+) diff --git a/.werks/1178 b/.werks/1178 new file mode 100644 index 0000000..26ea1d5 --- /dev/null +++ b/.werks/1178 @@ -0,0 +1,9 @@ +Title: arris_cmts_mem: New check for Memory usage on arris cmts modules. +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1410177635 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 43fa0aa..bfd0e5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -43,6 +43,7 @@ * 1176 winperf_msx_queues: The list of counters for inventory can now be configured host based using wato * 0656 brocade_fcport: inventory rule can now choose upon physical und operations states as well, state choices were also updated * 1177 Hivemanger: New agent to check hivemanager devices + * 1178 arris_cmts_mem: New check for Memory usage on arris cmts modules. * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries diff --git a/checkman/arris_cmts_mem b/checkman/arris_cmts_mem new file mode 100644 index 0000000..3c6daa8 --- /dev/null +++ b/checkman/arris_cmts_mem @@ -0,0 +1,23 @@ +title: Arris CMTS: Memory Usage +agents: snmp +catalog: hw/network/arris +license: GPL +distribution: check_mk +description: + This Check shows the current and total memory usage of module in a Arris CMTS device. + +item: + The id of the module + +perfdata: + One value is returned: The amount of memory used (in Bytes), + together with warn and crit levels and maximum value + +[parameters] +parameters (dict): with the element +{"levels"}: (float/int, float/int): levels of memory usage for {WARN} and {CRIT}, + whereas {int} are treated as absolute and {float} as percentage values + +inventory: + One check for each module is created by the inventory. + diff --git a/checks/arris_cmts_mem b/checks/arris_cmts_mem new file mode 100644 index 0000000..f203c8e --- /dev/null +++ b/checks/arris_cmts_mem @@ -0,0 +1,84 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +factory_settings["arris_cmts_mem"] = { + "levels" : ( 80.0, 90.0 ), +} + +def inventory_arris_cmts_mem(info): + for cid, heap, heap_free in info: + yield cid, {} + +def check_arris_cmts_mem(item, params, info): + for cid, heap, heap_free in info: + if cid == item: + heap_free, heap = float(heap_free), float(heap) + usage_perc = (heap_free / heap) * 100 + usage = heap - heap_free + infotext = "Usage: %s of %s (%.2f %%)" % \ + (get_bytes_human_readable(heap_free), get_bytes_human_readable(heap),usage_perc) + warn, crit = params['levels'] + # Percent level + if type(crit) == float: + warn_abs = heap * warn / 100 + crit_abs = heap * crit / 100 + perfdata = [ ( 'usage', usage, warn_abs, crit_abs, 0, heap )] + levels = " (Warn/Crit at %f/%f %%)" % ( warn, crit ) + if usage_perc >= crit: + yield 2, infotext+levels, perfdata + elif usage_perc >= warn: + yield 1, infotext+levels, perfdata + else: + yield 0, infotext, perfdata + else: + perfdata = [ ( 'usage', usage, warn, crit, 0, heap )] + levels = " (Warn/Crit at %s/%s)" % \ + ( get_bytes_human_readable(warn), get_bytes_human_readable(crit) ) + if usage >= crit: + yield 2, infotext+levels, perfdata + elif usage >= warn: + yield 1, infotext+levels, perfdata + else: + yield 0, infotext, perfdata + return + yield 3, "Card not found in Output" + +check_info["arris_cmts_mem"] = { + "check_function" : check_arris_cmts_mem, + "inventory_function" : inventory_arris_cmts_mem, + "service_description" : "Memory Module %s", + "has_perfdata" : True, + "snmp_scan_function" : arris_cmts_scan_function, + "default_levels_variable" : "arris_cmts_mem", + "snmp_info" : ( ".1.3.6.1.4.1.4998.1.1.5.3.2.1.1", [ + OID_END, + 2, # cadMeHeapSize + 3, # cadMeHeapRemaining + ] ), + "group" : "memory_multiitem", + "includes" : [ "arris_cmts.include" ] +} + diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index 0c4286c..327457d 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -936,6 +936,7 @@ perfometers['check_mk-db2_mem'] = perfometer_simple_mem_usage perfometers['check_mk-esx_vsphere_hostsystem.mem_usage'] = perfometer_simple_mem_usage perfometers['check_mk-brocade_mlx.module_mem'] = perfometer_simple_mem_usage perfometers['check_mk-innovaphone_mem'] = perfometer_simple_mem_usage +perfometers['check_mk-arris_cmts_mem'] = perfometer_simple_mem_usage def perfometer_vmguest_mem_usage(row, command, perf): used = float(perf[0][1])

10 years

Check_MK Git: check_mk: merge conflict in changelog

by Bastian Kuhn

Module: check_mk Branch: master Commit: ca8bda7eb50d7b47cb41bde6e10240aa123e5330 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ca8bda7eb50d7b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Mon Sep 8 14:01:32 2014 +0200 merge conflict in changelog ---

10 years

Check_MK Git: check_mk: agent bakery: renamed msi_container. msi to vanilla_container.msi

by Andreas Boesl

Module: check_mk Branch: master Commit: 67743afee1764bb114ed59475ca7bd954412e1d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67743afee1764b… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 8 11:58:41 2014 +0200 agent bakery: renamed msi_container.msi to vanilla_container.msi --- agents/windows/msibuild/Makefile | 2 +- agents/windows/msibuild/{msi_container.msi => vanilla_container.msi} | Bin 613376 -> 613376 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index 8445fd4..9633f9c 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -51,5 +51,5 @@ msibuild: exchange_msi_files: msibuild mkdir -p work sources cp ../check_mk_agent.exe ../check_mk_agent-64.exe ../check_mk.example.ini sources - ./msi-update -v msi_container.msi sources $(BUILD_VERSION) $(CHECK_MK_VERSION) + ./msi-update -v vanilla_container.msi sources $(BUILD_VERSION) $(CHECK_MK_VERSION) rm -rf work sources diff --git a/agents/windows/msibuild/msi_container.msi b/agents/windows/msibuild/vanilla_container.msi similarity index 100% rename from agents/windows/msibuild/msi_container.msi rename to agents/windows/msibuild/vanilla_container.msi

10 years

Check_MK Git: check_mk: Fix execution permissions of rare check_mk_agents.. .

by Mathias Kettner

Module: check_mk Branch: master Commit: 51415e33d15a1eded05e2d1d2e384b89df5860bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51415e33d15a1e… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 8 11:03:42 2014 +0200 Fix execution permissions of rare check_mk_agents... --- 0 files changed diff --git a/agents/check_mk_agent.openbsd b/agents/check_mk_agent.openbsd old mode 100644 new mode 100755 diff --git a/agents/check_mk_agent.openvms b/agents/check_mk_agent.openvms old mode 100644 new mode 100755 diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris old mode 100644 new mode 100755

10 years

Check_MK Git: check_mk: Removed some trailing spaces

by Mathias Kettner

Module: check_mk Branch: master Commit: d29bf8410aac5a4f1580ba3f38136de36d424448 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d29bf8410aac5a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 8 11:01:33 2014 +0200 Removed some trailing spaces --- checks/docsis_channels_upstream | 2 +- checks/hivemanager_devices | 4 ++-- web/plugins/wato/check_parameters.py | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/checks/docsis_channels_upstream b/checks/docsis_channels_upstream index 2e25d57..f93350f 100644 --- a/checks/docsis_channels_upstream +++ b/checks/docsis_channels_upstream @@ -52,7 +52,7 @@ def docsis_channels_upstream_convert(info): def inventory_docsis_channels_upstream(info): parsed = docsis_channels_upstream_convert(info) for cid, entry in parsed.items(): - if entry[2] != '0' and entry[5] != '0': + if entry[2] != '0' and entry[5] != '0': yield cid, {} def check_docsis_channels_upstream(item, params, info): diff --git a/checks/hivemanager_devices b/checks/hivemanager_devices index e0451ec..e3ca09d 100644 --- a/checks/hivemanager_devices +++ b/checks/hivemanager_devices @@ -56,7 +56,7 @@ def check_hivemanager_devices(item, params, info): if params['alert_on_loss']: if connection == 'False': yield 2, "Connection lost" - + # The number of clients number_of_clients = int(clients) warn, crit = params['max_clients'] @@ -101,6 +101,6 @@ check_info["hivemanager_devices"] = { "default_levels_variable" : "hivemanger_devices", "group" : "hivemanager_devices", "has_perfdata" : True, - + } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 465ea15..12db48b 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1553,7 +1553,7 @@ register_check_parameters( Tuple( title = _("Maximum uptime of Device"), elements = [ - Age(title = _("Warning if above")), + Age(title = _("Warning if above")), Age(title = _("Critical if above")), ] )), @@ -1811,7 +1811,7 @@ def transform_msx_queues(params): if type(params) == tuple: return { "levels" : ( params[0], params[1] ) } return params - + register_check_parameters( subgroup_applications, @@ -1821,7 +1821,7 @@ register_check_parameters( Dictionary( title = _("Set Levels"), elements = [ - ( 'levels', + ( 'levels', Tuple( title = _("Maximum Number of E-Mails in Queue"), help = _("This rule applies to the number of E-Mails in the various Exchange Message Queues"), @@ -1830,12 +1830,12 @@ register_check_parameters( Integer(title = _("Critical if above"), unit = _("E-Mails")) ]), ), - ('offset', - Integer( + ('offset', + Integer( title = _("Offset"), help = _("Use this only if you want to overwrite the postion of the information in the agent " "Output. Also refer to the rule <i>Microsoft Exchange Queues Inventory</i> ") - ) + ) ), ], optional_keys = [ "offset" ],

10 years

Check_MK Git: check_mk: MSI creation: cleaned up script

by Mathias Kettner

Module: check_mk Branch: master Commit: 479e715fbf270c5c2e696e3ca5dabddb78cff470 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=479e715fbf270c… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 8 10:42:41 2014 +0200 MSI creation: cleaned up script --- agents/windows/msibuild/Makefile | 2 +- .../msibuild/{update_msi_file.py => msi-update} | 100 ++++++++++++++------ 2 files changed, 70 insertions(+), 32 deletions(-) diff --git a/agents/windows/msibuild/Makefile b/agents/windows/msibuild/Makefile index 9ff6582..8445fd4 100755 --- a/agents/windows/msibuild/Makefile +++ b/agents/windows/msibuild/Makefile @@ -51,5 +51,5 @@ msibuild: exchange_msi_files: msibuild mkdir -p work sources cp ../check_mk_agent.exe ../check_mk_agent-64.exe ../check_mk.example.ini sources - ./update_msi_file.py msi_container.msi $(BUILD_VERSION) $(CHECK_MK_VERSION) + ./msi-update -v msi_container.msi sources $(BUILD_VERSION) $(CHECK_MK_VERSION) rm -rf work sources diff --git a/agents/windows/msibuild/update_msi_file.py b/agents/windows/msibuild/msi-update similarity index 57% rename from agents/windows/msibuild/update_msi_file.py rename to agents/windows/msibuild/msi-update index aaf96cb..6626d3c 100755 --- a/agents/windows/msibuild/update_msi_file.py +++ b/agents/windows/msibuild/msi-update @@ -24,39 +24,76 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import os, sys, uuid +import os, sys, uuid, tempfile -# MSI container to modify -msi_file = sys.argv[1] -# Version formatted, e.g. 1.2.4.99 -new_version_build = "1.0.%s" % sys.argv[2] -# Official version name, e.g 1.2.5i4p1 -new_version_name = sys.argv[3] +def verbose(text): + if opt_verbose: + sys.stdout.write(text + "\n") + +def bail_out(text): + sys.stderr.write("ERROR: %s\n" % text) + sys.exit(1) + + +try: + if sys.argv[1] == '-v': + opt_verbose = True + del sys.argv[1] + else: + opt_verbose = False + + # MSI container to modify + msi_file = sys.argv[1] + + # Directory where the sources are contained + source_dir = sys.argv[2] + + # Version formatted, e.g. 1.2.4.99 + new_version_build = "1.0.%s" % sys.argv[3] + + # Official version name, e.g 1.2.5i4p1 + new_version_name = sys.argv[4] +except: + bail_out("Usage: %s MSIFILE.msi SOURCEDIR BUILDNUMBER VERSION" % sys.argv[0]) + + +if "OMD_ROOT" in os.environ: + path_prefix = "" + tmp_dir = os.environ("OMD_ROOT") +else: + path_prefix = "./" + tmp_dir = "." new_msi_file = "check_mk_agent.msi" +work_dir = tempfile.mkdtemp(prefix = tmp_dir + "/msi-update.") + +# When this script is run in the build environment then we need to specify +# paths to the msitools. When running in an OMD site, these tools are in +# our path # Export required idt files into work dir for entry in [ "File", "Upgrade", "Property" ]: - print "Export table %s from file %s" % (entry, msi_file) - os.system("./msiinfo export %(msi_file)s %(property)s > work/%(property)s.idt" % { "msi_file": msi_file, "property": entry }) + verbose("Export table %s from file %s" % (entry, msi_file)) + os.system((path_prefix + "msiinfo export %(msi_file)s %(property)s > %(work_dir)s/%(property)s.idt") % \ + { "work_dir" : work_dir, "msi_file": msi_file, "property": entry }) -print "Modify extracted files.." +verbose("Modify extracted files..") # ============================================== # Modify File.idt # HACK: the 64 bit agent is msi internally handled as check_mk_agent64.exe -os.rename("sources/check_mk_agent-64.exe", "sources/check_mk_agent64.exe") +os.rename(source_dir + "/check_mk_agent-64.exe", source_dir + "/check_mk_agent64.exe") -lines_file_idt = file("work/File.idt").readlines() -file_idt_new = file("work/File.idt.new", "w") +lines_file_idt = file(work_dir + "/File.idt").readlines() +file_idt_new = file(work_dir + "/File.idt.new", "w") file_idt_new.write("".join(lines_file_idt[:3])) for line in lines_file_idt[3:]: tokens = line.split("\t") filename = tokens[0] - file_stats = os.stat("sources/%s" % filename) + file_stats = os.stat(source_dir + "/" + filename) new_size = file_stats.st_size tokens[3] = str(new_size) # The version of this file is different from the msi installer version ! @@ -69,8 +106,8 @@ file_idt_new.close() # ============================================== # Modify Upgrade.idt -lines_upgrade_idt = file("work/Upgrade.idt").readlines() -upgrade_idt_new = file("work/Upgrade.idt.new", "w") +lines_upgrade_idt = file(work_dir + "/Upgrade.idt").readlines() +upgrade_idt_new = file(work_dir + "/Upgrade.idt.new", "w") upgrade_idt_new.write("".join(lines_upgrade_idt[:3])) for idx, token_offset in [ (3, 1), (4, 2) ]: @@ -86,8 +123,8 @@ upgrade_idt_new.close() # Modify Property.idt product_code = ("{%s}\r\n" % uuid.uuid1()).upper() upgrade_code = ("{%s}\r\n" % uuid.uuid1()).upper() -lines_property_idt = file("work/Property.idt").readlines() -property_idt_new = file("work/Property.idt.new", "w") +lines_property_idt = file(work_dir + "/Property.idt").readlines() +property_idt_new = file(work_dir + "/Property.idt.new", "w") property_idt_new.write("".join(lines_property_idt[:3])) for line in lines_property_idt[3:]: @@ -107,36 +144,37 @@ property_idt_new.close() -print "Creating copy of original file %s -> %s" % (msi_file, new_msi_file) +verbose("Creating copy of original file %s -> %s" % (msi_file, new_msi_file)) # Make a copy os.system("cp %(msi_file)s %(new_msi_file)s" % { "msi_file": msi_file, "new_msi_file": new_msi_file}) # Rename modified tables for entry in [ "Property", "File", "Upgrade" ]: - os.rename("work/%s.idt.new" % entry , "work/%s.idt" % entry) + os.rename(work_dir + "/%s.idt.new" % entry , work_dir + "/%s.idt" % entry) for entry in [ "Property", "File", "Upgrade" ]: - os.system("./msibuild %(new_msi_file)s -i work/%(file)s.idt" % { "new_msi_file": new_msi_file, "file": entry }) + os.system((path_prefix + "msibuild %(new_msi_file)s -i %(work_dir)s/%(file)s.idt") % \ + { "work_dir" : work_dir, "new_msi_file": new_msi_file, "file": entry }) # Update summary info with new uid package_code = ("{%s}" % uuid.uuid1()).upper() -os.system('./msibuild %(new_msi_file)s -s "Check_MK 32/64 bit MSI installer" "Mathias Kettner GmbH" "Intel;1033" "%(code)s"' %\ +os.system((path_prefix + 'msibuild %(new_msi_file)s -s "Check_MK 32/64 bit MSI installer" "Mathias Kettner GmbH" "Intel;1033" "%(code)s"') %\ {"code": package_code, "new_msi_file": new_msi_file}) # Remove original product.cab from stream -print "Removing product.cab from %s" % new_msi_file -os.system("./msibuild %(new_msi_file)s -q \"DELETE FROM _Streams where Name = 'product.cab'\"" % { "new_msi_file": new_msi_file } ) +verbose("Removing product.cab from %s" % new_msi_file) +os.system((path_prefix + "msibuild %(new_msi_file)s -q \"DELETE FROM _Streams where Name = 'product.cab'\"") % { "new_msi_file": new_msi_file } ) # Prepare product.cab file -print "Generating new product.cab" -os.system("lcab -n sources/check_mk.example.ini sources/check_mk_agent.exe sources/check_mk_agent64.exe work/product.cab") +verbose("Generating new product.cab") +os.system("lcab -n %(source_dir)s/check_mk.example.ini %(source_dir)s/check_mk_agent.exe " + "%(source_dir)s/check_mk_agent64.exe %(work_dir)s/product.cab" % globals()) # Add modified product.cab -print "Add modified product.cab" -os.system("./msibuild %(new_msi_file)s -a product.cab work/product.cab" % { "new_msi_file": new_msi_file }) - -print "Successfully created file", new_msi_file - +verbose("Add modified product.cab") +os.system((path_prefix + "msibuild %(new_msi_file)s -a product.cab %(work_dir)s/product.cab") % \ + { "work_dir" : work_dir, "new_msi_file": new_msi_file }) +verbose("Successfully created file " + new_msi_file)

10 years

Check_MK Git: check_mk: Remove useless sync

by Mathias Kettner

Module: check_mk Branch: master Commit: 46e8d167938f87e3cc73bc8414b60d4103b47911 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=46e8d167938f87… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Sep 8 10:19:33 2014 +0200 Remove useless sync --- agents/windows/msibuild/update_msi_file.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/windows/msibuild/update_msi_file.py b/agents/windows/msibuild/update_msi_file.py index d881dd1..aaf96cb 100755 --- a/agents/windows/msibuild/update_msi_file.py +++ b/agents/windows/msibuild/update_msi_file.py @@ -130,7 +130,7 @@ os.system("./msibuild %(new_msi_file)s -q \"DELETE FROM _Streams where Name = 'p # Prepare product.cab file print "Generating new product.cab" -os.system("lcab -n sources/check_mk.example.ini sources/check_mk_agent.exe sources/check_mk_agent64.exe work/product.cab ; sync") +os.system("lcab -n sources/check_mk.example.ini sources/check_mk_agent.exe sources/check_mk_agent64.exe work/product.cab") # Add modified product.cab print "Add modified product.cab"

10 years

Check_MK Git: check_mk: fixed i18n

by Andreas Boesl

Module: check_mk Branch: master Commit: fcd7d783b93ffc1e4b0930959904057199e84fe5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcd7d783b93ffc… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Sep 8 09:52:23 2014 +0200 fixed i18n --- web/plugins/wato/check_mk_configuration.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 47a3236..6107bae 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -621,10 +621,10 @@ register_configvar(group, 'information are too old.'), default_value = [ 'wato_users', 'page', 'wato_pre_activate_changes', 'wato_snapshot_pushed' ], choices = [ - ('page', 'During regular page processing'), - ('wato_users', 'When opening the users configuration page'), - ('wato_pre_activate_changes', 'Before activating the changed configuration'), - ('wato_snapshot_pushed', 'On a remote site, when it receives a new configuration'), + ('page', _('During regular page processing')), + ('wato_users', _('When opening the users configuration page')), + ('wato_pre_activate_changes', _('Before activating the changed configuration')), + ('wato_snapshot_pushed', _('On a remote site, when it receives a new configuration')), ], allow_empty = True, ),

10 years

Check_MK Git: check_mk: Hivemanger: use ip instead of hostaname to connect to the hivemanager

by Bastian Kuhn

Module: check_mk Branch: master Commit: 292d29f825daa717b937eb67f9a18399bac88f29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=292d29f825daa7… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Fri Sep 5 16:34:39 2014 +0200 Hivemanger: use ip instead of hostaname to connect to the hivemanager --- agents/special/agent_hivemanager | 6 +++--- checks/agent_hivemanager | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/special/agent_hivemanager b/agents/special/agent_hivemanager index e6cae61..80bfb40 100755 --- a/agents/special/agent_hivemanager +++ b/agents/special/agent_hivemanager @@ -29,11 +29,11 @@ from urllib2 import urlopen import urllib2, base64, json try: - host = sys.argv[1] + ip = sys.argv[1] user = sys.argv[2] password = sys.argv[3] except: - print "Usage: agent_hivemanager <HOST> <USERNAME> <PASSWORD>" + print "Usage: agent_hivemanager <IP> <USERNAME> <PASSWORD>" sys.exit(2) def get_url(address): @@ -52,7 +52,7 @@ print "Version: 1.2.5" print "AgentOs: Hivemanager" print "<<<hivemanager_devices:sep(124)>>>" -address = "https://%s/hm/api/v1/devices" % host +address = "https://%s/hm/api/v1/devices" % ip for line in json.loads(get_url(address).read()): if line['upTime'] == '': line['upTime'] = "down" diff --git a/checks/agent_hivemanager b/checks/agent_hivemanager index 5cfe427..4cfd87d 100644 --- a/checks/agent_hivemanager +++ b/checks/agent_hivemanager @@ -26,6 +26,6 @@ def agent_hivemanager_arguments(params, hostname, ipaddress): # User, Password - return "'%s' %s %s" % ( hostname, quote_shell_string(params[0]), quote_shell_string(params[1]) ) + return "'%s' %s %s" % ( ipaddress, quote_shell_string(params[0]), quote_shell_string(params[1]) ) special_agent_info['hivemanager'] = agent_hivemanager_arguments

10 years

← Newer
1
...
12
13
14
15
16
17
18
19
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2014