Checkmk git commits August 2014

checkmk-commits@lists.checkmk.com

5 participants
225 discussions

Check_MK Git: check_mk: webapi: renamed result_text to result

by Andreas Boesl

Module: check_mk Branch: master Commit: 7790067674b03143967ca2dc02b79e571d981016 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7790067674b031… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 13 15:24:29 2014 +0200 webapi: renamed result_text to result --- web/htdocs/webapi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index e827dc7..dcf94c8 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -137,11 +137,11 @@ def page_api(): request_object = example_request[1] action_response = api_actions[action]["handler"](request_object) - response = { "result_code": 0, "result_text": action_response } + response = { "result_code": 0, "result": action_response } except Exception, e: #import traceback #html.debug(traceback.format_exc().replace("\n","<br>")) - response = { "result_code": 1, "result_text": str(e) } + response = { "result_code": 1, "result": str(e) } output_format = html.var("output_format", "json") if output_format == "json":

10 years, 1 month

Check_MK Git: check_mk: webapi: fixed exception on parsing request

by Andreas Boesl

Module: check_mk Branch: master Commit: ed69edbe882515c17cd69575e6515a5fb2c3af09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed69edbe882515… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Aug 13 13:37:47 2014 +0200 webapi: fixed exception on parsing request --- web/htdocs/webapi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/webapi.py b/web/htdocs/webapi.py index 5ea81c7..e827dc7 100644 --- a/web/htdocs/webapi.py +++ b/web/htdocs/webapi.py @@ -106,7 +106,7 @@ def page_api(): request_object = {} if html.var("request"): if api_actions[action].get("dont_eval_request"): - request_object = request + request_object = html.var("request") else: eval_function = None request = html.var("request")

10 years, 1 month

Check_MK Git: check_mk: cisco_temp_sensor: Another poor try to fix diffrent output of diffrent cisco devices

by Bastian Kuhn

Module: check_mk Branch: master Commit: 4ebede4fa4cb08342276d3ecd5234241e0360605 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ebede4fa4cb08… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Aug 12 19:31:55 2014 +0200 cisco_temp_sensor: Another poor try to fix diffrent output of diffrent cisco devices --- checks/cisco_temp_sensor | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/cisco_temp_sensor b/checks/cisco_temp_sensor index d393715..06cc9cd 100644 --- a/checks/cisco_temp_sensor +++ b/checks/cisco_temp_sensor @@ -121,8 +121,11 @@ def parse_cisco_temp_sensor(info): for endoid, level in levels_info: # endoid is e.g. 21549.9 or 21459.10 + level = saveint(levels) + if level > 70: + level = level / 10 id, subid = endoid.split('.') - thresholds.setdefault(id, []).append(saveint(level)) + thresholds.setdefault(id, []).append(level) # Create main dictionary (only of temperature sensors) sensors = []

10 years, 1 month

Check_MK Git: check_mk: rms200_temp: Fix: Now use correct oid for temperature

by Bastian Kuhn

