Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Marcel Arentz

Module: check_mk Branch: master Commit: 5efb90646dbe569749d21969c5f903c07fe131ee URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5efb90646dbe56… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Feb 8 17:18:33 2017 +0100 fixed typo in werk description Change-Id: I7bea58a9e6caa97c39bf093030ab65cbc127caad --- .werks/2488 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/2488 b/.werks/2488 index c9fe55e..c469611 100644 --- a/.werks/2488 +++ b/.werks/2488 @@ -1,4 +1,4 @@ -Title: veem_jobs: fix problems with spaces or single quotes in the names of jobs +Title: veeam_jobs: fix problems with spaces or single quotes in the names of jobs Level: 1 Component: checks Class: fix diff --git a/ChangeLog b/ChangeLog index 67f8d8d..1cf52eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1783,7 +1783,7 @@ * 2476 FIX: check_bi_aggr: Fixed exception when authentication is enabled * 2477 FIX: SNMP: Fixed exception when processing specific SNMP data with missing columns... * 1274 FIX: heartbeat_crm: Handle case of error messages from CRM - * 2488 FIX: veem_jobs: fix problems with spaces or single quotes in the names of jobs... + * 2488 FIX: veeam_jobs: fix problems with spaces or single quotes in the names of jobs... * 2494 FIX: Clasic SNMP mode now uses normal snmpwalk when bulkwalks are disabled with SNMPv3 * 2495 FIX: printer_supply: Fixed exception when unit type is not available via SNMP * 2496 FIX: Fixed CPU load checks when monitoring raspbian/babanian systems

7 years, 7 months

4025 FIX BI Aggregations: Error messages for invalid configured BI rules are no longer suppressed

by Andreas Boesl

