Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64625 discussions

Check_MK Git: check_mk: wagner_titanus_topsense.airflow_deviation: New Check for Airflow Deviation in Wagner Titanus Top Sens devices

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 881778a271971196f5495bc17f4ac0fe3be4b32f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=881778a2719711… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 16:19:36 2014 +0200 wagner_titanus_topsense.airflow_deviation: New Check for Airflow Deviation in Wagner Titanus Top Sens devices --- .werks/896 | 8 +++ ChangeLog | 1 + checkman/wagner_titanus_topsense.airflow_deviation | 53 ++++++++++++++++++++ checks/wagner_titanus_topsense | 49 +++++++++++++++++- ...k-wagner_titanus_topsense.airflow_deviation.php | 36 +++++++++++++ web/plugins/perfometer/check_mk.py | 7 +++ web/plugins/wato/check_parameters.py | 19 +++++++ 7 files changed, 172 insertions(+), 1 deletion(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=881778a271…

10 years, 5 months

Check_MK Git: check_mk: manually resolved merge conflicts in ChangeLog

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 8d71d364e5111e48e08292e10f3d2f1ca82ee287 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d71d364e5111e… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Tue Apr 22 16:20:21 2014 +0200 manually resolved merge conflicts in ChangeLog ---

10 years, 5 months

Check_MK Git: check_mk: FIX availability: fixed bug causing the availability feature not considering timeperiod transitions

by Andreas Boesl

Module: check_mk Branch: master Commit: d10db8b3830dbbe46986dfd4308034b04a6bcbd9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d10db8b3830dbb… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 22 14:56:35 2014 +0200 FIX availability: fixed bug causing the availability feature not considering timeperiod transitions Conflicts: .werks/903 ChangeLog --- .werks/903 | 1 - 1 file changed, 1 deletion(-) diff --git a/.werks/903 b/.werks/903 index ab0f5cc..9b23d98 100644 --- a/.werks/903 +++ b/.werks/903 @@ -6,4 +6,3 @@ State: unknown Version: 1.2.5i3 Date: 1398171132 -

10 years, 5 months

Check_MK Git: check_mk: FIX availability: fixed bug causing the availability feature not considering timeperiod transitions

by Andreas Boesl

Module: check_mk Branch: master Commit: 170070ed0879ea46eb441d1392ecdd1341c68599 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=170070ed0879ea… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 22 14:53:32 2014 +0200 FIX availability: fixed bug causing the availability feature not considering timeperiod transitions --- .werks/903 | 9 +++++++++ ChangeLog | 1 + livestatus/src/TableStateHistory.cc | 1 - 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.werks/903 b/.werks/903 new file mode 100644 index 0000000..ab0f5cc --- /dev/null +++ b/.werks/903 @@ -0,0 +1,9 @@ +Title: availability: fixed bug causing the availability feature not considering timeperiod transitions +Level: 1 +Component: core +Class: fix +State: unknown +Version: 1.2.5i3 +Date: 1398171132 + + diff --git a/ChangeLog b/ChangeLog index 417c308..581bb2e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ Core & Setup: * 0884 New options --oid and --extraoid for cmk --snmpwalk... * 0785 FIX: Availability: fixed memory leak in table statehist... + * 0903 FIX: availability: fixed bug causing the availability feature not considering timeperiod transitions Checks & Agents: * 0149 cisco_secure: New check for Port Security on Cisco swichtes diff --git a/livestatus/src/TableStateHistory.cc b/livestatus/src/TableStateHistory.cc index 5d4ac39..b2fc7dc 100644 --- a/livestatus/src/TableStateHistory.cc +++ b/livestatus/src/TableStateHistory.cc @@ -609,7 +609,6 @@ void TableStateHistory::answerQuery(Query *query) char *save_ptr; char *buffer = strdup(entry->_options); char *tp_name = strtok_r(buffer, ";", &save_ptr); - strtok_r(NULL, ";", &save_ptr); char *tp_state = strtok_r(NULL, ";", &save_ptr); if (tp_state) tp_state = strtok_r(NULL, ";", &save_ptr);

10 years, 5 months

Check_MK Git: check_mk: Revert "mem.win: now able to configure swap file levels"

by Andreas Boesl

Module: check_mk Branch: master Commit: 0f5c4b24fd2ac0530406a87c5779d05cf32984f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0f5c4b24fd2ac0… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Apr 22 13:52:54 2014 +0200 Revert "mem.win: now able to configure swap file levels" This reverts commit 207481c5d6449981e9ab307835a392bdc498304e. Conflicts: ChangeLog --- .werks/735 | 8 -------- ChangeLog | 5 ++--- checkman/mem.win | 4 ---- checks/mem | 4 +--- web/plugins/wato/check_parameters.py | 33 +++------------------------------ 5 files changed, 6 insertions(+), 48 deletions(-) diff --git a/.werks/735 b/.werks/735 deleted file mode 100644 index 6a0a5f4..0000000 --- a/.werks/735 +++ /dev/null @@ -1,8 +0,0 @@ -Title: mem.win: now able to configure swap file levels -Level: 1 -Component: checks -Version: 1.2.5i1 -Date: 1395416329 -Class: feature - - diff --git a/ChangeLog b/ChangeLog index a634b46..417c308 100644 --- a/ChangeLog +++ b/ChangeLog @@ -229,11 +229,8 @@ * 0595 dell_chassis_power, dell_chassis_powersupplies: new checks for Dell Poweredge Chassis Ppower consumption... * 0596 dell_chassis_status, dell_chassis_temp, dell_chassis_kvm, dell_chassis_io, dell_chassis_fans: new checks to monitor the overall status of various sections of the Dell Poweredge Chassis via CMC * 0597 dell_chassis_slots: new check to monitor the status of the blade slots of the Dell Poweredge Blade Servers - * 0759 check_notify_count: New active check to monitor the number of notifications sent to contacts... - * 0760 The windows agent contains meta information about version, manufacturer etc.... * 0145 apc_symmetra: Changed naming of Batterie Temperature to System Temerature... NOTE: Please refer to the migration notes! - * 0735 mem.win: now able to configure swap file levels * 0146 innovaphone_priports_l1, innovaphone_priports_l2: New Checks for Innovaphone PRI Ports * 0707 ibm_svc_host: New check: Status of hosts an IBM SVC / V7000 presents volumes to * 0598 kentix_temp, kentix_humidity: new checks for Kentix MultiSensor-Rack @@ -244,6 +241,8 @@ * 0771 juniper_trpz_aps: Show the number of connected access points on juniper wlan controllers * 0772 added special agent for IBM SVC / V7000 storage systems... * 0147 enterasys_fans: New Check to monitor fans of enterasys swichtes + * 0759 check_notify_count: New active check to monitor the number of notifications sent to contacts... + * 0760 The windows agent contains meta information about version, manufacturer etc.... * 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/mem.win b/checkman/mem.win index 6aa124a..296e52c 100644 --- a/checkman/mem.win +++ b/checkman/mem.win @@ -21,7 +21,6 @@ examples: memory_win_default_levels = { "memory" : (80.0, 90.0), # alert at 80%/90% usage "pagefile" : (2048, 1024), # alert, if less then 2/1 GB free - "swap" : (2048, 1024), # alert, if less then 2/1 GB free "average" : 60, # apply levels on 60-min average } @@ -46,9 +45,6 @@ parameters (dict): This check uses a dictionary as parameter. The following {"pagefile"} Warning and critical levels for page file usage. The same rules apply as for {memory}. - {"swap"} Warning and critical levels for swap usage. The same - rules apply as for {memory}. - {"average"} This optional parameters sets a value in minutes for averaging. In that case all warn/crit levels are applied to the averaged values. diff --git a/checks/mem b/checks/mem index a086ea0..2e26709 100644 --- a/checks/mem +++ b/checks/mem @@ -81,7 +81,6 @@ check_info['mem.used'] = { factory_settings["memory_win_default_levels"] = { "memory" : ( 80.0, 90.0 ), "pagefile" : ( 50.0, 70.0 ), - "swap" : ( 70.0, 80.0 ), } def inventory_mem_win(info): @@ -102,8 +101,7 @@ def check_mem_windows(item, params, info): for title, what, paramname in [ ( "Memory", "Mem", "memory" ), - ( "Page file", "Page", "pagefile" ), - ( "Swap", "Swap", "swap" )]: + ( "Page file", "Page", "pagefile" )]: total_kb = meminfo[what + "Total"] free_kb = meminfo[what + "Free"] used_kb = total_kb - free_kb diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 15918e0..8f2ef51 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1115,7 +1115,7 @@ register_check_parameters( register_check_parameters( subgroup_os, "memory_pagefile_win", - _("Memory, pagefile and swap levels for Windows"), + _("Memory and pagefile levels for Windows"), Dictionary( elements = [ ( "memory", @@ -1137,7 +1137,7 @@ register_check_parameters( Filesize(title = _("Critical if less than")), ] ), - # Note: Memory values lesser 1MB will not work + # Note: Filesize values lesser 1MB will not work # -> need hide option in filesize valuespec back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024), forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024) @@ -1163,7 +1163,7 @@ register_check_parameters( Filesize(title = _("Critical if less than")), ] ), - # Note: Memory values lesser 1MB will not work + # Note: Filesize values lesser 1MB will not work # -> need hide option in filesize valuespec back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024), forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024) @@ -1171,33 +1171,6 @@ register_check_parameters( ], default_value = (50.0, 70.0)) ), - ( "swap", - Alternative( - title = _("Swap Levels"), - elements = [ - Tuple( - title = _("Swap usage in percent"), - elements = [ - Percentage(title = _("Warning if above")), - Percentage(title = _("Critical if above")), - ] - ), - Transform( - Tuple( - title = _("Absolute free swap"), - elements = [ - Filesize(title = _("Warning if less than")), - Filesize(title = _("Critical if less than")), - ] - ), - # Note: Memory values lesser 1MB will not work - # -> need hide option in filesize valuespec - back = lambda x: (x[0] / 1024 / 1024, x[1] / 1024 / 1024), - forth = lambda x: (x[0] * 1024 * 1024, x[1] * 1024 * 1024) - ) - ], - default_value = (70.0, 80.0)) - ), ("average", Integer ( title = _("Averaging"),

10 years, 5 months

Check_MK Git: check_mk: fsc_fans: Added support for Wato configuration and upper limits

by Bastian Kuhn

Module: check_mk Branch: master Commit: 376bf5bd48b3804d53f36a5b81d48b9a9fa1a2bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=376bf5bd48b380… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Apr 22 11:30:42 2014 +0200 fsc_fans: Added support for Wato configuration and upper limits --- .werks/152 | 8 ++++---- ChangeLog | 2 +- checkman/fsc_fans | 7 +++++++ checks/fsc_fans | 24 +++++++++++++++++------- web/htdocs/images/icons/klipper.png | Bin 3364 -> 0 bytes 5 files changed, 29 insertions(+), 12 deletions(-) diff --git a/.werks/152 b/.werks/152 index bed4540..04392a6 100644 --- a/.werks/152 +++ b/.werks/152 @@ -1,8 +1,8 @@ -Title: windows_updates: Added Error Handling (Thanks to Stefan Kick) +Title: fsc_fans: Added support for Wato configuration and upper limits Level: 1 Component: checks Version: 1.2.5i3 -Date: 1397744176 -Class: fix +Date: 1398159011 +Class: feature + -The windows_update plugin now also handles windows servers with deactivated update function. diff --git a/ChangeLog b/ChangeLog index e7698e8..a634b46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -30,6 +30,7 @@ * 0892 wagner_titanus_topsense: new info check and overall status check for Wagner Titanus Top Sens devices * 0893 wagner_titanus_topsense.alarm: New check for Alarms Triggered on Wagner Titanus Top Sens devices * 0894 wagner_titanus_topsense.smoke: New check for Smoke Detectors in Wagner Titanus Top Sens devices + * 0152 fsc_fans: Added support for Wato configuration and upper limits * 0777 FIX: special agent emcvnx: did not work with security file authentication... * 0786 FIX: zfsget: fixed compatibility with older Solaris agents... * 0809 FIX: brocade_fcport: Fixed recently introduced problem with port speed detection @@ -44,7 +45,6 @@ * 0882 FIX: check_bi_local.py: fix crash in case of non-ascii characters... * 0606 FIX: apache_status: now also sends an accept header to make it work with mod_security enables servers * 0832 FIX: solaris_mem: fixed invalid calculation of total swap... - * 0152 FIX: windows_updates: Added Error Handling (Thanks to Stefan Kick)... * 0810 FIX: fritz.link: Not inventorizing "unconfigured" interfaces anymore Multisite: diff --git a/checkman/fsc_fans b/checkman/fsc_fans index af94484..617d5d4 100644 --- a/checkman/fsc_fans +++ b/checkman/fsc_fans @@ -16,3 +16,10 @@ description: inventory: The check creates one service for each FAN provided in the SNMP data. + +[parameters] +parameters(dict): parameters is a dictionary with two keys + + {"lower"}: a tuple of lower warning and critical values for the fan rpm + + {"upper"}: a tuple of upper warning and critical values for the fan rpm diff --git a/checks/fsc_fans b/checks/fsc_fans index 78bc2bb..01644cc 100644 --- a/checks/fsc_fans +++ b/checks/fsc_fans @@ -29,20 +29,29 @@ def inventory_fsc_fans(info): return [ (line[0], line[1], (int(line[1]) * 0.9, int(line[1]) * 0.8)) for line in info if int(line[1]) > 0 ] def check_fsc_fans(item, params, info): - warn, crit = params + if type(params) == tuple: + low_warn, low_crit = params + up_warn, up_crit = None, None + else: + low_warn, low_crit = params['lower'] + up_warn, up_crit = params['upper'] + for line in info: # , value1, value2 in info: name = line[0] if name != item: continue rpm = int(line[1]) - perfdata = [ ( 'rpm', rpm, warn, crit, 0 ) ] + perfdata = [ ( 'rpm', rpm, low_warn, low_crit, 0 ) ] infotext = "%d RPM" % rpm - if rpm < crit: - return (2, "%s" % infotext, perfdata) - elif rpm < warn: - return (1, "%s" % infotext, perfdata) + levels = "Warn/Crit Lower: %d/%d " % (low_warn, low_crit ) + if up_crit: + levels += "Upper: %d/%d" % ( up_warn, up_crit ) + if rpm < low_crit or (up_crit and rpm > up_crit): + return 2, infotext + levels, perfdata + elif rpm < low_warn or (up_warn and rpm > up_warn): + return 1, infotext + levels, perfdata else: - return (0, "%s" % infotext, perfdata) + return 0, infotext, perfdata return (3, "FAN %s not found in SNMP data" % item) @@ -50,6 +59,7 @@ def check_fsc_fans(item, params, info): check_info["fsc_fans"] = { 'check_function': check_fsc_fans, 'inventory_function': inventory_fsc_fans, + 'group': "hw_fans", 'service_description': 'FSC %s', 'has_perfdata': True, 'snmp_info': ('.1.3.6.1.4.1.231.2.10.2.2.5.2.2.1', [16, 8]), diff --git a/web/htdocs/images/icons/klipper.png b/web/htdocs/images/icons/klipper.png deleted file mode 100644 index ea9c78e..0000000 Binary files a/web/htdocs/images/icons/klipper.png and /dev/null differ

10 years, 5 months

Check_MK Git: check_mk: Minor preparations for baking agents

by Mathias Kettner

Module: check_mk Branch: master Commit: 7e54c542256f5affa982b2f02df96b308a1ee891 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e54c542256f5a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Apr 21 22:45:42 2014 +0200 Minor preparations for baking agents --- modules/automation.py | 3 +++ modules/check_mk.py | 16 ++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/modules/automation.py b/modules/automation.py index 5fca771..b4d26b6 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -725,6 +725,9 @@ def automation_restart(job="restart"): else: do_create_cmc_config(opt_cmc_relfilename) + if bake_agents_on_restart: + do_bake_agents() + except Exception, e: if backup_path: os.rename(backup_path, objects_file) diff --git a/modules/check_mk.py b/modules/check_mk.py index b5bd412..ee3bd47 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -347,6 +347,7 @@ inv_exports = {} # Rulesets for inventory export hooks # Rulesets for agent bakery agent_config = {} +bake_agents_on_restart = True # global variables used to cache temporary values (not needed in check_mk_base) @@ -372,7 +373,7 @@ special_agent_info = {} # Now include the other modules. They contain everything that is needed # at check time (and many of what is also needed at administration time). try: - modules = [ 'check_mk_base', 'snmp', 'notify', 'prediction', 'cmc', 'inline_snmp', ] + modules = [ 'check_mk_base', 'snmp', 'notify', 'prediction', 'cmc', 'inline_snmp', 'agent_bakery' ] for module in modules: filename = modules_dir + "/" + module + ".py" if os.path.exists(filename): @@ -4824,6 +4825,13 @@ def do_create_config(): create_nagios_config(out) sys.stdout.write(tty_ok + "\n") + if bake_agents_on_restart and 'do_bake_agents' in globals(): + sys.stdout.write("Baking agents...") + sys.stdout.flush() + do_bake_agents() + sys.stdout.write(tty_ok + "\n") + + def do_output_nagios_conf(args): if len(args) == 0: args = None @@ -6032,11 +6040,7 @@ if __name__ == "__main__": do_create_rrd(args) done = True elif o in [ '-A', '--bake-agents' ]: - try: - execfile(modules_dir + "/agent_bakery.py") - except: - if opt_debug: - raise + if 'do_bake_agents' not in globals(): sys.stderr.write("Agent baking is not implemented in your version of Check_MK. Sorry.\n") sys.exit(1) if args:

10 years, 5 months

Check_MK Git: check_mk: First step towards new agent bakery

by Mathias Kettner

Module: check_mk Branch: master Commit: 60c843c1f82382f27276d73fa3746a666c2b1ed8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60c843c1f82382… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Apr 17 16:58:28 2014 +0200 First step towards new agent bakery --- modules/check_mk.py | 32 ++++++++++++++++++++++------ web/htdocs/wato.py | 4 ++-- web/plugins/wato/builtin_modules.py | 2 +- web/plugins/wato/check_mk_configuration.py | 2 +- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 0439188..b5bd412 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -345,6 +345,9 @@ check_periods = [] snmp_check_interval = [] inv_exports = {} # Rulesets for inventory export hooks +# Rulesets for agent bakery +agent_config = {} + # global variables used to cache temporary values (not needed in check_mk_base) ip_to_hostname_cache = None @@ -369,7 +372,7 @@ special_agent_info = {} # Now include the other modules. They contain everything that is needed # at check time (and many of what is also needed at administration time). try: - modules = [ 'check_mk_base', 'snmp', 'notify', 'prediction', 'cmc', 'inline_snmp' ] + modules = [ 'check_mk_base', 'snmp', 'notify', 'prediction', 'cmc', 'inline_snmp', ] for module in modules: filename = modules_dir + "/" + module + ".py" if os.path.exists(filename): @@ -4690,6 +4693,7 @@ def usage(): cmk --create-rrd [--keepalive|SPEC] create round robin database cmk -i, --inventory [HOST1 HOST2...] Do a HW/SW-Inventory of some ar all hosts cmk --inventory-as-check HOST Do HW/SW-Inventory, behave like check plugin + cmk -A, --bake-agents [H1 H2 ..] Bake agents for hosts (no in all versions) cmk -V, --version print version cmk -h, --help print this help @@ -4797,16 +4801,16 @@ NOTES: hosts's parents. It creates the file conf.d/parents.mk which defines gateway hosts and parent declarations. - The core can call check_mk without options and the hostname and its IP - address as arguments. Much faster is using precompiled host checks, - though. + -A, --bake-agents creates RPM/DEB/MSI packages with host-specific + monitoring agents. Note: this feature is only contained in the + subscription version of Check_MK. """ % (check_mk_configfile, precompiled_hostchecks_dir, snmpwalks_dir, snmpwalks_dir, - local_mibs_dir and ("\n You can add further mibs to %s" % local_mibs_dir) or "", + local_mibs_dir and ("\n You can add further MIBs to %s" % local_mibs_dir) or "", ) @@ -5819,11 +5823,11 @@ def output_profile(): # Do option parsing and execute main function - # if check_mk is not called as module if __name__ == "__main__": - short_options = 'SHVLCURODMmd:Ic:nhvpXPNBil' + short_options = 'ASHVLCURODMmd:Ic:nhvpXPNBil' long_options = [ "help", "version", "verbose", "compile", "debug", "list-checks", "list-hosts", "list-tag", "no-tcp", "cache", "flush", "package", "localize", "donate", "snmpwalk", "oid=", "extraoid=", - "snmptranslate", + "snmptranslate", "bake-agents", "usewalk", "scan-parents", "procs=", "automation=", "notify", "snmpget=", "profile", "keepalive", "keepalive-fd=", "create-rrd", "no-cache", "update", "restart", "reload", "dump", "fake-dns=", @@ -6027,6 +6031,20 @@ if __name__ == "__main__": execfile(modules_dir + "/rrd.py") do_create_rrd(args) done = True + elif o in [ '-A', '--bake-agents' ]: + try: + execfile(modules_dir + "/agent_bakery.py") + except: + if opt_debug: + raise + sys.stderr.write("Agent baking is not implemented in your version of Check_MK. Sorry.\n") + sys.exit(1) + if args: + hostnames = parse_hostname_list(args, with_clusters = False) + else: + hostnames = None + do_bake_agents(hostnames) + done = True except MKGeneralException, e: diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 4d231c9..81370ad 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16760,16 +16760,16 @@ modes = { loaded_with_language = False def load_plugins(): - global extra_buttons global loaded_with_language if loaded_with_language == current_language: return # Reset global vars - global extra_buttons, configured_host_tags, host_attributes + global extra_buttons, configured_host_tags, host_attributes, modules extra_buttons = [] configured_host_tags = None host_attributes = [] + modules = [] load_notification_table() diff --git a/web/plugins/wato/builtin_modules.py b/web/plugins/wato/builtin_modules.py index f1481f9..c680c20 100644 --- a/web/plugins/wato/builtin_modules.py +++ b/web/plugins/wato/builtin_modules.py @@ -28,7 +28,7 @@ # defined in a plugin because they contain i18n strings. # fields: mode, title, icon, permission, help -modules = [ +modules += [ ( "folder", _("Hosts"), "folder", "hosts", _("Manage monitored hosts and services and the hosts' folder structure.")), diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 6e5818e..63cafb0 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -499,7 +499,7 @@ register_configvar(group, domain = "multisite") #. -# .--User Mgmt-----------------------------------------------------------. +# .--User Management-----------------------------------------------------. # | _ _ __ __ _ | # | | | | |___ ___ _ __ | \/ | __ _ _ __ ___ | |_ | # | | | | / __|/ _ \ '__| | |\/| |/ _` | '_ ` _ \| __| |

10 years, 5 months

Check_MK Git: check_mk: New valuespec ListOfIntegers

by Mathias Kettner

Module: check_mk Branch: master Commit: 2c5470536a9ad3b45a77c85644c663a0627398e0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2c5470536a9ad3… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sun Apr 20 19:26:22 2014 +0200 New valuespec ListOfIntegers --- web/htdocs/valuespec.py | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index ad801f6..b4e90f9 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -241,7 +241,10 @@ class Integer(ValueSpec): style = "text-align: right;" else: style = "" - html.number_input(varprefix, self._display_format % convfunc(value), size = self._size, style = style) + if value == "": # This is needed for ListOfIntegers + html.text_input(varprefix, "", "number", size = self._size, style = style) + else: + html.number_input(varprefix, self._display_format % convfunc(value), size = self._size, style = style) if self._unit: html.write(" ") html.write(self._unit) @@ -693,10 +696,12 @@ class ListOfStrings(ValueSpec): def from_html_vars(self, vp): value = [] nr = 0 - while html.has_var(vp + "_%d" % nr): - s = html.var(vp + "_%d" % nr).strip() - if s: - value.append(s) + while True: + varname = vp + "_%d" % nr + if not html.has_var(varname): + break + if html.var(varname, "").strip(): + value.append(self._valuespec.from_html_vars(varname)) nr += 1 return value @@ -719,6 +724,20 @@ class ListOfStrings(ValueSpec): self._valuespec.validate_value(s, vp + "_%d" % nr) ValueSpec.custom_validate(self, value, vp) +class ListOfIntegers(ListOfStrings): + def __init__(self, **kwargs): + int_args = {} + for key in [ "minvalue", "maxvalue" ]: + if key in kwargs: + int_args[key] = kwargs[key] + int_args["display_format"] = "%s" + int_args["convfunc"] = lambda x: x != "" and saveint(x) or "" + int_args["minvalue"] = 17 + int_args["default_value"] = 34 + valuespec = Integer(**int_args) + kwargs["valuespec"] = valuespec + ListOfStrings.__init__(self, **kwargs) + # Generic list-of-valuespec ValueSpec with Javascript-based # add/delete/move class ListOf(ValueSpec):

10 years, 5 months

Check_MK Git: check_mk: AB: fixed detection of do_bake_agents

by Mathias Kettner

Module: check_mk Branch: master Commit: 84cae0a067424fa8fe6eac358abd451a92019459 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84cae0a067424f… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 22 10:39:17 2014 +0200 AB: fixed detection of do_bake_agents --- modules/automation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/automation.py b/modules/automation.py index b4d26b6..742a1e3 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -725,7 +725,7 @@ def automation_restart(job="restart"): else: do_create_cmc_config(opt_cmc_relfilename) - if bake_agents_on_restart: + if "do_bake_agents" in globals() and bake_agents_on_restart: do_bake_agents() except Exception, e:

10 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits