Checkmk git commits September 2017

checkmk-commits@lists.checkmk.com

11 participants
255 discussions

5293 ucs_bladecenter_if: Now detects 'Direct Server Connect' interfaces

by Simon Betz

Module: check_mk Branch: master Commit: 7c8c29157360eb4c6d4a4d8993e7109d52e51a52 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7c8c29157360eb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 19 16:15:55 2017 +0200 5293 ucs_bladecenter_if: Now detects 'Direct Server Connect' interfaces Change-Id: Iee3d9ca9738f615f4c67032a9d935703638690bd --- .werks/5293 | 11 +++++++++++ checks/ucs_bladecenter_if | 3 +++ 2 files changed, 14 insertions(+) diff --git a/.werks/5293 b/.werks/5293 new file mode 100644 index 0000000..acc43c9 --- /dev/null +++ b/.werks/5293 @@ -0,0 +1,11 @@ +Title: ucs_bladecenter_if: Now detects 'Direct Server Connect' interfaces +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1505830436 +Class: feature + +The internal description of these interfaces is 'fabricDceSwSrvEp'. +These are directrly connected and not part of any interface group. diff --git a/checks/ucs_bladecenter_if b/checks/ucs_bladecenter_if index 3aed73c..6b3e87f 100644 --- a/checks/ucs_bladecenter_if +++ b/checks/ucs_bladecenter_if @@ -85,6 +85,9 @@ def parse_ucs_bladecenter_if(info): for key, values in data.get("fabricDceSwEp", {}).items(): icnt_interfaces.setdefault(values["EpDn"], {}).update(values) + for key, values in data.get("fabricDceSwSrvEp", {}).items(): + icnt_interfaces.setdefault(values["EpDn"], {}).update(values) + # Get info for each portchannel icnt_pc_info = {} for key, values in data.get("fabricDceSwSrvPc", {}).items():

6 years, 9 months

5034 FIX Do not skip first entry in Windows eventlog

by Jukka Aro