Module: check_mk Branch: master Commit: a595fe0f4c4583fdbf16ccbfc64348a13d42f492 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a595fe0f4c4583… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 8 15:57:58 2017 +0100 4025 FIX BI Aggregations: Error messages for invalid configured BI rules are no longer suppressed Change-Id: I95e5b27b610f3b8099e8f4650d02dac172a9ec02 --- .werks/4025 | 9 +++++++++ ChangeLog | 4 ++-- web/htdocs/bi.py | 60 ++++++++++++++++++++++++++++++++++---------------------- 3 files changed, 48 insertions(+), 25 deletions(-) diff --git a/.werks/4025 b/.werks/4025 new file mode 100644 index 0000000..b7963fb --- /dev/null +++ b/.werks/4025 @@ -0,0 +1,9 @@ +Title: BI Aggregations: Error messages for invalid configured BI rules are no longer suppressed +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1486565762 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 21524c8..caaf1fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,7 @@ * 4343 FIX: apt: Fixed wrong state information of pending updates of normal and security updates... * 4344 FIX: lnx_quota: Fixed wrong value calculation and removed performance data... NOTE: Please refer to the migration notes! + * 4189 FIX: mem.used: Fixed graphing... * 4335 FIX: perle check and inventory plugins: some updates and improvements... NOTE: Please refer to the migration notes! * 4123 FIX: active check check_sql: changed handling of query results and fixed hostname parameter... @@ -103,8 +104,6 @@ * 4342 FIX: hp_proliant: fixed empty status handling * 4216 FIX: cmciii.phase: Fix wrong scaling of power and energy values * 4345 FIX: hp_proliant_temp: Ignore device levels of 0 - * 4338 FIX: aix_hacmp_resources: fixed state handling - * 4189 FIX: mem.used: Fixed graphing... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... @@ -128,6 +127,7 @@ * 4321 FIX: LDAP: Improved validation of groups to attributes sync plugin * 4048 FIX: Fixed bug in tables: the notification message for reached row limits is visible again * 4049 FIX: Fixed cut-off of bulk options when row-limit is reached. + * 4025 FIX: BI Aggregations: Error messages for invalid configured BI rules are no longer suppressed WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index df6fa64..370cebe 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -265,16 +265,20 @@ class JobWorker(object): @staticmethod - def run(job, mp_queue): + def run(job, mp_queue, mp_errors): new_data = {} start_time = time.time() try: new_data = JobWorker.compile_job(job["id"], job["info"]) - if job["id"][0] == AGGR_HOST: - new_data["compiled_hosts"] = job["info"]["queued_hosts"] except Exception, e: log("MP-Worker Exception %s" % e) log_exception() + mp_errors.put("Aggregation error: %s" % e) + finally: + # Even in an error scenario we consider these hosts as compiled + if job["id"][0] == AGGR_HOST: + new_data["compiled_hosts"] = job["info"]["queued_hosts"] + mp_queue.put((job, new_data)) log("Compilation finished - took %.3f sec" % (time.time() - start_time)) @@ -935,7 +939,8 @@ class BIJobManager(object): self.maximum_workers = 2 # Multiprocessing queue for IPC - self._mp_queue = multiprocessing.Queue() + self._mp_queue = multiprocessing.Queue() + self._mp_errors = multiprocessing.Queue() # Contains running worker jobs self._currently_compiling = [] @@ -952,7 +957,7 @@ class BIJobManager(object): while True: if self._queued_jobs and len(self._currently_compiling) < self.maximum_workers: job = self._queued_jobs.pop() - new_worker = multiprocessing.Process(target = JobWorker.run, args = [job, self._mp_queue]) + new_worker = multiprocessing.Process(target = JobWorker.run, args = [job, self._mp_queue, self._mp_errors]) new_worker.daemon = True self._currently_compiling.append(new_worker) self._currently_compiling[-1].start() @@ -962,10 +967,16 @@ class BIJobManager(object): def _reap_worker_results(self): results = [] + errors = [] while not self._mp_queue.empty(): result = self._mp_queue.get() results.append(result) - return results + + while not self._mp_errors.empty(): + error = self._mp_errors.get() + errors.append(error) + + return results, errors def _merge_worker_results(self, results): @@ -1012,6 +1023,7 @@ class BIJobManager(object): self._prepare_compilation(discard_old_cache = discard_old_cache) self._set_compilation_info(current_sitestats) + error_info = "" while True: if self._is_compilation_finished(): break @@ -1020,7 +1032,8 @@ class BIJobManager(object): self._manage_workers() # Collect results - results = self._reap_worker_results() + results, errors = self._reap_worker_results() + error_info += "<br>".join(errors) # Update cache with new results self._merge_worker_results(results) @@ -1031,15 +1044,16 @@ class BIJobManager(object): # At the end of the compilation check the title uniquness and for fully compiled fully_compiled = self._is_fully_compiled() - titles_broken_info = "" + try: check_title_uniqueness(g_bi_cache_manager.get_compiled_trees()["forest"]) except MKConfigError, e: - titles_broken_info = str(e) + error_info += str(e) + - if fully_compiled or titles_broken_info: + if fully_compiled or error_info: g_bi_cache_manager.generate_cachefiles(is_fully_compiled = fully_compiled, - titles_broken_info = titles_broken_info) + error_info = error_info) return True # Did compilation @@ -1137,9 +1151,9 @@ class BICacheManager(object): self._bicache_file.clear_cache() - def get_titles_broken_info(self): + def get_error_info(self): cacheinfo_content = self.get_bicacheinfo() - return (cacheinfo_content and cacheinfo_content.get("titles_broken_info", None)) or None + return (cacheinfo_content and cacheinfo_content.get("error_info", None)) or None def truncate_cachefiles(self): @@ -1226,12 +1240,12 @@ class BICacheManager(object): return True - def generate_cachefiles(self, is_fully_compiled=False, titles_broken_info=""): - self._save_cacheinfofile(titles_broken_info = titles_broken_info) + def generate_cachefiles(self, is_fully_compiled=False, error_info=""): + self._save_cacheinfofile(error_info = error_info) self._save_cachefile(is_fully_compiled = is_fully_compiled) - def _save_cacheinfofile(self, titles_broken_info=""): + def _save_cacheinfofile(self, error_info=""): old_compilation_info = self.get_bicacheinfo() if not old_compilation_info: old_compiled_sites = None @@ -1259,7 +1273,7 @@ class BICacheManager(object): content = { "timestamps": compiled_timestamps, "compiled_sites": compiled_sites, - "titles_broken_info": titles_broken_info + "error_info": error_info } self._bicacheinfo_file.save(content) @@ -1302,13 +1316,13 @@ class BICacheManager(object): "affected_services_ref", "forest", "forest_ref" ]: - for key, values in new_data.get(what).items(): + for key, values in new_data.get(what, {}).items(): self._compiled_trees[what].setdefault(key, []) self._compiled_trees[what][key].extend(values) # Rendering related parameters for what in [ "aggr_ref" ]: - self._compiled_trees[what].update(new_data.get(what)) + self._compiled_trees[what].update(new_data.get(what, {})) # Cache related parameters job_id = job["id"] @@ -1382,8 +1396,8 @@ def setup_bi_instances(): cache_is_valid = g_bi_cache_manager.load_cachefile(force_validation = True) - if cache_is_valid and g_bi_cache_manager.get_titles_broken_info(): - raise MKConfigError(g_bi_cache_manager.get_titles_broken_info()) + if cache_is_valid and g_bi_cache_manager.get_error_info(): + raise MKConfigError(g_bi_cache_manager.get_error_info()) def compile_forest_improved(only_hosts=None, only_groups=None): log("###########################################################") @@ -1437,8 +1451,8 @@ def compile_forest_improved(only_hosts=None, only_groups=None): log("Exception in BI compilation main loop:") log_exception() finally: - if g_bi_cache_manager.get_titles_broken_info(): - raise MKConfigError(g_bi_cache_manager.get_titles_broken_info()) + if g_bi_cache_manager.get_error_info(): + raise MKConfigError(g_bi_cache_manager.get_error_info()) global g_tree_cache g_tree_cache = g_bi_cache_manager.get_compiled_trees()

