Checkmk git commits February 2016

checkmk-commits@lists.checkmk.com

7 participants
402 discussions

#3254 FIX haproxy: fixed wrong type handling

by Simon Betz

Module: check_mk Branch: master Commit: 7fbe311bbc641ef51e79e8f401e497ccfa8e403a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7fbe311bbc641e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 29 18:10:18 2016 +0100 #3254 FIX haproxy: fixed wrong type handling --- .werks/3254 | 10 ++++++++ ChangeLog | 1 + checks/haproxy | 72 +++++++++++++++++++++++++++++++------------------------- 3 files changed, 51 insertions(+), 32 deletions(-) diff --git a/.werks/3254 b/.werks/3254 new file mode 100644 index 0000000..7126000 --- /dev/null +++ b/.werks/3254 @@ -0,0 +1,10 @@ +Title: haproxy: fixed wrong type handling +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456765794 + + diff --git a/ChangeLog b/ChangeLog index 7c50568..2074fb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -50,6 +50,7 @@ * 3250 FIX: cisco_mem: remove bogus memory check for "Driver text"... * 3084 FIX: windows agent: fixed crash when specifying an invalid performance counter * 3252 FIX: ntp.time: better handling of temporary synchronization loss... + * 3254 FIX: haproxy: fixed wrong type handling Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/haproxy b/checks/haproxy index 82c9f64..9517a2d 100644 --- a/checks/haproxy +++ b/checks/haproxy @@ -25,22 +25,31 @@ # Boston, MA 02110-1301 USA. -# Example output from agent: # <<<haproxy:sep(44)>>> # # pxname,svname,qcur,qmax,scur,smax,slim,stot,bin,bout,dreq,dresp,ereq,econ,eresp,wretr,wredis,status,weight,act,bck,chkfail,chkdown,lastchg,downtime,qlimit,pid,iid,sid,throttle,lbtot,tracked,type,rate,rate_lim,rate_max,check_status,check_code,check_duration,hrsp_1xx,hrsp_2xx,hrsp_3xx,hrsp_4xx,hrsp_5xx,hrsp_other,hanafail,req_rate,req_rate_max,req_tot,cli_abrt,srv_abrt,comp_in,comp_out,comp_byp,comp_rsp,lastsess,last_chk,last_agt,qtime,ctime,rtime,ttime, # https_t3test.tgic.de,FRONTEND,,,0,0,2000,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,2,0,,,,0,0,0,0,,,,0,0,0,0,0,0,,0,0,0,,,0,0,0,0,,,,,,,, # https_t3test.tgic.de,BACKEND,0,0,0,0,200,0,0,0,0,0,,0,0,0,0,UP,0,0,0,,0,363417,0,,1,2,0,,0,,1,0,,0,,,,0,0,0,0,0,0,,,,,0,0,0,0,0,0,-1,,,0,0,0,0, # t3test,t3test,0,0,0,0,,0,0,0,,0,,0,0,0,0,UP,1,1,0,0,0,363417,0,,1,3,1,,0,,2,0,,0,L4OK,,0,0,0,0,0,0,0,0,,,,0,0,,,,,-1,,,0,0,0,0, +# <<<haproxy:sep(44)>>> +# BLABLABFO,ELEADC05,0,0,0,5,,841,483793,1386127,,0,,0,751,0,0,UP,1,1,0,0,0,38624,0,,1,5,2,,841,,2,0,,4,L4OK,,0,,,,,,,0,,,,90,751,,,,,169,,,0,0,0,3073, +# BLABLABLABLA,FRONTEND,,,0,0,2000,0,0,0,0,0,0,,,,,OPEN,,,,,,,,,1,2,0,,,,0,0,0,0,,,,0,0,0,0,0,0,,0,0,0,,,0,0,0,0,,,,,,,, +# LDAP,IP.IP.IP.IP,,,0,32,250,5892,3365040,9470591,0,0,0,,,,,OPEN,,,,,,,,,1,3,1,,,,3,,,,,,,,,,,,,,,,,,,,,,,,,,,,,, + + +# from http://www.haproxy.org/download/1.7/doc/management.txt +# 0=frontend, 1=backend, 2=server, 3=socket/listener + def inventory_haproxy_frontend(info): for line in info: - if line[1] == "FRONTEND": - yield line[0], None + if line[32] == "0": + yield line[0], None + def check_haproxy_frontend(item, _no_params, info): for line in info: - if line[1] == "FRONTEND" and line[0] == item: + if line[0] == item: now = time.time() status = line[17] stot = int(line[7]) @@ -50,9 +59,9 @@ def check_haproxy_frontend(item, _no_params, info): perfdata = [ ("session_rate", session_rate) ] if status == "OPEN": - state = 0 + state = 0 else: - state = 2 + state = 2 return state, infotext, perfdata @@ -67,34 +76,33 @@ check_info["haproxy.frontend"] = { def inventory_haproxy_server(info): for line in info: - if line[1] != "BACKEND" and line[1] != "FRONTEND" and not line[0].startswith("#"): - item = "%s/%s" % (line[0], line[1]) - yield item, None + if line[32] == "2": + yield "%s/%s" % (line[0], line[1]), None + def check_haproxy_server(item, _no_params, info): - backend, server = item.split("/") - for line in info: - if line[0] == backend and line[1] == server: - status = line[17] - uptime = get_age_human_readable(int(line[23])) - layer_check = line[36] - active = int(line[19]) - backup = int(line[20]) - - if status == "UP" and (active or backup): - state = 0 - else: - state = 2 - - infotext = "%s since %s, Layer Check: %s" % \ - (status, uptime, layer_check) - if active: - infotext += ", active" - elif backup: - infotext += ", backup" - else: - infotext += ", neither active nor backup (!!)" - return state, infotext + for line in info: + if "%s/%s" % (line[0], line[1]) == item: + status = line[17] + uptime = get_age_human_readable(int(line[23])) + layer_check = line[36] + active = int(line[19]) + backup = int(line[20]) + + if status == "UP" and (active or backup): + state = 0 + else: + state = 2 + + infotext = "%s since %s, Layer Check: %s" % \ + (status, uptime, layer_check) + if active: + infotext += ", active" + elif backup: + infotext += ", backup" + else: + infotext += ", neither active nor backup (!!)" + return state, infotext check_info["haproxy.server"] = {

8 years, 3 months

#3252 FIX ntp.time: better handling of temporary synchronization loss

by Mathias Kettner

Module: check_mk Branch: master Commit: 641329290cf1b4ef1e5428b0c44c525ed0dfec1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=641329290cf1b4… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 29 16:46:45 2016 +0100 #3252 FIX ntp.time: better handling of temporary synchronization loss After a reboot of the target machine or of the NTP server the check always go CRIT for a couple of minutes - since NTP disregarded the peers as suitable. Now this is being tolerated for a configurable amount of time. Per default after 5 minutes of being without a valid time source the check goes WARN and after 60 minute CRIT - but only if before this there was a valid time. --- .werks/3252 | 13 +++++++++ ChangeLog | 1 + checks/ntp | 52 ++++++++++++++++++++++++++++++---- web/plugins/wato/check_parameters.py | 19 ++++++++++++- 4 files changed, 79 insertions(+), 6 deletions(-) diff --git a/.werks/3252 b/.werks/3252 new file mode 100644 index 0000000..68d8463 --- /dev/null +++ b/.werks/3252 @@ -0,0 +1,13 @@ +Title: ntp.time: better handling of temporary synchronization loss +Level: 2 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1456760686 +Class: fix + +After a reboot of the target machine or of the NTP server the check always +go CRIT for a couple of minutes - since NTP disregarded the peers as suitable. +Now this is being tolerated for a configurable amount of time. Per default +after 5 minutes of being without a valid time source the check goes WARN +and after 60 minute CRIT - but only if before this there was a valid time. diff --git a/ChangeLog b/ChangeLog index 3d7dc78..7c50568 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ * 3245 FIX: Fix interpretation of check levels 0.0 as "no levels"... * 3250 FIX: cisco_mem: remove bogus memory check for "Driver text"... * 3084 FIX: windows agent: fixed crash when specifying an invalid performance counter + * 3252 FIX: ntp.time: better handling of temporary synchronization loss... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/ntp b/checks/ntp index b1dcd62..3b90f06 100644 --- a/checks/ntp +++ b/checks/ntp @@ -26,6 +26,11 @@ ntp_default_levels = (10, 200.0, 500.0) # stratum, ms offset +factory_settings["ntp_time_default_levels"] = { + "ntp_levels" : ntp_default_levels, + "alert_delay" : (300, 3600), +} + # Example output from agent: # <<<ntp>>> # - 42.202.61.100 .INIT. 16 u - 1024 0 0.000 0.000 0.000 @@ -123,6 +128,7 @@ def check_ntp_server_state(line, params): else: return (0, infotext, offset, jitter) + def check_ntp(item, params, info): for line in info: if line[1] == item: @@ -139,18 +145,53 @@ def check_ntp(item, params, info): return (3, "peer not found") -def check_ntp_summary(item, params, info): + +def check_ntp_summary(_no_item, params, info): + if type(params) == tuple: + params = { + "ntp_levels" : params, + "alert_delay" : (300, 3600), + } # No information at all? NTP daemon not running or timeout in ntpq -p if len(info) == 0: - return (3, "no information from NTP: timeout in ntpq -p or NTP daemon not running") + yield 3, "no information from NTP: timeout in ntpq -p or NTP daemon not running" + return # We only are interested in our system peer or pulse per second source (pps) for line in info: if line[0] in [ "*", "o" ]: - state, text, perfdata = check_ntp(line[1], params, [line]) + state, text, perfdata = check_ntp(line[1], params["ntp_levels"], [line]) text += " (synchronized on %s)" % line[1] - return (state, text, perfdata) - return (2, "found %d peers, but none is suitable" % len(info)) + set_item_state(None, ("sync", time.time(), state, "last successful sync")) # remember last successfull sync + yield state, text, perfdata + return + + infotext = "found %d peers, but none is suitable" % len(info) + yield 0, infotext + + # Currently no peer is suitable. But we want to tolerate that for a while. + entry = get_item_state(None) + if entry == None: + set_item_state(None, ("init", time.time(), 0, infotext)) + yield 0, "just started monitoring" + return + + how, last_successful_sync, last_state, last_infotext = entry + time_since_sync = time.time() - last_successful_sync + infotext = "this is %s since " % get_age_human_readable(time_since_sync) + infotext += last_infotext + yield last_state, infotext + + warn_time, crit_time = params["alert_delay"] + if time_since_sync >= crit_time: + status = 2 + elif time_since_sync >= warn_time: + status = 1 + else: + status = 0 + + if status: + yield status, "(levels at %s/%s)" % (get_age_human_readable(warn_time), get_age_human_readable(crit_time)) @@ -168,4 +209,5 @@ check_info["ntp.time"] = { 'service_description': 'NTP Time', 'has_perfdata': True, 'group': 'ntp_time', + 'default_levels_variable': "ntp_time_default_levels", } diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 6cf9cf3..7c4a2bb 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -8730,6 +8730,7 @@ register_check_parameters( ) ntp_params = \ Tuple( + title = _("Thresholds for quality of time"), elements = [ Integer( title = _("Critical at stratum"), @@ -8755,7 +8756,23 @@ register_check_parameters( subgroup_os, "ntp_time", _("State of NTP time synchronisation"), - ntp_params, + Transform( + Dictionary( + elements = [ + ( "ntp_levels", + ntp_params, ), + ( "alert_delay", + Tuple( + title = _("Phases without synchronization"), + elements = [ + Age(title=_("Warning at"), display=["hours", "minutes"], default_value = 300, ), + Age(title=_("Critical at"), display=["hours", "minutes"], default_value = 3600,), + ] + )), + ] + ), + forth = lambda params: type(params) == tuple and { "ntp_levels" : params } or params + ), None, "first" )

8 years, 3 months

Fix Multisite profiling. It is no longer trigger by config variable

by Mathias Kettner

Module: check_mk Branch: master Commit: 4b0fe79910fedb92adfff6d56d2caa8bdabc6b3a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b0fe79910fedb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 29 14:33:52 2016 +0100 Fix Multisite profiling. It is no longer trigger by config variable You now have to create the directory var/check_mk/profiling. If it exists, the profile will be created in that directory --- web/htdocs/index.py | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/web/htdocs/index.py b/web/htdocs/index.py index 37c6f6f..e35cd19 100644 --- a/web/htdocs/index.py +++ b/web/htdocs/index.py @@ -36,6 +36,25 @@ from html_mod_python import html_mod_python, FinalizeRequest # Main entry point for all HTTP-requests (called directly by mod_apache) def handler(req, fields = None, is_profiling = False): + if not is_profiling and os.path.exists(defaults.var_dir + "/profiling"): + import cProfile + # the profiler loses the memory about all modules. We need to hand over + # the request object in the apache module. + # Ubuntu: install python-profiler when using this feature + profile_file = defaults.var_dir + "/profiling/multisite.profile" + retcode = cProfile.runctx( + "import index; " + "index.handler(profile_req, profile_fields, is_profiling=True)", + {'profile_req': req, 'profile_fields': fields}, {}, profile_file) + file(profile_file + ".py", "w").write( + "#!/usr/bin/python\n" + "import pstats\n" + "stats = pstats.Stats(%r)\n" + "stats.sort_stats('time').print_stats()\n" % profile_file) + os.chmod(profile_file + ".py", 0755) + return apache.OK + + # Create an object that contains all data about the request and # helper functions for creating valid HTML. Parse URI and # store results in the request object for later usage. @@ -45,7 +64,6 @@ def handler(req, fields = None, is_profiling = False): try: config.load_config() # load multisite.mk etc. html.init_modes() - init_profiling(is_profiling) # Make sure all plugins are avaiable as early as possible. At least # we need the plugins (i.e. the permissions declared in these) at the @@ -191,27 +209,6 @@ def handler(req, fields = None, is_profiling = False): return response_code -# Profiling of the Check_MK GUI can be enabled via global settings -def init_profiling(is_profiling): - if not is_profiling and config.profile: - import cProfile - # the profiler loses the memory about all modules. We need to hand over - # the request object in the apache module. - # Ubuntu: install python-profiler when using this feature - profile_file = defaults.var_dir + "/web/multisite.profile" - retcode = cProfile.runctx( - "import index; " - "index.handler(profile_req, profile_fields, is_profiling=True)", - {'profile_req': html.req, 'profile_fields': html.fields}, {}, profile_file) - file(profile_file + ".py", "w").write( - "#!/usr/bin/python\n" - "import pstats\n" - "stats = pstats.Stats(%r)\n" - "stats.sort_stats('time').print_stats()\n" % profile_file) - os.chmod(profile_file + ".py", 0755) - raise FinalizeRequest(apache.OK) - - # Ajax-Functions want no HTML output in case of an error but # just a plain server result code of 500 def fail_silently():

8 years, 3 months

added source code for ohm headless client (including dependencies)

by Sebastian Herbord

