Checkmk git commits December 2013

checkmk-commits@lists.checkmk.com

6 participants
316 discussions

Check_MK Git: check_mk: werk: fixed error message

by Mathias Kettner

Module: check_mk Branch: master Commit: 6df06b9310e9be36739ed0d2181d52b29ba93761 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6df06b9310e9be… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 10 10:42:54 2013 +0100 werk: fixed error message --- werk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/werk b/werk index 2488d3c..bf28bc8 100755 --- a/werk +++ b/werk @@ -765,7 +765,7 @@ def main_fetch_ids(args): usage() if current_branch() != "master": - bail_out("It is not allowed to reserver IDs on any other branch than the master.\n") + bail_out("It is not allowed to reserve IDs on any other branch than the master.") # Get the start werk_id to reserve try:

10 years, 9 months

Check_MK Git: check_mk: Disallow werk ids on branch other than master

by Mathias Kettner

Module: check_mk Branch: master Commit: 8eaf08a9f84ac56deab0f2f450437b6d2dcd4831 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8eaf08a9f84ac5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 10 10:42:16 2013 +0100 Disallow werk ids on branch other than master --- werk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/werk b/werk index 6a06038..2488d3c 100755 --- a/werk +++ b/werk @@ -752,6 +752,9 @@ def store_werk_ids(l): file('.my_ids', 'w').write(repr(l) + "\n") +def current_branch(): + return [ l for l in os.popen("git branch") if l.startswith("*") ][0].split()[-1] + def main_fetch_ids(args): if not args: sys.stdout.write('You have %d reserved IDs.\n' % (len(get_werk_ids()))) @@ -761,6 +764,9 @@ def main_fetch_ids(args): else: usage() + if current_branch() != "master": + bail_out("It is not allowed to reserver IDs on any other branch than the master.\n") + # Get the start werk_id to reserve try: first_free = int(eval(file('first_free').read()))

10 years, 9 months

Check_MK Git: check_mk: Reserved 2 Werk IDS

by Mathias Kettner

Module: check_mk Branch: master Commit: f87fa465e9672d58cd3d1865693c6aa29e0d01d1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f87fa465e9672d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 10 10:41:50 2013 +0100 Reserved 2 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 5478c71..6695365 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -313 +315

10 years, 9 months

Check_MK Git: check_mk: werk: new command werk cherry-pick

by Mathias Kettner