7 years, 7 months

updated werk text

by Andreas Boesl

Module: check_mk Branch: master Commit: 127e2e564da285ec244df5a32c5b060c2ba8e025 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=127e2e564da285… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 8 16:02:54 2017 +0100 updated werk text Change-Id: Ib4bca56e6b2c1f2f95de4dc26bb1dacda87a68ab --- .werks/4025 | 5 +++-- ChangeLog | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.werks/4025 b/.werks/4025 index b7963fb..223f5fd 100644 --- a/.werks/4025 +++ b/.werks/4025 @@ -1,4 +1,4 @@ -Title: BI Aggregations: Error messages for invalid configured BI rules are no longer suppressed +Title: BI Aggregations: No longer suppressing error messages for invalid configured BI rules Level: 1 Component: multisite Compatible: compat @@ -6,4 +6,5 @@ Version: 1.4.0i4 Date: 1486565762 Class: fix - +BI views no always show a red error box whenever the aggregation titles are not unique +or the configuration of the bi rules itself is not set up correctly. diff --git a/ChangeLog b/ChangeLog index caaf1fc..67f8d8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,7 +127,7 @@ * 4321 FIX: LDAP: Improved validation of groups to attributes sync plugin * 4048 FIX: Fixed bug in tables: the notification message for reached row limits is visible again * 4049 FIX: Fixed cut-off of bulk options when row-limit is reached. - * 4025 FIX: BI Aggregations: Error messages for invalid configured BI rules are no longer suppressed + * 4025 FIX: BI Aggregations: No longer suppressing error messages for invalid configured BI rules... WATO: * 4142 New extended search dialog for rulesets and rules...

7 years, 7 months

refactoring df check

by Marcel Arentz

