Checkmk git commits August 2014

checkmk-commits@lists.checkmk.com

5 participants
225 discussions

Check_MK Git: check_mk: Titles for visuals can now be customized using title plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: 000ca4eb96f3f8d98dd407b42990ff6023d8b36f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=000ca4eb96f3f8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 27 16:05:28 2014 +0200 Titles for visuals can now be customized using title plugins --- web/htdocs/dashboard.py | 1 + web/htdocs/views.py | 2 +- web/htdocs/visuals.py | 11 +++++++++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/web/htdocs/dashboard.py b/web/htdocs/dashboard.py index deb2311..6253536 100644 --- a/web/htdocs/dashboard.py +++ b/web/htdocs/dashboard.py @@ -273,6 +273,7 @@ def render_dashboard(name): elif wato_folder is not None: title = wato.get_folder_title(wato_folder) + " - " + title + title = visuals.visual_title('dashboard', board, title) html.header(title, javascripts=["dashboard"], stylesheets=["pages", "dashboard", "status", "views"]) diff --git a/web/htdocs/views.py b/web/htdocs/views.py index 75e3e98..0d4a3a0 100644 --- a/web/htdocs/views.py +++ b/web/htdocs/views.py @@ -1418,7 +1418,7 @@ def view_title(view): if heading: title = heading + " - " + title - return title + return visuals.visual_title('view', view, title) def view_optiondial(view, option, choices, help): vo = view_options(view["name"]) diff --git a/web/htdocs/visuals.py b/web/htdocs/visuals.py index 08817f8..21316fc 100644 --- a/web/htdocs/visuals.py +++ b/web/htdocs/visuals.py @@ -57,8 +57,8 @@ def load_plugins(): if loaded_with_language == current_language: return - global context_types - context_types = {} + global context_types ; context_types = {} + global title_functions ; title_functions = [] load_web_plugins('visuals', globals()) loaded_with_language = current_language @@ -629,6 +629,13 @@ def page_edit_visual(what, all_visuals, custom_field_handler = None, create_hand # | | # '----------------------------------------------------------------------' +def visual_title(what, visual, title): + for func in title_functions: + result = func(what, visual, title) + if result != None: + return result + return title + def get_context_html_vars(visual): context_type = context_types[visual['context_type']] if context_type['single']:

9 years, 10 months

Check_MK Git: check_mk: #1101 FIX WATO check parameter: renamed ' Nominal Voltages' to 'Voltage Levels..'

by Andreas Boesl

Module: check_mk Branch: master Commit: 8f6612c9fe61cd3c5b951c4a46cc6fcce7027ed4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f6612c9fe61cd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 27 14:31:24 2014 +0200 #1101 FIX WATO check parameter: renamed 'Nominal Voltages' to 'Voltage Levels..' --- .werks/1101 | 9 +++++++++ ChangeLog | 1 + web/plugins/wato/check_parameters.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1101 b/.werks/1101 new file mode 100644 index 0000000..7764435 --- /dev/null +++ b/.werks/1101 @@ -0,0 +1,9 @@ +Title: WATO check parameter: renamed 'Nominal Voltages' to 'Voltage Levels..' +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1409142625 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index a19e41e..d7975a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -80,6 +80,7 @@ * 1153 FIX: Changed custom user attributes can now be used immediately... * 0201 FIX: Fixed error message in Rulelist of RBN... * 1100 FIX: WATO backup domains: fixed bug were excluded files still got deleted on snapshot restore... + * 1101 FIX: WATO check parameter: renamed 'Nominal Voltages' to 'Voltage Levels..' Notifications: * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 13135f1..ac0e385 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4425,9 +4425,9 @@ register_check_parameters( register_check_parameters( subgroup_environment, "evolt", - _("Nominal Voltages"), + _("Voltage levels (UPS / PDU / Other Devices)"), Tuple( - help = _("Voltage Levels for devices like UPS oder PDUs. " + help = _("Voltage Levels for devices like UPS or PDUs. " "Several phases may be addressed independently."), elements = [ Integer(title = _("warning if below"), unit = "V", default_value = 210),

9 years, 10 months

Check_MK Git: check_mk: Reworked NagVis group permission feature to use contactgroups and roles

by Lars Michelsen

Module: check_mk Branch: master Commit: f928756fa6a4e08465b70bc83ecdebd29ef0290c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f928756fa6a4e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 27 14:26:36 2014 +0200 Reworked NagVis group permission feature to use contactgroups and roles --- .werks/1155 | 12 ++- ChangeLog | 2 +- web/htdocs/userdb.py | 22 ++++- web/htdocs/wato.py | 127 ++++++++++++++++++++++------ web/plugins/userdb/hook_auth.py | 46 ++++++++-- web/plugins/wato/check_mk_configuration.py | 2 +- web/plugins/wato/nagvis_auth.py | 39 ++++----- 7 files changed, 188 insertions(+), 62 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f928756fa6…

9 years, 10 months

Check_MK Git: check_mk: Fixed error in check_mk.spec (invalid path)

by Andreas Boesl

Module: check_mk Branch: master Commit: 25c55f49e735b23f619dc847fb24c7e0c43df67a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25c55f49e735b2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 27 11:27:44 2014 +0200 Fixed error in check_mk.spec (invalid path) --- check_mk.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/check_mk.spec b/check_mk.spec index 4e8c04a..9bbf81c 100644 --- a/check_mk.spec +++ b/check_mk.spec @@ -149,8 +149,8 @@ mkdir -p $R/var/lib/check_mk_agent/job # logwatch and oracle extension install -m 755 $R/usr/share/check_mk/agents/plugins/mk_logwatch $R/usr/lib/check_mk_agent/plugins install -m 755 $R/usr/share/check_mk/agents/plugins/mk_oracle $R/usr/lib/check_mk_agent/plugins -install -m 644 $R/usr/share/check_mk/agents/logwatch.cfg $R/etc/check_mk -install -m 755 $R/usr/share/check_mk/agents/sqlplus.sh $R/etc/check_mk +install -m 644 $R/usr/share/check_mk/agents/cfg_examples/logwatch.cfg $R/etc/check_mk +install -m 755 $R/usr/share/check_mk/agents/cfg_examples/sqlplus.sh $R/etc/check_mk %clean rm -rf $RPM_BUILD_ROOT

9 years, 10 months

Check_MK Git: check_mk: #1157 FIX Fixed SMS plugin on at least debian ( distrs which have no sendsms/smssend)

by Lars Michelsen

Module: check_mk Branch: master Commit: c96c11100572615f60c9fb437edd5cc3d4a00d29 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c96c1110057261… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Aug 27 11:05:25 2014 +0200 #1157 FIX Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend) Some distros do not provide the sendsms/smssend script with the smstools package. In this cases the script for sending SMS did not work. This commit adds a dedection when smssend/sendsms are not available whether the spool directory at /var/spool/sms/outgoing is available or not. When it is available, the SMS notification plugin drops a file to this directory which should then be processed by smsd. --- .werks/1157 | 13 +++++++++++++ ChangeLog | 4 ++-- notifications/sms | 29 ++++++++++++++++++++++------- 3 files changed, 37 insertions(+), 9 deletions(-) diff --git a/.werks/1157 b/.werks/1157 new file mode 100644 index 0000000..9f0e556 --- /dev/null +++ b/.werks/1157 @@ -0,0 +1,13 @@ +Title: Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend) +Level: 1 +Component: notifications +Compatible: compat +Version: 1.2.5i6 +Date: 1409130157 +Class: fix + +Some distros do not provide the sendsms/smssend script with the smstools package. +In this cases the script for sending SMS did not work. This commit adds a dedection +when smssend/sendsms are not available whether the spool directory at +/var/spool/sms/outgoing is available or not. When it is available, the SMS notification +plugin drops a file to this directory which should then be processed by smsd. diff --git a/ChangeLog b/ChangeLog index 35e04df..ed8e512 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,9 +59,9 @@ * 1145 FIX: windows_tasks: handle case correctly where task is currently running... * 1378 FIX: mk_logwatch: remove exceeding \n when rewriting message and using \0... * 1147 FIX: upc_capacity, ups_socomec_capacity: Fix checking of battery left levels... + * 1099 FIX: tsm_scratch: now returns the variable name instead the values during inventory... * 0650 FIX: f5_bigip_pool: limits to the number of active nodes are now correctly applied... NOTE: Please refer to the migration notes! - * 1099 FIX: tsm_scratch: now returns the variable name instead the values during inventory... Multisite: * 1066 Implemented Dashboard Designer... @@ -70,7 +70,6 @@ * 1154 FIX: Availability: Fixed unwanted redirect to edit annotation page after editing availability options... WATO: - * 1095 New WATO Web-API: Now able to manage hosts via web automation calls * 1096 New WATO webservices: manage hosts via webinterface... * 1155 NagVis map edit/view permissions can now be set using roles... * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... @@ -83,6 +82,7 @@ Notifications: * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... + * 1157 FIX: Fixed SMS plugin on at least debian (distrs which have no sendsms/smssend)... Event Console: * 1007 FIX: check_mkevents: fix case where events contain binary zeroes diff --git a/notifications/sms b/notifications/sms index ba310f2..6156fa1 100755 --- a/notifications/sms +++ b/notifications/sms @@ -37,8 +37,13 @@ for binary in [ 'sendsms', 'smssend' ]: if os.system('which %s >/dev/null' % binary) == 0: send_path = binary -if not send_path: - sys.stderr.write('Error: SMS Tools binaries (sendsms or smssend) not found\n') +smsd_user = 'smsd' +spool_dir = '/var/spool/sms/outgoing' +if not os.path.exists(spool_dir): + spool_dir = None + +if not send_path and not spool_dir: + sys.stderr.write('Error: SMS Tools binaries (sendsms or smssend) not found and spool dir does not exists.\n') sys.exit(2) # Fatal error, no retry max_len = 160 @@ -54,8 +59,18 @@ if os.environ['NOTIFY_WHAT'] == 'SERVICE': else: message += "is " + os.environ['NOTIFY_HOSTSTATE'] -empf = os.environ['NOTIFY_CONTACTPAGER'].replace( " ", "") -if 0 == os.system("%s %s '%s'" % (send_path, empf, message[:160])): - sys.exit(0) -else: - sys.exit(1) +recipient = os.environ['NOTIFY_CONTACTPAGER'].replace( " ", "") + +if send_path: + if os.system("%s %s '%s'" % (send_path, recipient, message[:160])) >> 8 != 0: + sys.exit(1) +elif spool_dir: + # On some distros, like debian, smstools does not ship with the sendsms/smssend helper + # script. On this distro, simply drop the SMS in the outgoing spool directory. + import tempfile, shutil + fd, path = tempfile.mkstemp(prefix = 'cmk_sms_') + os.write(fd, 'To: %s\n\n%s' % (recipient, message)) + os.close(fd) + os.chmod(path, 0660) + filename = path.split('/')[-1] + shutil.move(path, spool_dir + '/' + filename)

9 years, 10 months

Check_MK Git: check_mk: apache_status: Optical cleanup of PNP template

by Mathias Kettner

Module: check_mk Branch: master Commit: 4a0c8655245ff1c3d41d9fda9aa60c3d2a9d8630 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4a0c8655245ff1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Aug 27 10:59:49 2014 +0200 apache_status: Optical cleanup of PNP template --- pnp-templates/check_mk-apache_status.php | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/pnp-templates/check_mk-apache_status.php b/pnp-templates/check_mk-apache_status.php index 0513b50..f64e405 100644 --- a/pnp-templates/check_mk-apache_status.php +++ b/pnp-templates/check_mk-apache_status.php @@ -24,8 +24,6 @@ # Boston, MA 02110-1301 USA. # Modded: Thomas Zyska (tzyska(a)testo.de) -$i=0; - $RRD = array(); foreach ($NAME as $i => $n) { $RRD[$n] = "$RRDFILE[$i]:$DS[$i]:MAX"; @@ -35,25 +33,21 @@ foreach ($NAME as $i => $n) { $MAX[$n] = $MAX[$i]; $ACT[$n] = $ACT[$i]; } + +$total_slots = intval($ACT['TotalSlots']); + # # First graph with all data # +$i=1; $ds_name[$i] = "Apache Status"; $def[$i] = ""; $opt[$i] = " --vertical-label 'Connections' --title '$hostname: $servicedesc' -l 0"; $def[$i] .= "DEF:varTotal=${RRD['TotalSlots']} "; $def[$i] .= "DEF:varOpen=${RRD['OpenSlots']} "; -$def[$i] .= "HRULE:${ACT['TotalSlots']}#000000:\"Total Slots ${ACT['TotalSlots']}\" "; -$def[$i] .= "COMMENT:\"\\n\" "; - -# get UsedSlots -$def[$i] .= "CDEF:usedslots=varTotal,varOpen,- "; -$def[$i] .= "GPRINT:usedslots:LAST:\"UsedSlots \t\t Last %5.1lf\" "; -$def[$i] .= "GPRINT:usedslots:MAX:\"Max %5.1lf\" "; -$def[$i] .= "GPRINT:usedslots:AVERAGE:\"Average %5.1lf\" "; -$def[$i] .= "GPRINT:usedslots:LAST:\"Used %5.0lf of ${ACT['TotalSlots']}\" "; -$def[$i] .= "COMMENT:\"\\n\" "; +$def[$i] .= "HRULE:${ACT['TotalSlots']}#000000:\"Total Slots\\: ${total_slots}\\n\" "; +$def[$i] .= "COMMENT:\" \\n\" "; foreach ($this->DS as $KEY=>$VAL) { if(preg_match('/^State_/', $VAL['NAME'])) { @@ -66,6 +60,15 @@ foreach ($this->DS as $KEY=>$VAL) { } } +# get UsedSlots +$def[$i] .= "CDEF:usedslots=varTotal,varOpen,- "; +$def[$i] .= "LINE:usedslots#ffffff:\"UsedSlots \t \" "; +$def[$i] .= "GPRINT:usedslots:LAST:\"Last %5.1lf\" "; +$def[$i] .= "GPRINT:usedslots:MAX:\"Max %5.1lf\" "; +$def[$i] .= "GPRINT:usedslots:AVERAGE:\"Average %5.1lf\\n\" "; +# $def[$i] .= "GPRINT:usedslots:LAST:\"Used %5.0lf of ${total_slots}\" "; +$def[$i] .= "COMMENT:\"\\n\" "; + # # Requests per Second #

9 years, 10 months

Check_MK Git: check_mk: WATO rule 'IBM SVC: Levels for total disk latency': fixed incorrect display text and unit

by Andreas Boesl

Module: check_mk Branch: master Commit: 11472baff7a270a7635032e20a93a39722564c69 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11472baff7a270… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 27 10:56:08 2014 +0200 WATO rule 'IBM SVC: Levels for total disk latency': fixed incorrect display text and unit --- web/plugins/wato/check_parameters.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 7f92ba5..13135f1 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -3820,14 +3820,14 @@ register_check_parameters( elements = [ ( "read", Levels( - title = _("Read throughput"), - unit = _("MB/s"), + title = _("Read latency"), + unit = _("ms"), default_value = None, default_levels = (50.0, 100.0))), ( "write", Levels( - title = _("Write throughput"), - unit = _("MB/s"), + title = _("Write latency"), + unit = _("ms"), default_value = None, default_levels = (50.0, 100.0))), ]

9 years, 10 months

Check_MK Git: check_mk: WATO backup: add nagvis authorisation.ini. php to exclude files

by Andreas Boesl

Module: check_mk Branch: master Commit: b628834c47403d9bfcc830aa3e9ae45ae238cb6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b628834c47403d… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 26 18:39:10 2014 +0200 WATO backup: add nagvis authorisation.ini.php to exclude files --- web/plugins/wato/backup_domains.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/wato/backup_domains.py b/web/plugins/wato/backup_domains.py index a2b633a..35bb452 100644 --- a/web/plugins/wato/backup_domains.py +++ b/web/plugins/wato/backup_domains.py @@ -220,6 +220,7 @@ else: "prefix" : defaults.omd_root, "exclude" : [ "etc/nagvis/apache.conf", + "etc/nagvis/conf.d/authorisation.ini.php", "etc/nagvis/conf.d/omd.ini.php", "etc/nagvis/conf.d/cookie_auth.ini.php", "etc/nagvis/conf.d/urls.ini.php"

9 years, 10 months

Check_MK Git: check_mk: #1100 FIX WATO backup domains: fixed bug were excluded files still got deleted on snapshot restore

by Andreas Boesl

Module: check_mk Branch: master Commit: 0bfd56189d7a9cd1cfbd76fea15f4a3e65fcd09b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bfd56189d7a9c… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 26 16:29:50 2014 +0200 #1100 FIX WATO backup domains: fixed bug were excluded files still got deleted on snapshot restore It is possible to configure a backup domain so that certain files are not packed into the snapshot.<br> As a result, upon restore these file should not get deleted..<br> This mechanism did not work correctly. --- .werks/1100 | 11 +++++++++++ ChangeLog | 3 ++- web/htdocs/multitar.py | 4 ++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/1100 b/.werks/1100 new file mode 100644 index 0000000..4a5a3c9 --- /dev/null +++ b/.werks/1100 @@ -0,0 +1,11 @@ +Title: WATO backup domains: fixed bug were excluded files still got deleted on snapshot restore +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.5i6 +Date: 1409062516 +Class: fix + +It is possible to configure a backup domain so that certain files are not packed into the snapshot.<br> +As a result, upon restore these file should not get deleted..<br> +This mechanism did not work correctly. diff --git a/ChangeLog b/ChangeLog index 35e04df..861fd75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,9 +59,9 @@ * 1145 FIX: windows_tasks: handle case correctly where task is currently running... * 1378 FIX: mk_logwatch: remove exceeding \n when rewriting message and using \0... * 1147 FIX: upc_capacity, ups_socomec_capacity: Fix checking of battery left levels... + * 1099 FIX: tsm_scratch: now returns the variable name instead the values during inventory... * 0650 FIX: f5_bigip_pool: limits to the number of active nodes are now correctly applied... NOTE: Please refer to the migration notes! - * 1099 FIX: tsm_scratch: now returns the variable name instead the values during inventory... Multisite: * 1066 Implemented Dashboard Designer... @@ -80,6 +80,7 @@ * 0191 FIX: Added swp files to the ignore list for the WATO git feature... * 1153 FIX: Changed custom user attributes can now be used immediately... * 0201 FIX: Fixed error message in Rulelist of RBN... + * 1100 FIX: WATO backup domains: fixed bug were excluded files still got deleted on snapshot restore... Notifications: * 1156 FIX: Graphs in HTML mails are now sent again where they where missing... diff --git a/web/htdocs/multitar.py b/web/htdocs/multitar.py index 4189097..d42d143 100644 --- a/web/htdocs/multitar.py +++ b/web/htdocs/multitar.py @@ -185,9 +185,9 @@ def extract_domains(tar, domains): for pattern in domain.get("exclude", []): if "*" in pattern: import glob - exclude_files.extend(glob.glob("%s/%s/%s" % (domain["prefix"], path, pattern))) + exclude_files.extend(glob.glob("%s/%s" % (domain["prefix"], pattern))) else: - exclude_files.append("%s/%s/%s" % (domain["prefix"], path, pattern)) + exclude_files.append("%s/%s" % (domain["prefix"], pattern)) cleanup_dir(full_path, exclude_files) else: os.remove(full_path)

9 years, 10 months

Check_MK Git: check_mk: WATO: fixed some reference problems on saving hosts , again..

by Andreas Boesl

Module: check_mk Branch: master Commit: edb335d52da9c4782f0ef27dac5577e020796278 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=edb335d52da9c4… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 26 15:29:40 2014 +0200 WATO: fixed some reference problems on saving hosts, again.. At least some positive side effect: Improved web API speed by 30% --- web/htdocs/wato.py | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 405139d..a2ca5f2 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16851,9 +16851,7 @@ def update_host_attributes(host, attr = {}, unset_attr = []): def set_host_attributes(host, attributes): hostname = host[".name"] - folder_path = host[".folder"][".path"] - - the_folder = g_folders[folder_path] + the_folder = host[".folder"] load_hosts(the_folder) # The site attribute might change. In that case also @@ -16861,24 +16859,13 @@ def set_host_attributes(host, attributes): mark_affected_sites_dirty(the_folder, hostname) the_folder[".hosts"][hostname] = attributes - save_hosts(the_folder) - - the_folder = reload_folder(the_folder) - reload_hosts(the_folder) - if g_folder: - set_current_folder(g_folders[g_folder[".path"]]) - - log_pending(AFFECTED, hostname, "edit-host", _("edited properties of host [%s]") % hostname) mark_affected_sites_dirty(the_folder, hostname) + log_pending(AFFECTED, hostname, "edit-host", _("edited properties of host [%s]") % hostname) - call_hook_hosts_changed(the_folder) - - # TODO: find a better solution - # Some hooks kill our reloaded folder... do it again... - the_folder = g_folders[folder_path] - the_folder = reload_folder(the_folder) + save_folder_and_hosts(the_folder) reload_hosts(the_folder) + call_hook_hosts_changed(the_folder) # Deletes host from given folder def delete_host(host): @@ -17026,7 +17013,8 @@ class API: add_host_to_folder(folder, hostname, attributes) # Update the all_hosts reference. Saves quite some time on followup calls - all_hosts[hostname] = folder[".hosts"][hostname] + reload_hosts(g_folders[host_foldername]) + all_hosts[hostname] = g_folders[host_foldername][".hosts"][hostname] def edit_host(self, hostname, attr = {}, unset_attr = []): self.__prepare_folder_info() @@ -17042,8 +17030,9 @@ class API: update_host_attributes(host, attr = attributes, unset_attr = unset_attr) # Update all_hosts reference. Saves quite some time on followup calls - folder_path = all_hosts[hostname][".folder"][".path"] - all_hosts[hostname] = g_folders[folder_path][".hosts"][hostname] + host_foldername = all_hosts[hostname][".folder"][".path"] + reload_hosts(g_folders[host_foldername]) + all_hosts[hostname] = g_folders[host_foldername][".hosts"][hostname] def get_host(self, hostname, effective_attr = False): self.__prepare_folder_info()

9 years, 10 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits August 2014