Module: check_mk Branch: master Commit: b275ef4acd6fbb1a24e6cf2c572a0125d05a7ed5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b275ef4acd6fbb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Dec 10 09:50:22 2013 +0100 werk: new command werk cherry-pick --- werk | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 70 insertions(+), 11 deletions(-) diff --git a/werk b/werk index 0a2dfe0..6a06038 100755 --- a/werk +++ b/werk @@ -74,6 +74,7 @@ def goto_werksdir(): sys.stderr.write("Cannot find directory .werks\n") sys.exit(1) + def load_config(): global g_last_werk execfile("config", globals(), globals()) @@ -108,7 +109,7 @@ def parse_changelog(): global g_current_version ch = file("../ChangeLog") version = ch.readline().strip().rstrip(":") - if len(version) not in [ 6, 7, 8 ] or \ + if len(version) not in [ 6, 7, 8, 9, 10 ] or \ not version[0].isdigit() or \ version[1] != '.': bail_out("Invalid version number '%s' in ChangeLog" % version) @@ -232,6 +233,12 @@ def save_werk(werk): save_last_werkid(werk["id"]) rewrite_changelog() +def change_werk_version(werk_id, new_version): + werk = g_werks[werk_id] + werk["version"] = new_version + save_werk(werk) + git_add(werk) + def git_add(werk): os.system("git add %d" % werk["id"]) @@ -678,6 +685,56 @@ def main_commit(args): bail_out("Cannot commit.") +def main_pick(args): + if len(args) == 0: + bail_out("Please specify at least one commit ID to cherry-pick.") + if args[0] == '-n': + no_commit = True + args = args[1:] + else: + no_commit = False + + for commit_id in args: + werk_cherry_pick(commit_id, no_commit) + + +def werk_cherry_pick(commit_id, no_commit): + # Create a copy of our current ChangeLog in order to deal + # with merge conflicts (different branches use different version + # numbers). + old_changelog = file("../ChangeLog").read() + + # Cherry-pick the commit in question from the other branch + os.system("git cherry-pick --no-commit '%s'" % commit_id) + + # Find werks that have been cherry-picked and change their version + # to our current version + load_werks() # might have changed + for line in os.popen("git status --porcelain"): + # M .werks/103 + # M ChangeLog + # M werk + status, filename = line.strip().split(None, 1) + if filename.startswith(".werks/") and filename[7].isdigit(): + werk_id = int(filename[7:]) + change_werk_version(werk_id, g_current_version) + sys.stdout.write("Changed version of werk #%04d to %s.\n" % (werk_id, g_current_version)) + + # Move back our saved ChangeLog and rewrite it so the new werk appears + file("../ChangeLog", "w").write(old_changelog) + rewrite_changelog() + os.system("git add ../ChangeLog") + + # Commit + if not no_commit: + os.system("git commit -C '%s'" % commit_id) + + else: + sys.stdout.write("We don't commit yet. Here is the status:\n") + sys.stdout.write("Please commit with git commit -C '%s'\n\n" % commit_id) + os.system("git status") + + def get_werk_ids(): try: return eval(file('.my_ids', 'r').read()) @@ -744,16 +801,18 @@ if len(sys.argv) < 2: cmd = sys.argv[1] commands = { - "list" : lambda args: main_list(args, "console"), - "export" : lambda args: main_list(args, "csv"), - "show" : main_show, - "new" : main_new, - "blame" : main_blame, - "delete" : main_delete, - "grep" : main_grep, - "edit" : main_edit, - "ids" : main_fetch_ids, - "rewrite" : rewrite_changelog, + "list" : lambda args: main_list(args, "console"), + "export" : lambda args: main_list(args, "csv"), + "show" : main_show, + "new" : main_new, + "blame" : main_blame, + "delete" : main_delete, + "grep" : main_grep, + "edit" : main_edit, + "ids" : main_fetch_ids, + "rewrite" : rewrite_changelog, + "pick" : main_pick, + "cherry-pick" : main_pick, } hits = []

10 years, 9 months

Check_MK Git: check_mk: apc_humidity: New Check for humidity levels on APC Devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 967ca8aa02ef6ba3c6eaf535451a4d7f503f16a0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=967ca8aa02ef6b… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Dec 10 09:49:35 2013 +0100 apc_humidity: New Check for humidity levels on APC Devices --- .werks/105 | 8 +++++++ ChangeLog | 1 + checkman/apc_humidity | 36 +++++++++++++++++++++++++++++ checks/apc_humidity | 60 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 105 insertions(+) diff --git a/.werks/105 b/.werks/105 new file mode 100644 index 0000000..bd9cb5c --- /dev/null +++ b/.werks/105 @@ -0,0 +1,8 @@ +Title: apc_humidity: New Check for humidity levels on APC Devices +Level: 1 +Component: checks +Version: 1.2.3i8 +Date: 1386665341 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 8cae72b..7940374 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets * 0073 moxa_iologik_register: new check to monitor moxa e2000 series registers + * 0105 apc_humidity: New Check for humidity levels on APC Devices * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/apc_humidity b/checkman/apc_humidity new file mode 100644 index 0000000..537da4b --- /dev/null +++ b/checkman/apc_humidity @@ -0,0 +1,36 @@ +title: APC Humidity +agents: snmp +catalog: hw/environment +license: GPL +distribution: check_mk +description: + This check monitors the humidity of sensors attached + to several APC devices. + +item: + The item is the sensor description of the sensor as string. + +perfdata: + the current humidity in percent, lower crit, lower warn, upper warn, upper crit + +inventory: + All available humidity sensors are automatically inventorized. + +examples: + # set default levels for all apc humidity sensors + apc_humidity_default_levels = (35, 40, 60, 65) + + # to Overwrite the default levels levels for a sensor + check_parameters += [ + ( ( lower crit, lower warn, upper warn, upper crit ), ['hostname'], ['Humidity Senosr Name'] ), + ] + +[parameters] +critical low (int): lower border for triggering critical level +warning low (int): lower border for warning level +warning high (int): upper border for triggering warning level +critical high (int): upper border for critical level + +[configuration] +apc_humidity (int, int, int, int): default levels for lower critical lower warning + and upper warning, upper critical. Preset to ( 35, 40, 60, 65 ). diff --git a/checks/apc_humidity b/checks/apc_humidity new file mode 100644 index 0000000..0b9b4b3 --- /dev/null +++ b/checks/apc_humidity @@ -0,0 +1,60 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + + +apc_humidity_default_levels = (35, 40, 60, 65) + + +def inventory_apc_humidity(info): + return [(line[0], "apc_humidity_default_levels") for line in info] + +def check_apc_humidity(item, params, info): + for line in info: + if line[0] == item: + humidity = saveint(line[1]) + warnlow, critlow, warnhigh, crithigh = params + infotext = "%s%%" % humidity + " (warn/crit below %.1f/%.1f or above %.1f/%.1f %%" % \ + (critlow, warnlow, warnhigh, crithigh) + ")" + perfdata = [ ( "humidity", humidity, critlow, warnlow, warnhigh, crithigh ) ] + if humidity <= critlow or humidity >= crithigh: + return (2, "Humidity is: " + infotext, perfdata ) + elif humidity <= warnlow or humidity >= warnhigh: + return (1, "Humidity is: " + infotext, perfdata ) + else: + return (0, "Humidity is: " + infotext, perfdata ) + + return (3, "sensor not found in SNMP data") + + +check_info["apc_humidity"] = { + 'check_function': check_apc_humidity, + 'inventory_function': inventory_apc_humidity, + 'service_description': 'Humidity %s', + 'has_perfdata': True, + 'snmp_info': ('.1.3.6.1.4.1.318.1.1.10.4.2.3.1', ['3', '6']), + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.318.1.3"), + 'group': 'humidity', +}