Module: check_mk Branch: master Commit: 558609c7ffec78fde143d5f3773362d9ecb78d09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=558609c7ffec78… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 29 13:36:03 2016 +0100 added source code for ohm headless client (including dependencies) --- agents/windows/openhardwaremonitor/App.config | 7 + .../Collections/IReadOnlyArray.cs | 23 + .../openhardwaremonitor/Collections/ListSet.cs | 58 + .../openhardwaremonitor/Collections/Pair.cs | 40 + .../Collections/ReadOnlyArray.cs | 46 + .../Collections/RingCollection.cs | 208 + .../openhardwaremonitor/GUI/AboutBox.Designer.cs | 172 + agents/windows/openhardwaremonitor/GUI/AboutBox.cs | 43 + .../windows/openhardwaremonitor/GUI/AboutBox.resx | 185 + .../openhardwaremonitor/GUI/CrashForm.Designer.cs | 253 + .../windows/openhardwaremonitor/GUI/CrashForm.cs | 91 + .../windows/openhardwaremonitor/GUI/CrashForm.resx | 120 + agents/windows/openhardwaremonitor/GUI/Gadget.cs | 145 + .../openhardwaremonitor/GUI/GadgetWindow.cs | 579 ++ .../openhardwaremonitor/GUI/HardwareNode.cs | 113 + .../openhardwaremonitor/GUI/HardwareTypeImage.cs | 71 + .../openhardwaremonitor/GUI/MainForm.Designer.cs | 767 ++ agents/windows/openhardwaremonitor/GUI/MainForm.cs | 859 ++ .../windows/openhardwaremonitor/GUI/MainForm.resx | 389 + agents/windows/openhardwaremonitor/GUI/Node.cs | 173 + .../openhardwaremonitor/GUI/NotifyIconAdv.cs | 807 ++ .../GUI/ParameterForm.Designer.cs | 200 + .../openhardwaremonitor/GUI/ParameterForm.cs | 133 + .../openhardwaremonitor/GUI/ParameterForm.resx | 132 + .../windows/openhardwaremonitor/GUI/PlotPanel.cs | 271 + .../openhardwaremonitor/GUI/PortForm.Designer.cs | 180 + agents/windows/openhardwaremonitor/GUI/PortForm.cs | 76 + .../windows/openhardwaremonitor/GUI/PortForm.resx | 120 + .../openhardwaremonitor/GUI/ReportForm.Designer.cs | 246 + .../windows/openhardwaremonitor/GUI/ReportForm.cs | 77 + .../openhardwaremonitor/GUI/ReportForm.resx | 120 + .../openhardwaremonitor/GUI/SensorGadget.cs | 636 ++ .../windows/openhardwaremonitor/GUI/SensorNode.cs | 123 + .../openhardwaremonitor/GUI/SensorNotifyIcon.cs | 319 + .../windows/openhardwaremonitor/GUI/ShowDesktop.cs | 145 + .../openhardwaremonitor/GUI/SplitContainerAdv.cs | 123 + .../openhardwaremonitor/GUI/StartupManager.cs | 195 + .../windows/openhardwaremonitor/GUI/SystemTray.cs | 170 + .../openhardwaremonitor/GUI/TaskScheduler.cs | 921 ++ .../windows/openhardwaremonitor/GUI/TreeModel.cs | 123 + agents/windows/openhardwaremonitor/GUI/TypeNode.cs | 97 + .../windows/openhardwaremonitor/GUI/UnitManager.cs | 44 + .../openhardwaremonitor/GUI/UpdateVisitor.cs | 31 + .../windows/openhardwaremonitor/GUI/UserOption.cs | 67 + .../openhardwaremonitor/GUI/UserRadioGroup.cs | 70 + .../openhardwaremonitor/Hardware/ATI/ADL.cs | 284 + .../openhardwaremonitor/Hardware/ATI/ATIGPU.cs | 179 + .../openhardwaremonitor/Hardware/ATI/ATIGroup.cs | 127 + .../openhardwaremonitor/Hardware/CPU/AMD0FCPU.cs | 155 + .../openhardwaremonitor/Hardware/CPU/AMD10CPU.cs | 372 + .../openhardwaremonitor/Hardware/CPU/AMDCPU.cs | 42 + .../openhardwaremonitor/Hardware/CPU/CPUGroup.cs | 193 + .../openhardwaremonitor/Hardware/CPU/CPUID.cs | 256 + .../openhardwaremonitor/Hardware/CPU/CPULoad.cs | 155 + .../openhardwaremonitor/Hardware/CPU/GenericCPU.cs | 310 + .../openhardwaremonitor/Hardware/CPU/IntelCPU.cs | 431 + .../openhardwaremonitor/Hardware/Computer.cs | 397 + .../openhardwaremonitor/Hardware/Control.cs | 116 + .../openhardwaremonitor/Hardware/FirmwareTable.cs | 94 + .../Hardware/HDD/AbstractHarddrive.cs | 372 + .../openhardwaremonitor/Hardware/HDD/DebugSmart.cs | 439 + .../Hardware/HDD/DriveAttributeValue.cs | 28 + .../Hardware/HDD/DriveThresholdValue.cs | 24 + .../openhardwaremonitor/Hardware/HDD/HDDGeneric.cs | 107 + .../Hardware/HDD/HarddriveGroup.cs | 56 + .../openhardwaremonitor/Hardware/HDD/ISmart.cs | 36 + .../Hardware/HDD/NamePrefixAttribute.cs | 26 + .../Hardware/HDD/RequireSmartAttribute.cs | 26 + .../Hardware/HDD/SSDIndilinx.cs | 54 + .../openhardwaremonitor/Hardware/HDD/SSDIntel.cs | 57 + .../openhardwaremonitor/Hardware/HDD/SSDMicron.cs | 56 + .../openhardwaremonitor/Hardware/HDD/SSDPlextor.cs | 27 + .../openhardwaremonitor/Hardware/HDD/SSDSamsung.cs | 60 + .../Hardware/HDD/SSDSandforce.cs | 84 + .../Hardware/HDD/SmartAttribute.cs | 103 + .../openhardwaremonitor/Hardware/HDD/SmartNames.cs | 502 ++ .../Hardware/HDD/WindowsSmart.cs | 404 + .../openhardwaremonitor/Hardware/Hardware.cs | 107 + .../Hardware/Heatmaster/Heatmaster.cs | 275 + .../Hardware/Heatmaster/HeatmasterGroup.cs | 173 + .../openhardwaremonitor/Hardware/HexStringArray.cs | 33 + .../openhardwaremonitor/Hardware/IComputer.cs | 32 + .../openhardwaremonitor/Hardware/IControl.cs | 35 + .../openhardwaremonitor/Hardware/IElement.cs | 21 + .../windows/openhardwaremonitor/Hardware/IGroup.cs | 22 + .../openhardwaremonitor/Hardware/IHardware.cs | 47 + .../openhardwaremonitor/Hardware/IOControlCode.cs | 43 + .../openhardwaremonitor/Hardware/IParameter.cs | 24 + .../openhardwaremonitor/Hardware/ISensor.cs | 70 + .../openhardwaremonitor/Hardware/ISettings.cs | 22 + .../openhardwaremonitor/Hardware/IVisitor.cs | 20 + .../openhardwaremonitor/Hardware/Identifier.cs | 103 + .../openhardwaremonitor/Hardware/KernelDriver.cs | 296 + .../openhardwaremonitor/Hardware/LPC/Chip.cs | 103 + .../openhardwaremonitor/Hardware/LPC/F718XX.cs | 162 + .../openhardwaremonitor/Hardware/LPC/ISuperIO.cs | 33 + .../openhardwaremonitor/Hardware/LPC/IT87XX.cs | 330 + .../openhardwaremonitor/Hardware/LPC/LMSensors.cs | 219 + .../openhardwaremonitor/Hardware/LPC/LPCIO.cs | 525 ++ .../openhardwaremonitor/Hardware/LPC/NCT677X.cs | 457 + .../openhardwaremonitor/Hardware/LPC/W836XX.cs | 325 + .../Hardware/Mainboard/GigabyteTAMG.cs | 147 + .../Hardware/Mainboard/Identification.cs | 202 + .../Hardware/Mainboard/Mainboard.cs | 147 + .../Hardware/Mainboard/MainboardGroup.cs | 35 + .../Hardware/Mainboard/Manufacturer.cs | 38 + .../Hardware/Mainboard/Model.cs | 89 + .../Hardware/Mainboard/SuperIOHardware.cs | 1463 +++ .../openhardwaremonitor/Hardware/Nvidia/NVAPI.cs | 398 + .../Hardware/Nvidia/NvidiaGPU.cs | 474 + .../Hardware/Nvidia/NvidiaGroup.cs | 106 + .../windows/openhardwaremonitor/Hardware/Opcode.cs | 263 + .../Hardware/OperatingSystem.cs | 38 + .../Hardware/PInvokeDelegateFactory.cs | 82 + .../openhardwaremonitor/Hardware/Parameter.cs | 111 + .../openhardwaremonitor/Hardware/RAM/GenericRAM.cs | 80 + .../openhardwaremonitor/Hardware/RAM/RAMGroup.cs | 45 + .../windows/openhardwaremonitor/Hardware/Ring0.cs | 409 + .../windows/openhardwaremonitor/Hardware/SMBIOS.cs | 467 + .../windows/openhardwaremonitor/Hardware/Sensor.cs | 239 + .../openhardwaremonitor/Hardware/SensorVisitor.cs | 43 + .../Hardware/TBalancer/FTD2XX.cs | 205 + .../Hardware/TBalancer/TBalancer.cs | 325 + .../Hardware/TBalancer/TBalancerGroup.cs | 155 + .../openhardwaremonitor/Hardware/ThreadAffinity.cs | 66 + .../openhardwaremonitor/Hardware/WinRing0.sys | Bin 0 -> 14416 bytes .../openhardwaremonitor/Hardware/WinRing0x64.sys | Bin 0 -> 14544 bytes .../openhardwaremonitor/Licenses/License.html | 402 + .../openhardwaremonitor/OpenHardwareMonitor.csproj | 307 + .../openhardwaremonitor/OpenHardwareMonitor.sln | 47 + .../OpenHardwareMonitor.userprefs | 27 + .../OpenHardwareMonitorCLI/DataProvider.cs | 58 + .../OpenHardwareMonitorCLI/OHMService.cs | 50 + .../OpenHardwareMonitorCLI.csproj | 60 + .../OpenHardwareMonitorCLI/Program.cs | 43 + .../Properties/AssemblyInfo.cs | 27 + .../OpenHardwareMonitorCLI/UpdateVisitor.cs | 49 + .../OpenHardwareMonitorCLI/WMI/Hardware.cs | 38 + .../OpenHardwareMonitorCLI/WMI/IWmiObject.cs | 20 + .../OpenHardwareMonitorCLI/WMI/Sensor.cs | 53 + .../OpenHardwareMonitorCLI/WMI/WmiProvider.cs | 127 + .../OpenHardwareMonitorCLI/app.config | 7 + .../OpenHardwareMonitorLib.csproj | 176 + agents/windows/openhardwaremonitor/Program.cs | 101 + .../openhardwaremonitor/Properties/AssemblyInfo.cs | 25 + .../Properties/AssemblyLibInfo.cs | 26 + .../Properties/AssemblyVersion.cs | 14 + .../images/ui-bg_flat_0_aaaaaa_40x100.png | Bin 0 -> 180 bytes .../images/ui-bg_glass_55_fbf9ee_1x400.png | Bin 0 -> 120 bytes .../images/ui-bg_glass_65_ffffff_1x400.png | Bin 0 -> 105 bytes .../images/ui-bg_glass_75_dadada_1x400.png | Bin 0 -> 111 bytes .../images/ui-bg_glass_75_e6e6e6_1x400.png | Bin 0 -> 110 bytes .../images/ui-bg_glass_75_ffffff_1x400.png | Bin 0 -> 107 bytes .../ui-bg_highlight-soft_75_cccccc_1x100.png | Bin 0 -> 101 bytes .../images/ui-bg_inset-soft_95_fef1ec_1x100.png | Bin 0 -> 123 bytes .../images/ui-icons_222222_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_2e83ff_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_454545_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_888888_256x240.png | Bin 0 -> 4369 bytes .../images/ui-icons_cd0a0a_256x240.png | Bin 0 -> 4369 bytes .../css/custom-theme/jquery-ui-1.8.16.custom.css | 351 + .../Resources/Web/css/jquery.treeTable.css | 47 + .../Resources/Web/css/ohm_web.css | 39 + .../Resources/Web/images/toggle-collapse-dark.png | Bin 0 -> 2886 bytes .../Resources/Web/images/toggle-collapse-light.png | Bin 0 -> 2864 bytes .../Resources/Web/images/toggle-expand-dark.png | Bin 0 -> 2894 bytes .../Resources/Web/images/toggle-expand-light.png | Bin 0 -> 2863 bytes .../Resources/Web/images/transparent.png | Bin 0 -> 97 bytes .../openhardwaremonitor/Resources/Web/index.html | 61 + .../Resources/Web/js/jquery-1.7.2.js | 9404 ++++++++++++++++++++ .../Resources/Web/js/jquery-1.7.2.min.js | 4 + .../Web/js/jquery-ui-1.8.16.custom.min.js | 111 + .../Resources/Web/js/jquery.tmpl.js | 484 + .../Resources/Web/js/jquery.tmpl.min.js | 10 + .../Resources/Web/js/jquery.treeTable.min.js | 8 + .../Resources/Web/js/knockout-2.1.0.js | 3443 +++++++ .../Resources/Web/js/knockout-2.1.0.min.js | 86 + .../Resources/Web/js/knockout.mapping-latest.js | 687 ++ .../Web/js/knockout.mapping-latest.min.js | 19 + .../Resources/Web/js/ohm_web.js | 116 + .../openhardwaremonitor/Resources/app.manifest | 19 + .../windows/openhardwaremonitor/Resources/ati.png | Bin 0 -> 937 bytes .../openhardwaremonitor/Resources/barback.png | Bin 0 -> 440 bytes .../openhardwaremonitor/Resources/barblue.png | Bin 0 -> 571 bytes .../openhardwaremonitor/Resources/bigng.png | Bin 0 -> 702 bytes .../windows/openhardwaremonitor/Resources/chip.png | Bin 0 -> 806 bytes .../openhardwaremonitor/Resources/clock.png | Bin 0 -> 354 bytes .../openhardwaremonitor/Resources/computer.png | Bin 0 -> 576 bytes .../openhardwaremonitor/Resources/control.png | Bin 0 -> 814 bytes .../windows/openhardwaremonitor/Resources/cpu.png | Bin 0 -> 611 bytes .../windows/openhardwaremonitor/Resources/data.png | Bin 0 -> 274 bytes .../openhardwaremonitor/Resources/factor.png | Bin 0 -> 533 bytes .../windows/openhardwaremonitor/Resources/fan.png | Bin 0 -> 1107 bytes .../windows/openhardwaremonitor/Resources/flow.png | Bin 0 -> 857 bytes .../openhardwaremonitor/Resources/gadget.png | Bin 0 -> 5969 bytes .../openhardwaremonitor/Resources/gadget.xcf | Bin 0 -> 91414 bytes .../windows/openhardwaremonitor/Resources/hdd.png | Bin 0 -> 649 bytes .../windows/openhardwaremonitor/Resources/icon.ico | Bin 0 -> 15086 bytes .../windows/openhardwaremonitor/Resources/icon.xcf | Bin 0 -> 44594 bytes .../openhardwaremonitor/Resources/level.png | Bin 0 -> 290 bytes .../windows/openhardwaremonitor/Resources/load.png | Bin 0 -> 278 bytes .../openhardwaremonitor/Resources/mainboard.png | Bin 0 -> 824 bytes .../openhardwaremonitor/Resources/nvidia.png | Bin 0 -> 944 bytes .../openhardwaremonitor/Resources/power.png | Bin 0 -> 293 bytes .../windows/openhardwaremonitor/Resources/ram.png | Bin 0 -> 768 bytes .../openhardwaremonitor/Resources/smallicon.ico | Bin 0 -> 1150 bytes .../openhardwaremonitor/Resources/temperature.png | Bin 0 -> 721 bytes .../openhardwaremonitor/Resources/voltage.png | Bin 0 -> 639 bytes .../Utilities/EmbeddedResources.cs | 65 + .../openhardwaremonitor/Utilities/HttpServer.cs | 389 + .../openhardwaremonitor/Utilities/IconFactory.cs | 175 + .../openhardwaremonitor/Utilities/Logger.cs | 186 + .../Utilities/PersistentSettings.cs | 196 + agents/windows/openhardwaremonitor/WMI/Hardware.cs | 38 + .../windows/openhardwaremonitor/WMI/IWmiObject.cs | 20 + agents/windows/openhardwaremonitor/WMI/Sensor.cs | 53 + .../windows/openhardwaremonitor/WMI/WmiProvider.cs | 127 + 217 files changed, 42239 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=558609c7ff…