Module: check_mk Branch: master Commit: 71e43f4420945737dbd9dc1238d8c7dd27e7bce5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=71e43f44209457… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Aug 12 19:24:12 2014 +0200 rms200_temp: Fix: Now use correct oid for temperature --- checks/rms200_temp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/checks/rms200_temp b/checks/rms200_temp index a0749c0..bfa008e 100644 --- a/checks/rms200_temp +++ b/checks/rms200_temp @@ -33,14 +33,14 @@ def check_rms200_temp(item, params, info): for line in info: if line[0] == item: warn, crit = params - temp = saveint(line[2])/100 + temp = float(line[2])/100 name = line[1] state = 0 if temp >= crit: state = 2 elif temp >= warn: state = 1 - message = "Current Temperature: %d °C (%s)" % (temp, name) + message = "Current Temperature: %.2f °C (%s)" % (temp, name) perf = [ ('temp', temp, warn, crit ) ] return state, message, perf return 3, "No information found about the device" @@ -55,7 +55,7 @@ check_info["rms200_temp"] = { "snmp_info" : ( ".1.3.6.1.4.1.1909.13.1.1.1", [ 1, # ID, 2, # Name, - 3, # Temp + 5, # Temp ] ), }

10 years, 1 month

Check_MK Git: check_mk: Web-API improvements: now able to unset host attributes via edit_host function

by Andreas Boesl

Module: check_mk Branch: master Commit: 8cda5a5e6135fdefca7bad5d8574a2ac6a6d2a2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cda5a5e6135fd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 12 17:56:46 2014 +0200 Web-API improvements: now able to unset host attributes via edit_host function --- web/htdocs/wato.py | 23 +++++++++++------------ web/plugins/webapi/webapi.py | 8 +++++--- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 7c05413..af6fc2b 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16834,17 +16834,16 @@ def add_host_to_folder(folder, hostname, attributes): call_hook_hosts_changed(folder) # Updates attributes of one host -# This function is quite special (tag deletion) and only used by the Web-API so far -def update_host_attributes(host, attributes): +def update_host_attributes(host, attr = {}, unset_attr = []): cleaned_attr = dict([(k, v) for (k, v) in host.iteritems() if not k.startswith('.') ]) - for key, value in attributes.items(): - # If a host tag (e.g. tag_agent) is set to False, delete this key - if key.startswith("tag_") and value == False: - if key in cleaned_attr: - del cleaned_attr[key] - else: - cleaned_attr[key] = value + # unset keys + for key in unset_attr: + if key in cleaned_attr: + del cleaned_attr[key] + + # set new keys + cleaned_attr.update(attr) set_host_attributes(host, cleaned_attr) @@ -17011,18 +17010,18 @@ class API: # Update the all_hosts reference. Saves quite some time on followup calls all_hosts[hostname] = folder[".hosts"][hostname] - def edit_host(self, hostname, host_attr, dry_run = False): + def edit_host(self, hostname, attr = {}, unset_attr = []): self.__prepare_folder_info() all_hosts = self.__get_all_hosts() - attributes = self.__get_valid_api_host_attributes(host_attr) + attributes = self.__get_valid_api_host_attributes(attr) self.__validate_host_data(hostname, attributes = attributes, all_hosts = all_hosts, validate = ["host_missing", "tags", "site", "permissions_edit"]) ### Update Host host = all_hosts[hostname] - update_host_attributes(host, attributes) + 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"] diff --git a/web/plugins/webapi/webapi.py b/web/plugins/webapi/webapi.py index 744c52e..131a475 100644 --- a/web/plugins/webapi/webapi.py +++ b/web/plugins/webapi/webapi.py @@ -63,13 +63,14 @@ api_actions["add_host"] = { ############### def action_edit_host(request): - hostname = request.get("hostname") - attributes = request.get("attributes", {}) + hostname = request.get("hostname") + attributes = request.get("attributes", {}) + unset_attributes = request.get("unset_attributes", []) if not hostname: raise MKUserError(None, "Hostname is missing") - return g_api.edit_host(hostname, attributes) + return g_api.edit_host(hostname, attr = attributes, unset_attr = unset_attributes) api_actions["edit_host"] = { "handler" : action_edit_host, @@ -81,6 +82,7 @@ api_actions["edit_host"] = { "tag_agent": "snmp-only", "site": "slave" }, + "unset_attributes": ["tag_criticality"], "hostname": "testhost" }), "locking" : True,

10 years, 1 month

Check_MK Git: check_mk: #1175 dell_idrac_disks: New Check for Harddisks using Dell iDrac

by Bastian Kuhn

Module: check_mk Branch: master Commit: 387ec1ff6a43dd7f04b3dafc1800b2606672bd17 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=387ec1ff6a43dd… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Aug 12 17:22:41 2014 +0200 #1175 dell_idrac_disks: New Check for Harddisks using Dell iDrac --- .werks/1175 | 9 ++++ ChangeLog | 2 +- checkman/dell_idrac_disks | 17 +++++++ checks/dell_idrac_disks | 123 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 150 insertions(+), 1 deletion(-) diff --git a/.werks/1175 b/.werks/1175 new file mode 100644 index 0000000..d4ab557 --- /dev/null +++ b/.werks/1175 @@ -0,0 +1,9 @@ +Title: dell_idrac_disks: New Check for Harddisks using Dell iDrac +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i6 +Date: 1407856904 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 6be01f0..1a8592e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,7 @@ * 1173 cisco_secure: Check creates now a summary instead one service by port... NOTE: Please refer to the migration notes! * 1174 rms200_temp: New Temperature check for RMS200 Devices + * 1175 dell_idrac_disks: New Check for Harddisks using Dell iDrac * 1051 FIX: tcp_conn_stats: fix missing performance data... * 1142 FIX: winperf_ts_sessions: fix computation, check has never really worked * 1090 FIX: zfsget: fixed exception which happened on incomplete zfs entries @@ -37,7 +38,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... * 1064 FIX: Fixed rare issue with WATO communication in distributed setups (different OS versions)... * 1089 FIX: Snapshot restore: fixed exception during exception handling...... diff --git a/checkman/dell_idrac_disks b/checkman/dell_idrac_disks new file mode 100644 index 0000000..29b3ef9 --- /dev/null +++ b/checkman/dell_idrac_disks @@ -0,0 +1,17 @@ +title: Dell iDrac: Disks +agents: snmp +catalog: hw/server/dell +license: GPL +distribution: check_mk +description: + This checks connects to a Dell iDrac and monitors the health and current + Status of Hardisks attached to server. Currently tested with iDrac V7. + The check returns a {CRIT} in case of an error state reported + by the device. The check also reports Size, SMART Errors and Spare state for each disk. + +item: + The compination of EnclosureID, Channel and TargetID seperated by colums + +inventory: + One check is created for each Disk + diff --git a/checks/dell_idrac_disks b/checks/dell_idrac_disks new file mode 100644 index 0000000..5c40f0a --- /dev/null +++ b/checks/dell_idrac_disks @@ -0,0 +1,123 @@ +#!/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. + +def inventory_dell_idrac_disks(info): + inventory = [] + for line in info: + inventory.append(( line[0], None )) + return inventory + +def check_dell_idrac_disks(item, _no_params, info): + diskStates = { + 1 : "unkown", + 2 : "ready", + 3 : "online", + 4 : "foreign", + 5 : "offline", + 6 : "blocked", + 7 : "failed", + 8 : "non-raid", + 9 : "removed", + } + + componentStates = { + 1 : "Other", + 2 : "Unknown", + 3 : "OK", + 4 : "Non-critical", + 5 : "Critical", + 6 : "Non-recoverable" + } + + sparestates = { + 1 : "not a Spare", + 2 : "dedicated Hotspare", + 3 : "global Hotspare", + } + for diskname, diskState, capacityMB, spareState, componentState, smartAlert, displayName in info: + if diskname == item: + state = 0 + infotexts = [] + + # Component State + componentState = int(componentState) + infotext = "State: " + componentStates[componentState] + if componentState in [ 5, 6 ]: + state = 2 + infotexts.append(infotext+"(!!)") + elif componentState in [ 1, 2, 4 ]: + state = max(state, 1) + infotexts.append(infotext+"(!)") + + # Smart Alert + if smartAlert != '0': + infotexts.append("Smart Alert on Disk(!!)") + + # Disk State + diskState = int(diskState) + infotext = "Disk State: " + diskStates[diskState] + label = "" + show = False + if diskState in [ 1, 5, 6, 7, 9 ]: + state = 2 + label = "(!!)" + show = True + elif diskState in [ 4, 8 ]: + state = max(state, 1) + label = "(!)" + show = True + if show: + infotexts.append(infotext+label) + + spareState = int(spareState) + if spareState != 1: + infotexts.append('Spare State: ' + sparestates[spareState] ) + + # Capacity + infotexts.append("Size: " + get_bytes_human_readable(int(capacityMB) * 1024 * 1024 )) + + # Display Name + infotexts.append(displayName) + + return state, ", ".join(infotexts) + return 3, "Disk not found in SNMP Output" + +check_info["dell_idrac_disks"] = { + "check_function" : check_dell_idrac_disks, + "inventory_function" : inventory_dell_idrac_disks, + "service_description" : "Disk %s", + "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.674.10892.5", + "snmp_info" : (".1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1", [ + 2, # physicalDiskName + 4, # physicalDiskState + 11, # physicalDiskCapacityInMB + 22, # physicalDiskSpareState + 24, # physicalDiskComponentStatus + 31, # physicalDiskSmartAlertIndication + 55, # physicalDiskDisplayName + ]), +} +

10 years, 1 month

Check_MK Git: check_mk: Updated bug entries #2166

by Andreas Boesl

Module: check_mk Branch: master Commit: 7d27caf1fc8b2aa04395742ee0c0194c44f5af10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d27caf1fc8b2a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 12 14:32:23 2014 +0200 Updated bug entries #2166 --- .bugs/2166 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.bugs/2166 b/.bugs/2166 new file mode 100644 index 0000000..7e9dc6d --- /dev/null +++ b/.bugs/2166 @@ -0,0 +1,10 @@ +Title: WATO new cluster: Can only add one cluster node in the formular +Component: wato +State: open +Date: 2014-08-12 14:30:05 +Targetversion: future +Class: bug + +- Create a new cluster within WATO, but omit the nodes field +- Save formular. A warning appears, the nodes field is highlighted +- The list of nodes does not auto-enlarge, so you can only add one node

10 years, 1 month

Check_MK Git: check_mk: added missing (old) api function get_folder. fixed error with incorrect self. reference

by Andreas Boesl

Module: check_mk Branch: master Commit: 77bf4fbb10bc50520afea91f8a1baa061e3b17f9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77bf4fbb10bc50… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Aug 12 13:51:49 2014 +0200 added missing (old) api function get_folder. fixed error with incorrect self. reference --- web/htdocs/wato.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index e35ea43..7c05413 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -16681,6 +16681,18 @@ def get_folder_tree(): num_hosts_in(g_root_folder) # sets ".total_hosts" return g_root_folder +# Find a folder by its path. Raise an exception if it does +# not exist. +def get_folder(path): + prepare_folder_info() + + folder = g_folders.get(path) + if folder: + load_hosts(folder) + return folder + else: + raise MKGeneralException("No WATO folder %s." % path) + # Return the title of a folder - which is given as a string path def get_folder_title(path): load_all_folders() # TODO: use in-memory-cache @@ -16702,12 +16714,12 @@ def sort_by_title(folders): folders.sort(cmp = folder_cmp) return folders -def get_all_hosts(self, folder=None): +def get_all_hosts(folder=None): if not folder: - self.prepare_folder_info() + prepare_folder_info() return collect_hosts(folder or g_root_folder) -def get_host(self, folder, hostname): +def get_host(folder, hostname): host = folder[".hosts"][hostname] eff = effective_attributes(host, folder) eff["name"] = hostname

10 years, 1 month

Check_MK Git: check_mk: diskstat.include: Minor fix for last bugfix

by Bastian Kuhn

Module: check_mk Branch: master Commit: 7c95b1d6e1c0113f1f84126a705a54dae0f22bd4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c95b1d6e1c011… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Tue Aug 12 09:14:18 2014 +0200 diskstat.include: Minor fix for last bugfix --- checks/diskstat.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/diskstat.include b/checks/diskstat.include index 47eb6d7..a4cd35a 100644 --- a/checks/diskstat.include +++ b/checks/diskstat.include @@ -89,7 +89,7 @@ def inventory_diskstat_generic(info): -def check_diskstat_line(this_time, item, params, line, mode): +def check_diskstat_line(this_time, item, params, line, mode='sectors'): average_range = params.get("average") perfdata = [] infos = []

10 years, 1 month

Check_MK Git: check_mk: werk wording

by Andreas Boesl

Module: check_mk Branch: master Commit: 1d09e6ab1166acdf97e21f96c3750f51a3997750 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d09e6ab1166ac… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Aug 11 18:37:43 2014 +0200 werk wording --- .werks/1096 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/1096 b/.werks/1096 index 47a20c0..d8bb3d5 100644 --- a/.werks/1096 +++ b/.werks/1096 @@ -20,7 +20,7 @@ This includes the following operations These operations also work in a distributed environment. You can find more information regarding these web request in the <tt>Roles & Permissions</tt> page under a roles settings. -There is a new permission topic <tt>Web API</tt> where you can configure the permission +There is a new permission topic <tt>Web API</tt> where you can configure the permissions of all available API requests. The help texts for these permissions provide some useful examples. In the near future, there will be a "Howto Web-API" article in our online documentation, too.

10 years, 1 month

← Newer
1
...
14
15
16
17
18
19
20
...
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