10 years, 9 months

Check_MK Git: check_mk: veeam_client: FIX in case of several veeam_client sections per piggyback host

by Götz Golla

Module: check_mk Branch: master Commit: 15c873d40e611d67aaab7d015f65b47276c3c8d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=15c873d40e611d… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Dec 10 09:22:36 2013 +0100 veeam_client: FIX in case of several veeam_client sections per piggyback host --- checks/veeam_client | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/veeam_client b/checks/veeam_client index e7928bb..0eeef20 100644 --- a/checks/veeam_client +++ b/checks/veeam_client @@ -47,11 +47,11 @@ def check_veeam_client(item, params, info): stoptime = "" duration_string = "" infotxt = "" - perfdata = [] for line in info: if line[0] == "Status": result = line[1] - infotxt += line[0] + ":" + line[1] + " " + perfdata = [] + infotxt = line[0] + ":" + line[1] + " " elif line[0] == "DurationDDHHMMSS" and result != "InProgress" and result != "Pending": duration_string = line[1] spur = map(saveint, duration_string.split(":") )

10 years, 9 months

Check_MK Git: check_mk: werk commit after merge conflict

by Götz Golla

Module: check_mk Branch: master Commit: f1dbd677be974d81616c798227bdcc7b4228e63e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f1dbd677be974d… Author: Götz Golla <gg(a)mathias-kettner.de> Date: Tue Dec 10 09:18:40 2013 +0100 werk commit after merge conflict --- .werks/73 | 8 +++++ ChangeLog | 1 + checkman/moxa_iologik_register | 16 +++++++++ checks/moxa_iologik_register | 72 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 97 insertions(+) diff --git a/.werks/73 b/.werks/73 new file mode 100644 index 0000000..9a6f267 --- /dev/null +++ b/.werks/73 @@ -0,0 +1,8 @@ +Title: moxa_iologik_register: new check to monitor moxa e2000 series registers +Level: 1 +Component: checks +Version: 1.2.3i8 +Date: 1386663142 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 9d523b8..8cae72b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 1.2.3i8: Checks & Agents: * 0306 esx_vsphere_counters: added missing ramdisk levels sfcbtickets + * 0073 moxa_iologik_register: new check to monitor moxa e2000 series registers * 0103 FIX: services: Fixed bug with service inventory defined in main.mk... * 0299 FIX: borcade_mlx_fan: Prettified output, handling "other" state now * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... diff --git a/checkman/moxa_iologik_register b/checkman/moxa_iologik_register new file mode 100644 index 0000000..42fe9eb --- /dev/null +++ b/checkman/moxa_iologik_register @@ -0,0 +1,16 @@ +title: Moxa IOLogik Register Check +agents: snmp +catalog: hw/other +license: GPL +distribution: check_mk +description: + This check monitors the status of registers found on the moxa iologik e2000 + series. It has been tested on the e2242 devices. + + The check expects the value of the registers to be an integer in the range + {0-2} and takes these values as the state of the check. The name of the + register is taken as the status detail of the check. + If the value is not out of 0,1,2 the check state is {UNKNOWN}. + +inventory: + A check will be created for all registers found on the device. diff --git a/checks/moxa_iologik_register b/checks/moxa_iologik_register new file mode 100644 index 0000000..067cd30 --- /dev/null +++ b/checks/moxa_iologik_register @@ -0,0 +1,72 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | 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. + +# "0=Off, 1=On in DI/DO mode or N=Count in DO counter mode" + +def inventory_iologik_register(info): + inventory = [] + for line in info: + if line[2]: + inventory.append((line[0], None )) + return inventory + + +def check_iologik_register(item, params, info): + for line in info: + if line[0] == item: + if int(line[2]) in range(0, 2): + return (int(line[2]), line[1]) + else: + return (3, "Invalid value %s for register" % line[2]) + + return (3, "Register not found") + + +check_info['moxa_iologik_register'] = { + "check_function" : check_iologik_register, + "inventory_function" : inventory_iologik_register, + "service_description" : "Moxa Register", + "has_perfdata" : False, + "group" : "iologik_register", + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.4.1.8691.10.2242.2.0").startswith("E2242-T"), + "snmp_info" : (".1.3.6.1.4.1.8691.10.2242.10.4.1.1", + [ "1", # index + "2", # Name + "3", # Value + ]) +} + +# DIOEntry +# dioIndex Integer32 (0..11) "The channel dio index." +# dioType Integer32 (0..1) "The channel dio type. 0=DI, DO=1, AI=2" +# dioMode Integer32 (0..1) "The channel dio mode. 0=DI, 1=Event Counter" +# dioStatus Unsigned32 (0..4294967295) "The channel dio(di/do) status. 0=Off, 1=On in DI/DO mode or N=Count in DO counter mode +# dioFilter Integer32 (1..65535) "The channel dio(di) counter filter. unit=0.5ms" +# dioTrigger Integer32 (0..1) "The channel dio(di) counter trigger level. 0=L2H, 1=H2L" +# dioCntStart Integer32 (0..1) "The channel dio(do) counter start/stop. 0=stop, 1=start" +# dioPulseStart Integer32 (0..1) "The channel dio(do) pulse start/stop. 0=stop, 1=start" +# dioPulseONWidth Unsigned32 (1..4294967295) "The channel dio(do) signal ON width. unit=0.5ms" +# dioPulseOFFWidth Unsigned32 (1..4294967295) "The channel dio(do) signal OFF width. unit=0.5ms"

10 years, 9 months

Check_MK Git: check_mk: Multisite can now set rotation view permissions for NagVis

by Lars Michelsen

Module: check_mk Branch: master Commit: cb036f8bc13bb64c8d286c4786e1be3df4e1b40b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb036f8bc13bb6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 9 19:51:48 2013 +0100 Multisite can now set rotation view permissions for NagVis When using multisite to controll the users permissions within NagVis, the read access to rotations could not be controlled via Multisite. The permission for this has been added now. This change only applies when used with the newest NagVis version (currently daily build). --- .werks/308 | 11 +++++++++++ ChangeLog | 1 + web/plugins/wato/nagvis_auth.py | 7 +++++++ 3 files changed, 19 insertions(+) diff --git a/.werks/308 b/.werks/308 new file mode 100644 index 0000000..77c9ca3 --- /dev/null +++ b/.werks/308 @@ -0,0 +1,11 @@ +Title: Multisite can now set rotation view permissions for NagVis +Level: 1 +Component: wato +Version: 1.2.3i8 +Date: 1386614980 +Class: feature + +When using multisite to controll the users permissions within NagVis, +the read access to rotations could not be controlled via Multisite. +The permission for this has been added now. This change only applies +when used with the newest NagVis version (currently daily build). diff --git a/ChangeLog b/ChangeLog index 4072a85..2a36ae5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 0307 FIX: Increased performance of multisite GUI with a large userbase... WATO: + * 0308 Multisite can now set rotation view permissions for NagVis... * 0057 FIX: Fix exception in WATO host editor on custom tag without topic... Reporting & Availability: diff --git a/web/plugins/wato/nagvis_auth.py b/web/plugins/wato/nagvis_auth.py index e2bbb18..d3d66cc 100644 --- a/web/plugins/wato/nagvis_auth.py +++ b/web/plugins/wato/nagvis_auth.py @@ -43,6 +43,13 @@ config.declare_permission( ) config.declare_permission( + 'nagvis.Rotation_view_*', + _('Use all map rotations'), + _('Grants read access to all rotations.'), + [ 'guest' ] +) + +config.declare_permission( 'nagvis.Map_edit_*', _('Edit all maps'), _('Grants modify access to all maps.'),

10 years, 9 months

Check_MK Git: check_mk: FIX Virtualmachine names with space no longer have missing piggyback data

by Andreas Boesl

Module: check_mk Branch: master Commit: 9388d20b48330246329f15262af19ff8c6dcb19a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9388d20b483302… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Dec 9 17:57:40 2013 +0100 FIX Virtualmachine names with space no longer have missing piggyback data Every space character in a virtualmachines name needs to be converted to an underline character. This didn't apply to the piggyback data section for the VM. --- .werks/240 | 9 +++++++++ ChangeLog | 1 + agents/special/agent_vsphere | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/240 b/.werks/240 new file mode 100644 index 0000000..791d410 --- /dev/null +++ b/.werks/240 @@ -0,0 +1,9 @@ +Title: Virtualmachine names with space no longer have missing piggyback data +Level: 1 +Component: checks +Version: 1.2.3i8 +Date: 1386608073 +Class: fix + +Every space character in a virtualmachines name needs to be converted to an underline character. +This didn't apply to the piggyback data section for the VM. diff --git a/ChangeLog b/ChangeLog index 4072a85..171b102 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,7 @@ * 0300 FIX: cisco_fru_power: Trying not to inventorize not plugged in FRUs... * 0305 FIX: apache_status: Fixed exception when agent reports HTML code as apache-status data... * 0104 FIX: mssql: Server instances with underline in name are now supported.... + * 0240 FIX: Virtualmachine names with space no longer have missing piggyback data... Multisite: * 0302 FIX: Fixed highlight of choosen elements in foldertee/views snapin in Chrome/IE diff --git a/agents/special/agent_vsphere b/agents/special/agent_vsphere index 94a4f44..452296c 100755 --- a/agents/special/agent_vsphere +++ b/agents/special/agent_vsphere @@ -557,7 +557,7 @@ if not error: for key in sorted(vms.keys()): data = vms[key] if data.get("name"): - print "<<<<%s>>>>" % data.get("name") + print "<<<<%s>>>>" % data.get("name").replace(" ", "_") print "<<<esx_vsphere_vm>>>" entries = list(data.items()) entries.sort() @@ -580,7 +580,7 @@ if not error: for key in sorted(vms.keys()): data = vms[key] running_on = hostsystem_name.get(data.get("runtime.host"), data.get("runtime.host")) - print "virtualmachine\t%s\t%s\t%s" % (data.get("name").replace(" ","_"), running_on, data.get("runtime.powerState")) + print "virtualmachine\t%s\t%s\t%s" % (data.get("name").replace(" ", "_"), running_on, data.get("runtime.powerState")) except Exception, e: if opt_debug:

10 years, 9 months

Check_MK Git: check_mk: web .f12: not removing cmc and omd plugins anymore

by Lars Michelsen

Module: check_mk Branch: master Commit: 474529c60179bc30b31b71c7f84aa112bb64db3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=474529c60179bc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Dec 9 14:58:00 2013 +0100 web .f12: not removing cmc and omd plugins anymore --- web/.f12 | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/web/.f12 b/web/.f12 index cf8c53b..be2e61a 100644 --- a/web/.f12 +++ b/web/.f12 @@ -1,7 +1,12 @@ #!/bin/bash SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} -sudo rsync --exclude=defaults.py --exclude "*mkevent*" --delete -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ +sudo rsync \ + --exclude=defaults.py \ + --exclude "*mkevent*" \ + --exclude "*cmc.py" \ + --exclude "*omd_configuration.py" \ + --delete -varx htdocs plugins /omd/sites/$SITE/share/check_mk/web/ echo "$C files copied" if [ "$SITE" != - ] ; then sudo omd restart $SITE apache

10 years, 9 months

← Newer
1
...
22
23
24
25
26
27
28
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2013