8 years, 3 months

#3084 FIX windows agent: fixed crash when specifying an invalid performance counter

by Sebastian Herbord

Module: check_mk Branch: master Commit: d8099b8fe58551471e62547bcd8d3047a0842c76 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8099b8fe58551… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 29 11:27:35 2016 +0100 #3084 FIX windows agent: fixed crash when specifying an invalid performance counter --- .werks/3084 | 10 ++++ ChangeLog | 1 + agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 909824 -> 910336 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 909824 -> 910336 bytes agents/windows/check_mk_agent.cc | 56 ++++++++++++---------- agents/windows/check_mk_agent.exe | Bin 835584 -> 836096 bytes agents/windows/check_mk_agent.msi | Bin 2006016 -> 2007040 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 835584 -> 836096 bytes agents/windows/install_agent-64.exe | Bin 418319 -> 418357 bytes agents/windows/install_agent.exe | Bin 408689 -> 408775 bytes 11 files changed, 42 insertions(+), 27 deletions(-) diff --git a/.werks/3084 b/.werks/3084 new file mode 100644 index 0000000..fbeae04 --- /dev/null +++ b/.werks/3084 @@ -0,0 +1,10 @@ +Title: windows agent: fixed crash when specifying an invalid performance counter +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456741537 + + diff --git a/ChangeLog b/ChangeLog index 0bb1187..3d7dc78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -48,6 +48,7 @@ * 3243 FIX: Fix missing custom graphs in sidebar snapin Views if explicit topic is set * 3245 FIX: Fix interpretation of check levels 0.0 as "no levels"... * 3250 FIX: cisco_mem: remove bogus memory check for "Driver text"... + * 3084 FIX: windows agent: fixed crash when specifying an invalid performance counter Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/windows/build_version b/agents/windows/build_version index 7776e09..e847bdc 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -1358 +1364 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index 100123c..202327b 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 1a8714e..dcd99f0 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.cc b/agents/windows/check_mk_agent.cc index c654791..427b2b6 100644 --- a/agents/windows/check_mk_agent.cc +++ b/agents/windows/check_mk_agent.cc @@ -586,36 +586,40 @@ void dump_performance_counters(OutputProxy &out, unsigned counter_base_number, const char *countername) { crash_log("<<<winperf_%s>>>", countername); - PerfCounterObject counterObject(counter_base_number); - - if (!counterObject.isEmpty()) { - LARGE_INTEGER Frequency; - QueryPerformanceFrequency(&Frequency); - out.output("<<<winperf_%s>>>\n", countername); - out.output("%.2f %u %" PRId64 "\n", current_time(), counter_base_number, - Frequency.QuadPart); - - std::vector<PERF_INSTANCE_DEFINITION *> instances = - counterObject.instances(); - // output instances - if any - if (instances.size() > 0) { - out.output("%d instances:", static_cast<int>(instances.size())); - for (std::wstring name : counterObject.instanceNames()) { - std::replace(name.begin(), name.end(), L' ', L'_'); - out.output(" %s", to_utf8(name.c_str()).c_str()); + try { + PerfCounterObject counterObject(counter_base_number); + + if (!counterObject.isEmpty()) { + LARGE_INTEGER Frequency; + QueryPerformanceFrequency(&Frequency); + out.output("<<<winperf_%s>>>\n", countername); + out.output("%.2f %u %" PRId64 "\n", current_time(), counter_base_number, + Frequency.QuadPart); + + std::vector<PERF_INSTANCE_DEFINITION *> instances = + counterObject.instances(); + // output instances - if any + if (instances.size() > 0) { + out.output("%d instances:", static_cast<int>(instances.size())); + for (std::wstring name : counterObject.instanceNames()) { + std::replace(name.begin(), name.end(), L' ', L'_'); + out.output(" %s", to_utf8(name.c_str()).c_str()); + } + out.output("\n"); } - out.output("\n"); - } - // output counters - for (const PerfCounter &counter : counterObject.counters()) { - out.output("%d", static_cast<int>(counter.titleIndex()) - - static_cast<int>(counter_base_number)); - for (ULONGLONG value : counter.values(instances)) { - out.output(" %" PRIu64, value); + // output counters + for (const PerfCounter &counter : counterObject.counters()) { + out.output("%d", static_cast<int>(counter.titleIndex()) - + static_cast<int>(counter_base_number)); + for (ULONGLONG value : counter.values(instances)) { + out.output(" %" PRIu64, value); + } + out.output(" %s\n", counter.typeName().c_str()); } - out.output(" %s\n", counter.typeName().c_str()); } + } catch (const std::exception &e) { + crash_log("Exception: %s", e.what()); } } diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index 77800b6..920b73e 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 994de6b..506e786 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index e1f7237..82df89c 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index cc4cff8..92c6baf 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index af99acc..57f90ad 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