Module: check_mk Branch: master Commit: e240464fe3cefcbff6a044442fd528647bc55edf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e240464fe3cefc… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Feb 8 14:35:08 2017 +0100 refactoring df check Change-Id: I63428ca5a7549e5e3d29effcdd0a97f0f0929464 --- checks/df | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/checks/df b/checks/df index d01e3f4..8c6259a 100644 --- a/checks/df +++ b/checks/df @@ -86,7 +86,7 @@ # [df_inodes_end] -def df_parse_info(info): +def parse_df(info): df_blocks = [] df_inodes = [] btrfs_devices = set() # We might generalize that later @@ -132,8 +132,8 @@ def df_parse_info(info): return df_blocks, df_inodes -def inventory_df(info): - df_blocks, df_inodes = df_parse_info(info) +def inventory_df(parsed): + df_blocks, df_inodes = parsed mplist = [] for line in df_blocks: if line[1] in inventory_df_exclude_fs: @@ -151,10 +151,10 @@ def inventory_df(info): return df_inventory(mplist) -def check_df(item, params, info): +def check_df(item, params, parsed): fslist_blocks = [] fslist_inodes = [] - df_blocks, df_inodes = df_parse_info(info) + df_blocks, df_inodes = parsed for idx, line in enumerate(df_blocks): # df outputs seven columns: # DEVICE FS-TYPE SIZE(KB) USED(KB) AVAIL(KB) USED(%) MOUNTPOINT @@ -176,8 +176,9 @@ def check_df(item, params, info): return df_check_filesystem_list(item, params, fslist_blocks, fslist_inodes) check_info['df'] = { - "check_function" : check_df, + "parse_function" : parse_df, "inventory_function" : inventory_df, + "check_function" : check_df, "service_description" : "Filesystem %s", "has_perfdata" : True, "group" : "filesystem",

7 years, 7 months

4189 FIX mem.used: Fixed graphing

by Marcel Arentz

Module: check_mk Branch: master Commit: 86b6a0525fb15341af7e031d479c1a664ca40e57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=86b6a0525fb153… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Feb 1 19:18:41 2017 +0100 4189 FIX mem.used: Fixed graphing The graphing ist now correct rendering the information given by the check mem.used. Previously the graphing was trying to sell the "total used memory" information as installed RAM. In consequense also the rendering of Perf-O-Meter was broken and thresholds "total used memory" never have been displayed. Change-Id: I758bf07c09d593a3af937f74fc7b7a0507710823 --- .werks/4189 | 9 +++++++++ ChangeLog | 2 ++ web/plugins/metrics/check_mk.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4189 b/.werks/4189 new file mode 100644 index 0000000..2a09637 --- /dev/null +++ b/.werks/4189 @@ -0,0 +1,9 @@ +Title: mem.used: Fixed graphing +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1485972835 +Class: fix + +The graphing ist now correct rendering the information given by the check mem.used. Previously the graphing was trying to sell the "total used memory" information as installed RAM. In consequense also the rendering of Perf-O-Meter was broken and thresholds "total used memory" never have been displayed. diff --git a/ChangeLog b/ChangeLog index 716b64c..21524c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -103,6 +103,8 @@ * 4342 FIX: hp_proliant: fixed empty status handling * 4216 FIX: cmciii.phase: Fix wrong scaling of power and energy values * 4345 FIX: hp_proliant_temp: Ignore device levels of 0 + * 4338 FIX: aix_hacmp_resources: fixed state handling + * 4189 FIX: mem.used: Fixed graphing... Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 0c11283..8775e85 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -3940,7 +3940,7 @@ check_metrics["check_mk-hr_mem"] = ram_used_swap_translation check_metrics["check_mk-mem.used"] = { "ramused" : { "name" : "mem_used", "scale" : MB }, "swapused" : { "name" : "swap_used", "scale" : MB }, - "memused" : { "name" : "mem_total", "scale" : MB }, + "memused" : { "name" : "mem_lnx_total_used", "scale" : MB }, "shared" : { "name" : "mem_lnx_shmem", "scale" : MB }, "pagetable" : { "name" : "mem_lnx_page_tables", "scale" : MB }, "mapped" : { "name" : "mem_lnx_mapped", "scale" : MB },

7 years, 7 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: bcb1e11bd0c4f905104f0d2acefcede1e544de7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bcb1e11bd0c4f9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Feb 8 15:17:19 2017 +0100 Reserved 10 Werk IDS Change-Id: I11f2297bd0a3c217846a16c1c4b9a2d07d5a9829 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 8679f11..d9f8374 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4355 +4365

7 years, 7 months

4345 FIX hp_proliant_temp: Ignore device levels of 0

by Konstantin Büttner

Module: check_mk Branch: master Commit: f4303efbf6cf7582d50e175b7f0d56140f4133f2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f4303efbf6cf75… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 8 15:15:16 2017 +0100 4345 FIX hp_proliant_temp: Ignore device levels of 0 Change-Id: Iaa7ea0dfac79815dd3a447330c7ac45794c79497 --- .werks/4345 | 9 +++++++++ ChangeLog | 1 + checks/hp_proliant_temp | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4345 b/.werks/4345 new file mode 100644 index 0000000..1f98f8f --- /dev/null +++ b/.werks/4345 @@ -0,0 +1,9 @@ +Title: hp_proliant_temp: Ignore device levels of 0 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i4 +Date: 1486563269 + diff --git a/ChangeLog b/ChangeLog index b3f4b79..716b64c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -102,6 +102,7 @@ * 4024 FIX: netapp_api_volumes: fixed incorrect computation of read/write latency * 4342 FIX: hp_proliant: fixed empty status handling * 4216 FIX: cmciii.phase: Fix wrong scaling of power and energy values + * 4345 FIX: hp_proliant_temp: Ignore device levels of 0 Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/hp_proliant_temp b/checks/hp_proliant_temp index 8a70f84..557094e 100644 --- a/checks/hp_proliant_temp +++ b/checks/hp_proliant_temp @@ -40,7 +40,7 @@ def check_hp_proliant_temp(item, params, info): # This case means no threshold available and # the devices' web interface displays "N/A" - if threshold == "-99": + if threshold == "-99" or threshold == "0": devlevels = (None, None) else: threshold = float(threshold)

7 years, 7 months

Improved fragile (and recently broke) list of arrow rendering (

by Lars Michelsen

fixes sorting of nodes in BI rule edit dialog) Message-ID: <589b2f07.V00tONXwar6Jczt5%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 5049e79150bb67c9f5266d747fc1d9344863867d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5049e79150bb67… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 8 15:21:00 2017 +0100 Improved fragile (and recently broke) list of arrow rendering (fixes sorting of nodes in BI rule edit dialog) Change-Id: I97996209fea12c4e32212842292eaf8ffe3cf9fc --- web/htdocs/htmllib.py | 8 ++++---- web/htdocs/js/checkmk.js | 17 +++++++++++------ web/htdocs/valuespec.py | 3 ++- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index a059dc4..9ffdc8a 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1896,18 +1896,18 @@ class html(DeprecationWrapper, RequestHandler): self.hidden_field(var, self.get_unicode_input(var)) - def hidden_field(self, var, value, id=None, add_var=False): - self.write_html(self.render_hidden_field(var=var, value=value, id=id, add_var=add_var)) + def hidden_field(self, var, value, id=None, add_var=False, class_=None): + self.write_html(self.render_hidden_field(var=var, value=value, id=id, add_var=add_var, class_=class_)) - def render_hidden_field(self, var, value, id=None, add_var=False): + def render_hidden_field(self, var, value, id=None, add_var=False, class_=None): # TODO: Refactor id_ = id if value == None: return "" if add_var: self.add_form_var(var) - return self.render_input(name=var, type_="hidden", id_=id_, value = value) + return self.render_input(name=var, type_="hidden", id_=id_, value=value, class_=class_) def button(self, varname, title, cssclass = None, style=None, help=None): diff --git a/web/htdocs/js/checkmk.js b/web/htdocs/js/checkmk.js index 1297202..b037639 100644 --- a/web/htdocs/js/checkmk.js +++ b/web/htdocs/js/checkmk.js @@ -2080,14 +2080,19 @@ function valuespec_listof_fixarrows(oTbody) { for(var i = 0, row; row = oTbody.rows[i]; i++) { if(row.cells.length == 0) continue; + var oTd = row.cells[0]; /* TD with buttons */ - if(row.cells[0].childNodes.length == 0) + if(oTd.childNodes.length == 0) continue; - var oIndex = oTd.childNodes[0]; + + var oIndex = oTd.getElementsByClassName("index")[0]; oIndex.value = "" + (parseInt(i) + 1); + if (oTd.childNodes.length > 4) { /* movable */ - var oUpTrans = oTd.childNodes[2]; - var oUp = oTd.childNodes[3]; + var buttons = oTd.getElementsByClassName("iconbutton"); + + var oUpTrans = buttons[1]; + var oUp = buttons[2]; if (i == 0) { oUpTrans.style.display = ""; oUp.style.display = "none"; @@ -2096,8 +2101,8 @@ function valuespec_listof_fixarrows(oTbody) { oUpTrans.style.display = "none"; oUp.style.display = ""; } - var oDownTrans = oTd.childNodes[4]; - var oDown = oTd.childNodes[5]; + var oDownTrans = buttons[3]; + var oDown = buttons[4]; if (i >= oTbody.rows.length - 1) { oDownTrans.style.display = ""; oDown.style.display = "none"; diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 4fb5517..b22f70f 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -1280,7 +1280,8 @@ class ListOf(ValueSpec): for nr, v in enumerate(value): html.open_tr() html.open_td(class_="vlof_buttons") - html.hidden_field(varprefix + "_indexof_%d" % (nr+1), "", add_var=True) # reconstruct order after moving stuff + html.hidden_field(varprefix + "_indexof_%d" % (nr+1), "", + add_var=True, class_="index") # reconstruct order after moving stuff self.del_button(varprefix, nr+1) if self._movable: self.move_button(varprefix, nr+1, "up") # visibility fixed by javascript

7 years, 7 months

4216 FIX cmciii.phase: Fix wrong scaling of power and energy values

by Konstantin Büttner

Module: check_mk Branch: master Commit: 24aa19310174c5c5598f4de98aa7b54c4931e1b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24aa19310174c5… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 8 15:00:36 2017 +0100 4216 FIX cmciii.phase: Fix wrong scaling of power and energy values Change-Id: Iea094fddeb3b16b3c9ce64593f2d95d4b20e3ea4 --- .werks/4216 | 9 +++++++++ ChangeLog | 1 + checks/cmciii | 5 ++++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/4216 b/.werks/4216 new file mode 100644 index 0000000..cf61a7b --- /dev/null +++ b/.werks/4216 @@ -0,0 +1,9 @@ +Title: cmciii.phase: Fix wrong scaling of power and energy values +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486562407 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 8499bcd..b3f4b79 100644 --- a/ChangeLog +++ b/ChangeLog @@ -101,6 +101,7 @@ * 4341 FIX: cisco_wlc: fixed invalid parameters during service discovery * 4024 FIX: netapp_api_volumes: fixed incorrect computation of read/write latency * 4342 FIX: hp_proliant: fixed empty status handling + * 4216 FIX: cmciii.phase: Fix wrong scaling of power and energy values Multisite: * 4169 View action: Default values of sticky, notification and persistent options can now be configured via global settings.... diff --git a/checks/cmciii b/checks/cmciii index be43da1..2ef8ef6 100644 --- a/checks/cmciii +++ b/checks/cmciii @@ -162,9 +162,12 @@ def parse_cmciii(info): elif int(scale) > 0: scale_f = lambda a: float(a) * float(scale) else: - scale_f = lambda a: int(a) + scale_f = int value = scale_f(value_int) + if "Power" in container or "Energy" in container: + value = value * 1000 # kW, kWh + if itemname in parsed[this_table] and \ parsed[this_table][itemname]["_location_"] != location: itemname += " %s" % location

7 years, 7 months

Reserved 10 Werk IDS

by Konstantin Büttner

Module: check_mk Branch: master Commit: 9ac3d0b4e24d03177e1b1c5452150d75a8ea0b5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9ac3d0b4e24d03… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 8 15:12:46 2017 +0100 Reserved 10 Werk IDS Change-Id: I0353e70c3e1496eee2e758bf796e913fad605be8 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 928819e..8679f11 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -4345 +4355

7 years, 7 months

← Newer
1
...
26
27
28
29
30
31
32
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017