Module: check_mk Branch: master Commit: 2acc0bab874ced06914099d0d2a363933552231e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2acc0bab874ced… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Sep 25 11:53:07 2017 +0200 5034 FIX Do not skip first entry in Windows eventlog Change-Id: I27ad8b00fc69460c2d66e84720e0f343c0153c5e --- .werks/5034 | 11 +++++++++++ agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1565696 -> 1565696 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 22788184 -> 22788184 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1565696 -> 1565696 bytes agents/windows/check_mk_agent.exe | Bin 1548800 -> 1548800 bytes agents/windows/check_mk_agent.msi | Bin 3388416 -> 3388416 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 19628575 -> 19628575 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1548800 -> 1548800 bytes agents/windows/crash.exe | Bin 358864 -> 358864 bytes agents/windows/install_agent-64.exe | Bin 681445 -> 681479 bytes agents/windows/install_agent.exe | Bin 676321 -> 676294 bytes agents/windows/nowin.exe | Bin 361000 -> 361000 bytes agents/windows/plugins/mk_jolokia.exe | Bin 10106814 -> 10106814 bytes agents/windows/sections/SectionEventlog.cc | 2 +- 15 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/5034 b/.werks/5034 new file mode 100644 index 0000000..4aec9a5 --- /dev/null +++ b/.werks/5034 @@ -0,0 +1,11 @@ +Title: Do not skip first entry in Windows eventlog +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506332777 +Class: fix +Under certain circumstances, the first entry in Windows eventlog was skipped after starting the Windows agent. Now the first entry is always processed as expected. + + diff --git a/agents/windows/build_version b/agents/windows/build_version index ca6b285..004f50e 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2930 +2932 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index b25ea52..89f0811 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.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index 2d98db5..d276630 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 8ffadee..cfacf5d 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.exe b/agents/windows/check_mk_agent.exe index 95e5761..49ac323 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 98f3486..033e7ce 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.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 2fba349..2bb1a6d 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index f33fcf1..2431dfe 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/crash.exe b/agents/windows/crash.exe index 0a372ec..5b4e532 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index b3fa517..f194649 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 f5cfc01..8223242 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index 627f396..c83e8aa 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index de94659..21327e4 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index 558422c..49b2ec7 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -178,7 +178,7 @@ void SectionEventlog::outputEventlog(std::ostream &out, const char *logname, // it bool record_maxxed = std::numeric_limits<uint64_t>::max() == first_record; - first_record = log->seek(first_record + (record_maxxed ? 0 : 1)); + log->seek(first_record + (record_maxxed ? 0 : 1)); uint64_t last_record = first_record;

6 years, 9 months

Reserved 10 Werk IDS

by Jukka Aro

Module: check_mk Branch: master Commit: a3508dc48fa0f60861766f6b1f71a1fe5f0e7cf1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3508dc48fa0f6… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Sep 25 11:36:20 2017 +0200 Reserved 10 Werk IDS Change-Id: Id1d33086d5781356063034ec3244c58de8dc3427 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4390a28..e3aa502 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5328 +5338

6 years, 9 months

5310 dell_idrac_virtdisks: Added raid level information

by Simon Betz

Module: check_mk Branch: master Commit: e117da53156b96fe980f437ba535c2be33f4d8af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e117da53156b96… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 22 10:49:26 2017 +0200 5310 dell_idrac_virtdisks: Added raid level information Change-Id: Ie6058a41d71cd8810f821c6ed8f758f95ad5d84e --- .werks/5310 | 10 ++++++++++ checkman/dell_idrac_virtdisks | 6 +++--- checks/dell_idrac_virtdisks | 16 +++++++++++++++- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/.werks/5310 b/.werks/5310 new file mode 100644 index 0000000..67135e2 --- /dev/null +++ b/.werks/5310 @@ -0,0 +1,10 @@ +Title: dell_idrac_virtdisks: Added raid level information +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506070066 +Class: feature + + diff --git a/checkman/dell_idrac_virtdisks b/checkman/dell_idrac_virtdisks index dc39144..1d1a673 100644 --- a/checkman/dell_idrac_virtdisks +++ b/checkman/dell_idrac_virtdisks @@ -4,9 +4,9 @@ catalog: hw/server/dell license: GPL distribution: check_mk description: - This checks monitors the disk and component status of a Dell iDrac and - gives information about the number of physical disks which can be lost - before the$ virtual disk loses its redundancy. + This checks monitors the disk, raid level and component status of a + Dell iDrac and gives information about the number of physical disks + which can be lost before the$ virtual disk loses its redundancy. The check goes CRIT if the disk fails or is degraded or if the component reports critical or non-recoverable. diff --git a/checks/dell_idrac_virtdisks b/checks/dell_idrac_virtdisks index 39f76f6..dcee4dd 100644 --- a/checks/dell_idrac_virtdisks +++ b/checks/dell_idrac_virtdisks @@ -59,9 +59,22 @@ def check_dell_idrac_virtdisks(item, _no_params, info): "5" : (2, "critical"), "6" : (2, "non-recoverable"), }, + "raidlevel" : { + "1" : "none", + "2" : "Raid-0", + "3" : "Raid-1", + "4" : "Raid-5", + "5" : "Raid-6", + "6" : "Raid-10", + "7" : "Raid-50", + "8" : "Raid-60", + }, + } - for name, disk_state, component_state, redundancy in info: + for name, disk_state, raid_level, component_state, redundancy in info: if item == name: + yield 0, "Raid level: %s" % map_states["raidlevel"][raid_level] + for what, what_key in [ (disk_state, "Disk"), (component_state, "Component")]: @@ -79,6 +92,7 @@ check_info["dell_idrac_virtdisks"] = { "snmp_info" : (".1.3.6.1.4.1.674.10892.5.5.1.20.140.1.1", [ "2", # virtualDiskName "4", # virtualDiskState + "13", # virtualDiskRaidLevel "20", # virtualComponentStatus "34", # virtualDiskRemainingRedundancy ]),

6 years, 9 months

Removed comment

by Simon Betz

Module: check_mk Branch: master Commit: 9b3ce4f9bb058e02d8a7d9a48a8c78074f958467 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b3ce4f9bb058e… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Sep 25 10:47:56 2017 +0200 Removed comment Change-Id: Ic053e78d8b6eaaa958134dfebb0304c5d0f44496 --- checks/dell_idrac_disks | 2 -- 1 file changed, 2 deletions(-) diff --git a/checks/dell_idrac_disks b/checks/dell_idrac_disks index 2a1fae1..9a5f0dc 100644 --- a/checks/dell_idrac_disks +++ b/checks/dell_idrac_disks @@ -40,8 +40,6 @@ # .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.55.1 Disk 0 in Backplane 1 of Integrated RAID Controller 1 --> IDRAC-MIB::physicalDiskDisplayName.1 # .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.55.2 Disk 1 in Backplane 1 of Integrated RAID Controller 1 --> IDRAC-MIB::physicalDiskDisplayName.2 -# 2017-08-04: M. Hoffmann (MPI of Biochemistry): added rebuild/copyback information - def inventory_dell_idrac_disks(info): inventory = []

6 years, 9 months

names of functions are now similar to check plugin name

by Marcel Arentz

Module: check_mk Branch: master Commit: e0e010eb4345526e86824cfbff0146c66226b0ef URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0e010eb434552… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Sep 25 10:53:06 2017 +0200 names of functions are now similar to check plugin name Change-Id: I80f6c2e42629906da249f62971dd1b988ebbc1e5 --- checks/dell_om_fans | 24 ++++++++++++------------ checks/dell_om_power | 16 ++++++++-------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/checks/dell_om_fans b/checks/dell_om_fans index e4835f4..2096e87 100644 --- a/checks/dell_om_fans +++ b/checks/dell_om_fans @@ -26,11 +26,11 @@ -def inventory_dell_idrac_fans(info): +def inventory_dell_om_fans(info): for line in info: yield ( line[0], {} ) -def check_dell_idrac_fans(item, params, info): +def check_dell_om_fans(item, params, info): translate_status = { "1" : (3, "OTHER"), "2" : (3, "UNKNOWN"), @@ -64,19 +64,19 @@ def check_dell_idrac_fans(item, params, info): check_info["dell_om_fans"] = { - "check_function" : check_dell_idrac_fans, - "inventory_function" : inventory_dell_idrac_fans, + "check_function" : check_dell_om_fans, + "inventory_function" : inventory_dell_om_fans, "service_description" : "Fan %s", "snmp_scan_function" : scan_dell_om, "snmp_info" : (".1.3.6.1.4.1.674.10892.1.700.12.1", [ - "2", # IDRAC-MIB::coolingDeviceIndex - "5", # IDRAC-MIB::coolingDeviceStatus - "6", # IDRAC-MIB::coolingDeviceReading - "8", # IDRAC-MIB::coolingDeviceLocationName - "10", # IDRAC-MIB::coolingDeviceUpperNonCriticalThreshold - "11", # IDRAC-MIB::coolingDeviceUpperCriticalThreshold - "12", # IDRAC-MIB::coolingDeviceLowerNonCriticalThreshold - "13", # IDRAC-MIB::coolingDeviceLowerCriticalThreshold + "2", # MIB-Dell-10892::coolingDeviceIndex + "5", # MIB-Dell-10892::coolingDeviceStatus + "6", # MIB-Dell-10892::coolingDeviceReading + "8", # MIB-Dell-10892::coolingDeviceLocationName + "10", # MIB-Dell-10892::coolingDeviceUpperNonCriticalThreshold + "11", # MIB-Dell-10892::coolingDeviceUpperCriticalThreshold + "12", # MIB-Dell-10892::coolingDeviceLowerNonCriticalThreshold + "13", # MIB-Dell-10892::coolingDeviceLowerCriticalThreshold ]), "includes" : [ "fan.include", "dell_om.include" ], "group" : "hw_fans", diff --git a/checks/dell_om_power b/checks/dell_om_power index 93a8245..cdffb91 100644 --- a/checks/dell_om_power +++ b/checks/dell_om_power @@ -39,12 +39,12 @@ # .1.3.6.1.4.1.674.10892.1.600.12.1.8.1.2 PS2 Status -def inventory_dell_idrac_power(info): +def inventory_dell_om_power(info): for index, status, count in info[0]: yield ( index, None ) -def check_dell_idrac_power(item, params, info): +def check_dell_om_power(item, params, info): translate_status = { "1" : (3, "other"), "2" : (3, "unknown"), @@ -62,8 +62,8 @@ def check_dell_idrac_power(item, params, info): check_info['dell_om_power'] = { - 'inventory_function' : inventory_dell_idrac_power, - 'check_function' : check_dell_idrac_power, + 'inventory_function' : inventory_dell_om_power, + 'check_function' : check_dell_om_power, 'service_description' : 'Power Supply Redundancy %s', 'snmp_info' : [ ('.1.3.6.1.4.1.674.10892.1.600.10.1', [ "2", # MIB-Dell-10892::powerUnitIndex @@ -82,12 +82,12 @@ check_info['dell_om_power'] = { } -def inventory_dell_idrac_power_unit(info): +def inventory_dell_om_power_unit(info): for line in info[1]: yield ( line[0], None ) -def check_dell_idrac_power_unit(item, _no_params, info): +def check_dell_om_power_unit(item, _no_params, info): translate_status = { "1" : (3, "OTHER"), "2" : (3, "UNKNOWN"), @@ -119,7 +119,7 @@ def check_dell_idrac_power_unit(item, _no_params, info): ( state_readable, psu_type_readable, location ) check_info['dell_om_power.unit'] = { - 'inventory_function' : inventory_dell_idrac_power_unit, - 'check_function' : check_dell_idrac_power_unit, + 'inventory_function' : inventory_dell_om_power_unit, + 'check_function' : check_dell_om_power_unit, 'service_description' : 'Power Supply %s', }

6 years, 9 months

5292 FIX ucs_bladecenter_if: Fixed wrong indexing of single interfaces

by Simon Betz

Module: check_mk Branch: master Commit: 143cbaf1ec0afa87b4a531a207ba77ce2e8a67d6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=143cbaf1ec0afa… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Sep 19 16:13:09 2017 +0200 5292 FIX ucs_bladecenter_if: Fixed wrong indexing of single interfaces Change-Id: Ida8143ec79e3f361bf8c00c62ab53c841f2e35a2 --- .werks/5292 | 14 ++++++++++++++ checks/ucs_bladecenter_if | 23 ++++++++--------------- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/.werks/5292 b/.werks/5292 new file mode 100644 index 0000000..c58d95d --- /dev/null +++ b/.werks/5292 @@ -0,0 +1,14 @@ +Title: ucs_bladecenter_if: Fixed wrong indexing of single detected interfaces +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.5.0i1 +Date: 1505830369 +Class: fix + +Indexing of single interfaces was wrong which had only an impact +on single discovered interfaces where the index was used as item +in service description. +Interface groups and single interfaces with interface alias or +description are not affected. diff --git a/checks/ucs_bladecenter_if b/checks/ucs_bladecenter_if index d98ded7..3aed73c 100644 --- a/checks/ucs_bladecenter_if +++ b/checks/ucs_bladecenter_if @@ -252,7 +252,6 @@ def parse_ucs_bladecenter_if(info): } } - # Ethernet converted = [] last_index = 0 @@ -261,39 +260,34 @@ def parse_ucs_bladecenter_if(info): ("ethernet", "Ethernet-Group", eth_interfaces, "Slot %s Switch %s Port %s"), ("interconnect", "Interconnect-Group", icnt_interfaces, "Slot %s IC-Switch %s Port %s"), ]: + index = 0 for index, (name, values) in enumerate(interfaces.items()): item = item_template % ( values.get("SlotId"), values.get("SwitchId"), values.get("PortId") ) - entry = ['0'] * 20 converted.append(entry) # Interfaces in portchannels are automatically grouped by within if.include # Grouped interfaces are identified when the type of the ifIndex field is a tuple + # Speed and OperState if "portchannel" in values: entry[0] = (group_prefix + " " + values["portchannel"].get("Name", values["portchannel"].get("PortId", "")),\ - str(last_index + index)) - else: - entry[0] = str(last_index + index) - entry[1] = item - - # Speed and OperState - if values.get("portchannel"): + str(last_index + index)) speed = values["portchannel"].get("AdminSpeed") or values["portchannel"].get("OperSpeed") # It looks like that the AdminSpeed of a portchannel is the speed of one member # speed = str(int(float(speed.replace("gbps", "000000000")) / values["portchannel"]["members"])) - speed = speed.replace("gbps", "000000000") + entry[3] = speed.replace("gbps", "000000000") operStatus = values["portchannel"].get("AdminState", "disabled") == "enabled" and \ values["portchannel"].get("OperState", "down") == "up" else: - speed = values.get("AdminSpeed", "").replace("gbps", "000000000") + entry[0] = str(last_index + index) + entry[3] = values.get("AdminSpeed", "").replace("gbps", "000000000") operStatus = values.get("AdminState", "disabled") == "enabled" and \ values.get("OperState", "down") == "up" - entry[3] = speed + entry[1] = item entry[4] = operStatus and "1" or "2" - entry[18] = item # ifAlias entry[19] = '' # MAC address not known here for table_index , ctr_keys in tableindex.get(what).items(): @@ -309,8 +303,7 @@ def parse_ucs_bladecenter_if(info): else: ctr_value += int(values.get(ctr_key, "0")) entry[table_index] = str(ctr_value) - else: - index = 0 + last_index += index + 1 return converted

6 years, 9 months

5309 dell_idrac_disks: Added disk power status

by Simon Betz

Module: check_mk Branch: master Commit: a62ea3c72abafe82da181b827a8b04693bace647 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a62ea3c72abafe… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Sep 22 10:49:01 2017 +0200 5309 dell_idrac_disks: Added disk power status Change-Id: I22955b896ff189b7196edc9b58785f242a7d22a1 --- .werks/5309 | 10 ++++++++++ checkman/dell_idrac_disks | 3 +++ checks/dell_idrac_disks | 17 ++++++++++++++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/.werks/5309 b/.werks/5309 new file mode 100644 index 0000000..673f0f5 --- /dev/null +++ b/.werks/5309 @@ -0,0 +1,10 @@ +Title: dell_idrac_disks: Added disk power status +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i1 +Date: 1506070031 +Class: feature + + diff --git a/checkman/dell_idrac_disks b/checkman/dell_idrac_disks index e7ae819..88b8f00 100644 --- a/checkman/dell_idrac_disks +++ b/checkman/dell_idrac_disks @@ -8,6 +8,9 @@ description: 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. + Moreover the disk power status is monitored. The check goes WARN if this status + is REBUILDING, data-erased or COPY-BACK, it's OK in case of no-operation, otherwise + UNKNOWN. item: The compination of EnclosureID, Channel and TargetID seperated by colums diff --git a/checks/dell_idrac_disks b/checks/dell_idrac_disks index 27879f1..2a1fae1 100644 --- a/checks/dell_idrac_disks +++ b/checks/dell_idrac_disks @@ -40,6 +40,8 @@ # .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.55.1 Disk 0 in Backplane 1 of Integrated RAID Controller 1 --> IDRAC-MIB::physicalDiskDisplayName.1 # .1.3.6.1.4.1.674.10892.5.5.1.20.130.4.1.55.2 Disk 1 in Backplane 1 of Integrated RAID Controller 1 --> IDRAC-MIB::physicalDiskDisplayName.2 +# 2017-08-04: M. Hoffmann (MPI of Biochemistry): added rebuild/copyback information + def inventory_dell_idrac_disks(info): inventory = [] @@ -69,14 +71,22 @@ def check_dell_idrac_disks(item, _no_params, info): "5" : (2, "critical"), "6" : (1, "non-recoverable"), }, + "diskpower_states" : { + "1" : (0, "no-operation"), + "2" : (1, "REBUILDING"), + "3" : (1, "data-erased"), + "4" : (1, "COPY-BACK"), + }, } + map_spare_state_info = { "1" : "not a spare", "2" : "dedicated hotspare", "3" : "global hotspare", } + for disk_name, disk_state, capacity_MB, spare_state, \ - component_state, smart_alert, display_name in info: + component_state, smart_alert, diskpower_state, display_name in info: if disk_name == item: yield 0, "[%s] Size: %s" % \ (display_name, get_bytes_human_readable(int(capacity_MB) * 1024 * 1024)) @@ -93,6 +103,10 @@ def check_dell_idrac_disks(item, _no_params, info): if spare_state != "1": yield 0, map_spare_state_info[spare_state] + if diskpower_state != "1": + state, state_readable = map_states["diskpower_states"][diskpower_state] + yield state, "%s" % (state_readable) + check_info["dell_idrac_disks"] = { "check_function" : check_dell_idrac_disks, @@ -106,6 +120,7 @@ check_info["dell_idrac_disks"] = { "22", # physicalDiskSpareState "24", # physicalDiskComponentStatus "31", # physicalDiskSmartAlertIndication + "50", # physicalDiskPowerState "55", # physicalDiskDisplayName ]), }

6 years, 9 months

Fix Windows eventlog output with vista_api=yes

by Jukka Aro

Module: check_mk Branch: master Commit: 9b99cbd30c17ae1de66a3bf64a75a6089cc95d3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9b99cbd30c17ae… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Mon Sep 25 09:46:09 2017 +0200 Fix Windows eventlog output with vista_api=yes The Vista API uses the Win API function EvtFormatMessage that delivers formatted strings with trailing null characters within the allocated wstring buffer size. Until the refactoring done in fc96cd0d661bd51434d252198b574b2dc752a9c6, this did not cause trouble as the wstring to UTF8 conversion was done using the Win API and 'old' C strings. The refactoring introduced C++ standard library conversion that is done on wstring objects instead of C strings. As a consequence, the trailing null character was taken into the formatted message, later causing the socket output to be cut at it. The fix is to trim possible trailing null characters away from the formatted eventlog message. Change-Id: I2bf5c8093c79e6e7babcc6abb15b91e6d23756d5 --- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1565696 -> 1565696 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 22787160 -> 22788184 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1565696 -> 1565696 bytes agents/windows/check_mk_agent.exe | Bin 1548800 -> 1548800 bytes agents/windows/check_mk_agent.msi | Bin 3388416 -> 3388416 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 19627551 -> 19628575 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1548800 -> 1548800 bytes agents/windows/crash.exe | Bin 358864 -> 358864 bytes agents/windows/install_agent-64.exe | Bin 681464 -> 681445 bytes agents/windows/install_agent.exe | Bin 676446 -> 676321 bytes agents/windows/nowin.exe | Bin 361000 -> 361000 bytes agents/windows/plugins/mk_jolokia.exe | Bin 10106814 -> 10106814 bytes agents/windows/sections/SectionEventlog.cc | 11 +++++++++-- 14 files changed, 10 insertions(+), 3 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 9b0efd1..ca6b285 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2928 +2930 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index a292297..b25ea52 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.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index dd1dc1b..2d98db5 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 5cf4442..8ffadee 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.exe b/agents/windows/check_mk_agent.exe index 822aae6..95e5761 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 2093c92..98f3486 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.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index a1f58a0..2fba349 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index c8698a4..f33fcf1 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/crash.exe b/agents/windows/crash.exe index 6069703..0a372ec 100755 Binary files a/agents/windows/crash.exe and b/agents/windows/crash.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index f2fa75d..b3fa517 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 835a251..f5cfc01 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ diff --git a/agents/windows/nowin.exe b/agents/windows/nowin.exe index de789ac..627f396 100755 Binary files a/agents/windows/nowin.exe and b/agents/windows/nowin.exe differ diff --git a/agents/windows/plugins/mk_jolokia.exe b/agents/windows/plugins/mk_jolokia.exe index 1245e08..de94659 100755 Binary files a/agents/windows/plugins/mk_jolokia.exe and b/agents/windows/plugins/mk_jolokia.exe differ diff --git a/agents/windows/sections/SectionEventlog.cc b/agents/windows/sections/SectionEventlog.cc index f945824..558422c 100644 --- a/agents/windows/sections/SectionEventlog.cc +++ b/agents/windows/sections/SectionEventlog.cc @@ -148,10 +148,17 @@ void SectionEventlog::process_eventlog_entry(std::ostream &out, // source is the application that produced the event std::string source_name = to_utf8(event.source()); std::replace(source_name.begin(), source_name.end(), ' ', '_'); - + auto message = event.message(); + // Nice surprise: EvtFormatMessage (used by Vista API) delivers wstring + // messages with trailing null character within the allocated wstring size! + // Later, this causes the socket output to be cut at the 1st null character, + // so we need to trim trailing null(s) away here. + while (message.back() == L'\0') { + message.resize(message.size() - 1); + } out << type_char << " " << timestamp << " " << event.eventQualifiers() << "." << event.eventId() << " " << Utf8(event.source()) << " " - << Utf8(event.message()) << "\n"; + << Utf8(message) << "\n"; } void SectionEventlog::outputEventlog(std::ostream &out, const char *logname,

6 years, 9 months

5295 FIX Service discovery: Fixed permission handling regarding foreign changes if user just performs a service discovery

by Simon Betz

Module: check_mk Branch: master Commit: a98c49386e72a121ac81bb9b34364c0ff51a4cb0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a98c49386e72a1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Sep 20 10:42:00 2017 +0200 5295 FIX Service discovery: Fixed permission handling regarding foreign changes if user just performs a service discovery If a user is not allowed to activate foreign changes but wants to perform a service discovery of hosts configured on slave sites, this action was falsely forbidden by Check_MK showing <tt>There are some changes made by your colleagues that you can not activate because you are not permitted to. You can only activate the changes on the sites that are not affected by these changes.</tt> Only if the user wants to activate these changes and does not have the right permissions the above warning message should be displayed. Change-Id: I22b2c8e4959e4053bedb6507a6ab781d79a5e22d --- .werks/5295 | 18 ++++++++++++++++++ web/htdocs/watolib.py | 20 +++++++++----------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/.werks/5295 b/.werks/5295 new file mode 100644 index 0000000..3b00686 --- /dev/null +++ b/.werks/5295 @@ -0,0 +1,18 @@ +Title: Service discovery: Fixed permission handling regarding foreign changes if user just performs a service discovery +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i1 +Date: 1505896357 + +If a user is not allowed to activate foreign changes but wants to +perform a service discovery of hosts configured on slave sites, +this action was falsely forbidden by Check_MK showing +<tt>There are some changes made by your colleagues that you can not +activate because you are not permitted to. You can only activate +the changes on the sites that are not affected by these changes.</tt> +Only if the user wants to activate these changes and does not have +the right permissions the above warning message should be displayed. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index f6de125..2027b6f 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -4936,18 +4936,16 @@ class ActivateChangesManager(ActivateChanges): def _create_site_sync_snapshot(self, site_id): - has_foreign = self._site_has_foreign_changes(site_id) + if self._site_has_foreign_changes(site_id) and not self._activate_foreign: + if not config.user.may("wato.activateforeign"): + raise MKUserError(None, + _("There are some changes made by your colleagues that you can not " + "activate because you are not permitted to. You can only activate " + "the changes on the sites that are not affected by these changes. " + "<br>" + "If you need to activate your changes on all sites, please contact " + "a permitted user to do it for you.")) - if has_foreign and not config.user.may("wato.activateforeign"): - raise MKUserError(None, - _("There are some changes made by your colleagues that you can not " - "activate because you are not permitted to. You can only activate " - "the changes on the sites that are not affected by these changes. " - "<br>" - "If you need to activate your changes on all sites, please contact " - "a permitted user to do it for you.")) - - if has_foreign and not self._activate_foreign: raise MKUserError(None, _("There are some changes made by your colleagues and you did not " "confirm to activate these changes. In order to proceed, you will "

6 years, 9 months

← Newer
1
...
5
6
7
8
9
10
11
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2017