8 years, 3 months

#3251 FIX Fix sorting of entries in Views sidebar element

by Mathias Kettner

Module: check_mk Branch: master Commit: 656eca2d6751361138d70c0a88181f7490cd3b54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=656eca2d675136… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Mon Feb 29 11:18:37 2016 +0100 #3251 FIX Fix sorting of entries in Views sidebar element --- .werks/3251 | 10 ++++++++++ ChangeLog | 1 + web/plugins/sidebar/shipped.py | 3 +-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/3251 b/.werks/3251 new file mode 100644 index 0000000..71104c4 --- /dev/null +++ b/.werks/3251 @@ -0,0 +1,10 @@ +Title: Fix sorting of entries in Views sidebar element +Level: 2 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456741105 + + diff --git a/ChangeLog b/ChangeLog index 5d1f7bc..0bb1187 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ * 3077 FIX: CSV export is now available for host/service availability and now includes summary line * 3181 FIX: Omit icon for downloading agent output on shadow hosts (cmcdump)... * 3248 FIX: Avoid broken list of context filters and case of a BI error + * 3251 FIX: Fix sorting of entries in Views sidebar element WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 48878a9..fc593b0 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -136,8 +136,7 @@ def render_views(): del page_type_topics[topic] all_topics_with_entries.append((topic, entries)) - all_topics_with_entries += page_type_topics.items() - all_topics_with_entries.sort() + all_topics_with_entries += sorted(page_type_topics.items()) for topic, entries in all_topics_with_entries: render_topic(topic, entries)

8 years, 3 months

#3253 FIX sms: notification script sms now handles single quotes in the message in the right way

by Simon Betz

Module: check_mk Branch: master Commit: 1afa42765f95d0169dbb43b90d8495f9c745b5d5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1afa42765f95d0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 29 11:01:56 2016 +0100 #3253 FIX sms: notification script sms now handles single quotes in the message in the right way --- .werks/3253 | 10 ++++++++++ ChangeLog | 3 +++ notifications/sms | 5 +++-- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/3253 b/.werks/3253 new file mode 100644 index 0000000..a3f629b --- /dev/null +++ b/.werks/3253 @@ -0,0 +1,10 @@ +Title: sms: notification script sms now handles single quotes in the message in the right way +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1456740033 + + diff --git a/ChangeLog b/ChangeLog index d2791a1..5d1f7bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -74,6 +74,9 @@ * 2998 FIX: Fixed broken WATO rules where content is dynamically loaded... * 3246 FIX: Fix link for editing a BI aggregation after coming back from the details of another aggregation... + Notifications: + * 3253 FIX: sms: notification script sms now handles single quotes in the message in the right way + BI: * 3247 FIX: Do not allow multiple BI aggregates with the same title... diff --git a/notifications/sms b/notifications/sms index 20d0d01..5512028 100755 --- a/notifications/sms +++ b/notifications/sms @@ -87,16 +87,17 @@ elif notification_type == "CUSTOM": message += " " + os.environ['NOTIFY_NOTIFICATIONCOMMENT'] recipient = os.environ['NOTIFY_CONTACTPAGER'].replace(" ", "") +quoted_message = "'" + message.replace("'", "'\"'\"'") + "'" if send_path: - if os.system("%s %s '%s'" % (send_path, recipient, message[:160])) >> 8 != 0: + if os.system("%s %s %s" % (send_path, recipient, quoted_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.write(fd, 'To: %s\n\n%s' % (recipient, quoted_message)) os.close(fd) os.chmod(path, 0660) filename = path.split('/')[-1]

8 years, 3 months

Reserved 10 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 0eade92a828474c201615b6b0895b7e16cf9e5b2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0eade92a828474… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 29 11:00:01 2016 +0100 Reserved 10 Werk IDS --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index b17e71b..0704415 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -3253 +3263

8 years, 3 months

#3083 mk_jolokia: The plugin can now be configured with a service url to treat the jolokia server as a jmx proxy

by Sebastian Herbord

Module: check_mk Branch: master Commit: e80595028fdac198be68efc48f0b5a6b75a0b3b4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e80595028fdac1… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Mon Feb 29 10:09:12 2016 +0100 #3083 mk_jolokia: The plugin can now be configured with a service url to treat the jolokia server as a jmx proxy --- .werks/3083 | 9 ++++ ChangeLog | 1 + agents/plugins/mk_jolokia | 122 +++++++++++++++++++++++++++++++-------------- 3 files changed, 95 insertions(+), 37 deletions(-) diff --git a/.werks/3083 b/.werks/3083 new file mode 100644 index 0000000..6f70e0a --- /dev/null +++ b/.werks/3083 @@ -0,0 +1,9 @@ +Title: mk_jolokia: The plugin can now be configured with a service url to treat the jolokia server as a jmx proxy +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1456736890 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 10c47b6..d2791a1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,7 @@ * 3190 entity_sensors, entity_sensors.fan: new checks monitoring temperature and fan sensors of devices such as Palo Alto Networks which support the ENTITY-SENSORS-MIB * 3081 mk_jolokia: plugin now supports setting custom CAs for verifying server certificate as well as sending a client certificate... * 3191 cisco_redundancy: new check which monitors the status of the redundant unit of Cisco devices supporting the CISCO-RF-MIB + * 3083 mk_jolokia: The plugin can now be configured with a service url to treat the jolokia server as a jmx proxy * 3073 FIX: windows agent: relative paths to mrpe scripts are now treated as relative to the agent installation directory... * 3061 FIX: mk_jolokia: Fixed debugging of the agent plugin * 3074 FIX: windows agent: fixed incorrect values for 32-bit performance counters diff --git a/agents/plugins/mk_jolokia b/agents/plugins/mk_jolokia index 451f588..10f7216 100755 --- a/agents/plugins/mk_jolokia +++ b/agents/plugins/mk_jolokia @@ -56,7 +56,6 @@ class PreemptiveBasicAuthHandler(urllib2.HTTPBasicAuthHandler): https_request = http_request - class HTTPSValidatingConnection(HTTPSConnection): def __init__(self, host, ca_file, key_file, cert_file): HTTPSConnection.__init__(self, host, key_file=key_file, cert_file=cert_file) @@ -90,39 +89,80 @@ class HTTPSAuthHandler(urllib2.HTTPSHandler): return HTTPSValidatingConnection(host, ca_file=self.__ca_file, key_file=self.__key, cert_file=self.__cert) +def fetch_url_get(base_url, path): + if path: + url = "%s/read/%s" % (base_url, path) + else: + url = base_url -def fetch_var(protocol, server, port, path, suburi, cert_path, itemspec): - url = "%s://%s:%d/%s/%s" % (protocol, server, port, suburi, path) if opt_verbose: sys.stderr.write("DEBUG: Fetching: %s\n" % url) try: - conn = urllib2.urlopen(url) - data = conn.read() + json_data = urllib2.urlopen(url).read() + if opt_verbose: + sys.stderr.write("DEBUG: Result: %s\n\n" % json_data) + except Exception, e: + if opt_debug: + raise + sys.stderr.write("ERROR: %s\n" % e) + return [] + return json_data + +def fetch_url_post(base_url, path, service_url, service_user, service_password): + segments = path.split("/") + + data = { + "type": "READ", + "mbean": segments[0], + "attribute": segments[1], + "target": { + "url": service_url, + }, + } + if len(segments) > 2: + data["path"] = segments[2] + + if service_user: + data["target"]["username"] = service_user + data["target"]["password"] = service_password + + if opt_verbose: + sys.stderr.write("DEBUG: Fetching: %s\n" % base_url) + try: + json_data = urllib2.urlopen(base_url, data=json.dumps(data)).read() if opt_verbose: - sys.stderr.write("DEBUG: Result: %s\n\n" % data) + sys.stderr.write("DEBUG: Result: %s\n\n" % json_data) except Exception, e: if opt_debug: raise sys.stderr.write("ERROR: %s\n" % e) return [] + return json_data + +def fetch_var(protocol, server, port, path, suburi, itemspec, service_url, service_user, service_password): + base_url = "%s://%s:%d/%s" % (protocol, server, port, suburi) + if service_url is not None: + json_data = fetch_url_post(base_url, path, service_url, service_user, service_password) + else: + json_data = fetch_url_get(base_url, path) try: true = True false = False null = None if json: - obj = json.loads(data) + obj = json.loads(json_data) else: - obj = eval(data) + obj = eval(json_data) except Exception, e: sys.stderr.write('ERROR: Invalid json code (%s)\n' % e) - sys.stderr.write(' Response %s\n' % data) + sys.stderr.write(' Response %s\n' % json_data) return [] if obj.get('status', 200) != 200: - sys.stderr.write('ERROR: Invalid response when fetching url %s\n' % url) - sys.stderr.write(' Response: %s\n' % data) + sys.stderr.write('ERROR: Invalid response when fetching url %s\n' % base_url) + sys.stderr.write(' Response: %s\n' % json_data) return [] # Only take the value of the object. If the value is an object @@ -215,7 +255,8 @@ def query_instance(inst): # Determine type of server server_info = fetch_var(inst["protocol"], inst["server"], inst["port"], "", inst["suburi"], - inst["cert_path"], "") + "", None, None, None) + sys.stdout.write('<<<jolokia_info>>>\n') if server_info: d = dict(server_info) @@ -235,8 +276,9 @@ def query_instance(inst): # Fetch the general information first for path, title, itemspec in global_vars + specific_vars.get(product, []): try: - values = fetch_var(inst["protocol"], inst["server"], inst["port"], "read/" + path, - inst["suburi"], inst["cert_path"], itemspec) + values = fetch_var(inst["protocol"], inst["server"], inst["port"], path, + inst["suburi"], itemspec, + inst["service_url"], inst["service_user"], inst["service_password"]) # In case of network errors skip this server except IOError: @@ -273,17 +315,20 @@ def query_instance(inst): # Default configuration for all instances -protocol = "http" -server = "localhost" -port = 8080 -user = "monitoring" -password = None -mode = "digest" -suburi = "jolokia" -instance = None -cert_path = "_default" -client_cert = None -client_key = None +protocol = "http" +server = "localhost" +port = 8080 +user = "monitoring" +password = None +mode = "digest" +suburi = "jolokia" +instance = None +cert_path = "_default" +client_cert = None +client_key = None +service_url = None +service_user = None +service_password = None global_vars = [ ( "java.lang:type=Memory/NonHeapMemoryUsage/used", "NonHeapMemoryUsage", [] ), @@ -358,18 +403,21 @@ socket.setdefaulttimeout(1.0) # instances in his configuration, we will use this (a list # of dicts). for inst in instances: - for varname, value in [ - ( "protocol", protocol ), - ( "server", server ), - ( "port", port ), - ( "user", user ), - ( "password", password ), - ( "mode", mode ), - ( "suburi", suburi ), - ( "instance", instance ), - ( "cert_path", cert_path ), - ( "client_cert", client_cert ), - ( "client_key", client_key ), + for varname, value in [ + ("protocol", protocol), + ("server", server), + ("port", port), + ("user", user), + ("password", password), + ("mode", mode), + ("suburi", suburi), + ("instance", instance), + ("cert_path", cert_path), + ("client_cert", client_cert), + ("client_key", client_key), + ("service_url", service_url), + ("service_user", service_user), + ("service_password", service_password) ]: if varname not in inst: inst[varname] = value

8 years, 3 months

#3192 snmp_extended_info: now inventorizes all physical components of devices which support the ENTITY-MIB

by Simon Betz

Module: check_mk Branch: master Commit: 99a0b01b993bf284289df386b2b5587777c0afce URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=99a0b01b993bf2… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Feb 29 10:00:17 2016 +0100 #3192 snmp_extended_info: now inventorizes all physical components of devices which support the ENTITY-MIB --- .werks/3192 | 9 +++++ ChangeLog | 1 + inventory/snmp_extended_info | 72 ++++++++++++++++++++++++++-------- web/plugins/views/inventory.py | 83 ++++++++++++++++++++++++++++++++++------ 4 files changed, 136 insertions(+), 29 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=99a0b01b99…

8 years, 3 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2016