lists.checkmk.com
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
List overview
Download
Checkmk git commits
August 2011
----- 2024 -----
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
checkmk-commits@lists.checkmk.com
3 participants
272 discussions
Start a n
N
ew thread
Check_MK Git: check_mk: Updated bug entries
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: fd49b640dc8c5111fad4c5259ec693f0c99ebb6f URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd49b640dc8c51…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 22:07:16 2011 +0200 Updated bug entries --- .bugs/148 | 2 +- .bugs/156 | 10 +++++++--- .bugs/200 | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.bugs/148 b/.bugs/148 index 08c404a..072a7de 100644 --- a/.bugs/148 +++ b/.bugs/148 @@ -4,7 +4,7 @@ Benefit: 1 State: open Cost: 1 Date: 2011-02-17 13:47:36 -Class: cleanup +Class: nastiness The the section CHECK PARAMETERS the empty lines between the subsections must be filled with the background color until the line end. diff --git a/.bugs/156 b/.bugs/156 index cc73eae..92a793b 100644 --- a/.bugs/156 +++ b/.bugs/156 @@ -1,10 +1,14 @@ Title: Complete missing SNMP scan functions Component: checks +State: wontfix +Class: cleanup +Date: 2011-02-25 09:42:02 Benefit: 5 -State: open Cost: 3 -Date: 2011-02-25 09:42:02 -Class: cleanup +Fun: 0 A couple of checks still have no SNMP scan function. This must be fixed before 1.1.10. + +2011-08-20 22:06:23: changed state open -> wontfix +Same as #0105 diff --git a/.bugs/200 b/.bugs/200 index 253cd69..45167b3 100644 --- a/.bugs/200 +++ b/.bugs/200 @@ -4,7 +4,7 @@ Benefit: 2 State: open Cost: 3 Date: 2011-03-05 13:41:46 -Class: cleanup +Class: feature Convert how checks declare themselves. This could be done like this:
12 years, 10 months
1
0
0
0
Check_MK Git: check_mk: Multisite: checkman honors OMD"s local hierarchy
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 536fd9cff793b20f62f23c1d5a1131f580957a4c URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=536fd9cff793b2…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 22:51:57 2011 +0200 Multisite: checkman honors OMD"s local hierarchy --- ChangeLog | 1 + web/plugins/views/painters.py | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68196b7..33d6157 100644 --- a/ChangeLog +++ b/ChangeLog @@ -28,6 +28,7 @@ Multisite: * FIX: reschedule now works for host names containing spaces * Bookmarks snapin: save relative URLs whenever possible + * Man-Pages of Check_MK checks shown in Multisite honor OMD's local hierarchy 1.1.11i2: Core, Setup, etc.: diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 2e74f99..d126817 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -713,7 +713,14 @@ def paint_check_manpage(row): if not command.startswith("check_mk-"): return "", "" checktype = command[9:] - p = defaults.check_manpages_dir + "/" + checktype + # Honor man-pages in OMD's local structure + p = None + if defaults.omd_root: + p = defaults.omd_root + "/local/share/check_mk/checkman/" + checktype + if not os.path.isfile(p): + p = None + if not p: + p = defaults.check_manpages_dir + "/" + checktype if os.path.isfile(p): description = None for line in file(p):
12 years, 10 months
1
0
0
0
Check_MK Git: check_mk: Improved inline doku
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 2ef2e3524c5468efaf8e066e05e65b2fe8700094 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ef2e3524c5468…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 23:07:13 2011 +0200 Improved inline doku --- checks/services | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/services b/checks/services index 35fd279..53b9d65 100644 --- a/checks/services +++ b/checks/services @@ -48,8 +48,8 @@ inventory_services = [] # "HirnTest", # add service, if currently running # "TapiSrv running", # the same # "TermService auto", # add service, if start type is auto (regardless if running) -# "BackupSrv auto/running", # add, if start type is auto and it's running -# "~Backup.* auto/running", # same, but add all services matching a regex +# "BackupSrv running/auto", # add, if start type is auto and it's running +# "~Backup.* running/auto", # same, but add all services matching a regex # ( [ "termserver" ] , ALL_HOSTS, [ "HirnTest running", "Sppoller auto" ] ), # same with tags.. # ( ALL_HOSTS, [ "!Backup.*", "FooBar auto" ] ), # ]
12 years, 10 months
1
0
0
0
Check_MK Git: check_mk: mem.win: new check for Windows memory and page file
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: fc205ec29939ef632540fbddfd4ef16610cdd9ed URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fc205ec29939ef…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 17:04:26 2011 +0200 mem.win: new check for Windows memory and page file --- .bugs/21 | 10 ++- ChangeLog | 1 + checkman/mem.used | 14 ++-- checkman/mem.win | 50 +++++++++++++++ checks/mem | 114 +++++++++++++++++++++++++++++---- pnp-rraconf/check_mk-mem.win.rra.cfg | 1 + pnp-templates/check_mk-mem.win.php | 62 ++++++++++++++++++ web/plugins/perfometer/check_mk.py | 18 +++++- 8 files changed, 245 insertions(+), 25 deletions(-) Diff:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=fc205ec299…
12 years, 10 months
1
0
0
0
Check_MK Git: check_mk: FIX: hr_mem: take into account cache and buffers
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 8cacdfe83dd0c8ce0f96ea1af696a8aa52713aaa URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8cacdfe83dd0c8…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 20:59:47 2011 +0200 FIX: hr_mem: take into account cache and buffers --- ChangeLog | 1 + checks/hr_mem | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 217a28d..45b7efd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,6 +12,7 @@ * Show datasource program on cmk -D Checks & Agents: + * FIX: hr_mem: take into account cache and buffers * FIX: printer_pages: workaround for trailing-zero bug in HP Jetdirect * mk_logwatch: allow to set limits in processing time and number of new log messages per log file diff --git a/checks/hr_mem b/checks/hr_mem index 7f7ad8a..d1470d5 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -45,18 +45,27 @@ def check_hr_mem(item, params, info): size = saveint(hrsize) * saveint(hrunits) / 1048576.0 used = saveint(hrused) * saveint(hrunits) / 1048576.0 usage[hrtype] = (size, used) + + # Account for cached memory (this works at least for systems using + # the UCD snmpd (such as Linux based applicances) + cached_mb = 0 + for hrtype, hrdescr, hrunits, hrsize, hrused in info: + if hrdescr in [ "Cached memory", "Memory buffers" ]: + cached_mb += saveint(hrused) * saveint(hrunits) / 1048576.0 + totalram_mb, ramused_mb = usage.get(".1.3.6.1.2.1.25.2.1.2", (0,0)) + ramused_mb -= cached_mb totalvirt_mb, virtused_mb = usage.get(".1.3.6.1.2.1.25.2.1.3", (0,0)) totalmem_mb, totalused_mb = totalram_mb + totalvirt_mb, ramused_mb + virtused_mb if totalmem_mb > 0: - totalused_perc = 100 * totalused_mb / totalmem_mb + totalused_perc = 100 * totalused_mb / totalram_mb perfdata = [ ('ramused', str(ramused_mb) + 'MB', None, None, 0, totalram_mb), ('swapused', str(virtused_mb) + 'MB', None, None, 0, totalvirt_mb) ] - infotext = "%.2f GB RAM+SWAP used (this is %.1f%% of RAM size)" % \ - (totalused_mb / 1024.0, totalused_perc) + infotext = "%.2f GB used (%.2f GB RAM + %.2f GB SWAP, this is %.1f%% of %.2f GB RAM)" % \ + (totalused_mb / 1024.0, ramused_mb / 1024, virtused_mb / 1024, totalused_perc, totalram_mb / 1024.0) warn, crit = params if type(warn) == float:
12 years, 10 months
1
0
0
0
Check_MK Git: check_mk: mem.used: more verbatim checkout output
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 716678bcbd9c6895d71228cef7aceb455f8614e5 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=716678bcbd9c68…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 20:58:59 2011 +0200 mem.used: more verbatim checkout output --- checks/mem | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/checks/mem b/checks/mem index 3bb90a8..8d71a34 100644 --- a/checks/mem +++ b/checks/mem @@ -93,8 +93,9 @@ def check_mem_used(item, params, info): # levels may be given either in int -> MB or in float -> percentages - infotext = ("%.2f GB RAM+SWAP used (this is %.1f%% of RAM size)" % \ - (totalused_mb / 1024.0, totalused_perc)) \ + infotext = ("%.2f GB used (%.2f GB RAM + %.2f GB SWAP, this is %.1f%% of %.2f GB RAM)" % \ + (totalused_mb / 1024.0, (memused-caches) / 1024.0 / 1024, swapused / 1024.0 / 1024, + totalused_perc, totalmem_mb / 1024.0)) \ + extrainfo if type(warn) == float:
12 years, 10 months
1
0
0
0
Check_MK Git: check_mk: hr_mem: added Perf-O-Meter
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: f38faa017112b24780b4722f327d7ce7087f22f7 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f38faa017112b2…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 21:00:16 2011 +0200 hr_mem: added Perf-O-Meter --- ChangeLog | 1 + web/plugins/perfometer/check_mk.py | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45b7efd..e4ebf73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ * printer_supply: support non-Ascii characters in items like "Resttonerbehälter". You need to define snmp_character_encodings in main.mk * mem.win: new dedicated memory check for Windows (see Migration notes) + * hr_mem: added Perf-O-Meter MK Livestatus: * WaitObject: allow to separate host name and service with a semicolon. diff --git a/web/plugins/perfometer/check_mk.py b/web/plugins/perfometer/check_mk.py index fa19a53..a836fff 100644 --- a/web/plugins/perfometer/check_mk.py +++ b/web/plugins/perfometer/check_mk.py @@ -114,6 +114,7 @@ def perfometer_check_mk_mem_used(row, check_command, perf_data): return "%d%%" % (100 * (virt_used / ram_total)), h perfometers["check_mk-mem.used"] = perfometer_check_mk_mem_used +perfometers["check_mk-hr_mem"] = perfometer_check_mk_mem_used def perfometer_check_mk_mem_win(row, check_command, perf_data): # only show mem usage, do omit page file
12 years, 10 months
1
0
0
0
Check_MK Git: check_mk: Reindented hr_mem
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: a6cbf9a6c7521163f8c41e8475415b5db7ef0b23 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6cbf9a6c75211…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Sat Aug 20 21:01:08 2011 +0200 Reindented hr_mem --- checks/hr_mem | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checks/hr_mem b/checks/hr_mem index d1470d5..3f3ce81 100644 --- a/checks/hr_mem +++ b/checks/hr_mem @@ -69,7 +69,7 @@ def check_hr_mem(item, params, info): warn, crit = params if type(warn) == float: - perfdata.append(('memused', str(totalused_mb)+'MB', int(warn/100.0 * totalmem_mb), + perfdata.append(('memused', str(totalused_mb)+'MB', int(warn/100.0 * totalmem_mb), int(crit/100.0 * totalmem_mb), 0, totalvirt_mb)) if totalused_perc >= crit: return (2, 'CRIT - %s, critical at %.1f%%' % (infotext, crit), perfdata)
12 years, 10 months
1
0
0
0
Check_MK Git: check_mk: Inventory functions now only take the single argument info
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 189880d9721e2c215407b8474b38ea518d2768f0 URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=189880d9721e2c…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 21:39:57 2011 +0200 Inventory functions now only take the single argument info The old style FUNC(checkname, info) is still supported but deprecated. --- .bugs/202 | 10 +++++++--- ChangeLog | 2 ++ checks/3ware_disks | 2 +- checks/3ware_info | 2 +- checks/3ware_units | 2 +- checks/ad_replication | 2 +- checks/aironet_clients | 2 +- checks/aironet_errors | 2 +- checks/akcp_sensor_humidity | 2 +- checks/akcp_sensor_temp | 2 +- checks/apc_symmetra | 2 +- checks/apc_symmetra_ext_temp | 2 +- checks/apc_symmetra_power | 2 +- checks/apc_symmetra_temp | 2 +- checks/blade_bays | 2 +- checks/blade_blades | 2 +- checks/blade_blowers | 2 +- checks/blade_health | 2 +- checks/blade_mediatray | 2 +- checks/blade_powerfan | 2 +- checks/blade_powermod | 2 +- checks/bluecoat_diskcpu | 2 +- checks/bluecoat_sensors | 2 +- checks/brocade_fcport | 2 +- checks/canon_pages | 2 +- checks/check_mk | 2 +- checks/cisco_fan | 2 +- checks/cisco_locif | 2 +- checks/cisco_power | 2 +- checks/cisco_qos | 2 +- checks/cisco_temp_perf | 2 +- checks/cmctc | 2 +- checks/cpsecure_sessions | 2 +- checks/cpu | 4 ++-- checks/cups_queues | 2 +- checks/decru_cpu | 2 +- checks/decru_fans | 2 +- checks/decru_perf | 2 +- checks/decru_power | 2 +- checks/decru_temps | 2 +- checks/df | 2 +- checks/df_netapp.include | 2 +- checks/diskstat | 2 +- checks/drbd | 2 +- checks/f5_bigip_cluster | 2 +- checks/f5_bigip_fans | 2 +- checks/f5_bigip_psu | 2 +- checks/f5_bigip_temp | 2 +- checks/fc_brocade_port | 2 +- checks/fc_brocade_port_detailed | 2 +- checks/fjdarye60_cadaps | 2 +- checks/fjdarye60_cmods | 2 +- checks/fjdarye60_cmods_flash | 2 +- checks/fjdarye60_cmods_mem | 2 +- checks/fjdarye60_conencs | 2 +- checks/fjdarye60_devencs | 2 +- checks/fjdarye60_disks | 4 ++-- checks/fjdarye60_expanders | 2 +- checks/fjdarye60_inletthmls | 2 +- checks/fjdarye60_psus | 2 +- checks/fjdarye60_rluns | 2 +- checks/fjdarye60_sum | 2 +- checks/fjdarye60_syscaps | 2 +- checks/fjdarye60_thmls | 2 +- checks/fsc_fans | 2 +- checks/fsc_ipmi_mem_status | 2 +- checks/fsc_subsystems | 2 +- checks/fsc_temp | 2 +- checks/h3c_lanswitch_cpu | 2 +- checks/h3c_lanswitch_sensors | 2 +- checks/heartbeat_crm | 4 ++-- checks/heartbeat_nodes | 2 +- checks/heartbeat_rscstatus | 2 +- checks/hp_blade | 2 +- checks/hp_blade_blades | 2 +- checks/hp_blade_fan | 2 +- checks/hp_blade_manager | 2 +- checks/hp_blade_psu | 2 +- checks/hp_procurve_cpu | 2 +- checks/hp_procurve_mem | 2 +- checks/hp_procurve_sensors | 2 +- checks/hp_proliant_cpu | 2 +- checks/hp_proliant_da_phydrv | 2 +- checks/hp_proliant_fans | 2 +- checks/hp_proliant_mem | 2 +- checks/hp_proliant_psu | 2 +- checks/hp_proliant_temp | 2 +- checks/hpux_cpu | 2 +- checks/hpux_if | 2 +- checks/hpux_lvm | 2 +- checks/hpux_multipath | 2 +- checks/hpux_serviceguard | 2 +- checks/hr_cpu | 2 +- checks/hr_fs | 2 +- checks/hr_mem | 2 +- checks/ibm_imm_health | 2 +- checks/ibm_rsa_health | 2 +- checks/if | 2 +- checks/if64 | 2 +- checks/ifoperstatus | 2 +- checks/ipmi | 2 +- checks/ipmi_sensors | 2 +- checks/j4p_performance | 6 +++--- checks/kernel | 4 ++-- checks/lnx_if | 2 +- checks/local | 2 +- checks/logwatch | 2 +- checks/lparstat_aix | 2 +- checks/lsi | 12 ++++++------ checks/mbg_lantime_refclock | 2 +- checks/mbg_lantime_state | 2 +- checks/mcdata_fcport | 2 +- checks/md | 2 +- checks/megaraid_ldisks | 2 +- checks/megaraid_pdisks | 2 +- checks/mem | 4 ++-- checks/mounts | 2 +- checks/mrpe | 2 +- checks/multipath | 2 +- checks/netapp_cluster | 2 +- checks/netapp_vfiler | 2 +- checks/netapp_volumes | 2 +- checks/netctr | 2 +- checks/netif | 4 ++-- checks/nfsmounts | 2 +- checks/ntp | 4 ++-- checks/nvidia | 4 ++-- checks/omd_status | 2 +- checks/oracle_asm_dg | 2 +- checks/oracle_asm_disk | 2 +- checks/oracle_inst | 2 +- checks/oracle_logswitches | 2 +- checks/oracle_sessions | 2 +- checks/oracle_tablespaces | 2 +- checks/oracle_tbs | 2 +- checks/postfix_mailq | 2 +- checks/printer_alerts | 2 +- checks/printer_pages | 2 +- checks/printer_supply | 2 +- checks/services | 2 +- checks/smart | 10 +++++----- checks/smbios_sel | 2 +- checks/snmp_info | 2 +- checks/snmp_uptime | 2 +- checks/statgrab_disk | 2 +- checks/statgrab_net | 6 +++--- checks/steelhead_connections | 2 +- checks/steelhead_status | 2 +- checks/strem1_sensors | 2 +- checks/superstack3_sensors | 2 +- checks/sylo | 2 +- checks/systemtime | 2 +- checks/tcp_conn_stats | 2 +- checks/tsm_stgpool | 2 +- checks/ucd_cpu_load | 2 +- checks/ucd_cpu_util | 2 +- checks/ups_capacity | 2 +- checks/ups_power | 2 +- checks/uptime | 2 +- checks/vbox_guest | 2 +- checks/vms_df | 2 +- checks/vms_md | 2 +- checks/vms_netif | 2 +- checks/vms_sys | 4 ++-- checks/vmware_state | 2 +- checks/win_dhcp_pools | 4 ++-- checks/windows_updates | 2 +- checks/winperf | 4 ++-- checks/winperf_msx_queues | 2 +- checks/winperf_phydisk | 2 +- checks/winperf_processor | 2 +- checks/wut_webtherm | 2 +- checks/zpool_status | 2 +- modules/check_mk.py | 12 +++++++++++- 174 files changed, 215 insertions(+), 199 deletions(-) Diff:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=189880d972…
12 years, 10 months
1
0
0
0
Check_MK Git: check_mk: Show datasource program on cmk -D
by git@mathias-kettner.de
Module: check_mk Branch: master Commit: 1995244cc9824bca5642a50899633ce0963e217d URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1995244cc9824b…
Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Aug 19 21:45:15 2011 +0200 Show datasource program on cmk -D --- .bugs/210 | 10 +++++++--- ChangeLog | 1 + modules/check_mk.py | 8 +++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.bugs/210 b/.bugs/210 index 6a31f23..f412880 100644 --- a/.bugs/210 +++ b/.bugs/210 @@ -1,10 +1,14 @@ Title: check_mk -D HOST does not display datasource_programs Component: core +State: done +Class: cleanup +Date: 2011-03-15 15:20:50 Benefit: 1 -State: open Cost: 1 -Date: 2011-03-15 15:20:50 -Class: cleanup +Fun: 0 It should rather display the command line of that host than (TCP port 6556). + +2011-08-19 21:44:58: changed state open -> done +Datasource program including IP adress is shown. diff --git a/ChangeLog b/ChangeLog index b97602a..545d4d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ Please use OMD instead. * Inventory functions now only take the single argument 'info'. The old style FUNC(checkname, info) is still supported but deprecated. + * Show datasource program on cmk -D Checks & Agents: * FIX: printer_pages: workaround for trailing-zero bug in HP Jetdirect diff --git a/modules/check_mk.py b/modules/check_mk.py index 9da7873..0991fba 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3114,9 +3114,11 @@ def dump_host(hostname): else: color = tty_bgblue try: - add_txt = " (%s)" % lookup_ipaddress(hostname) + ipaddress = lookup_ipaddress(hostname) + add_txt = " (%s)" % ipaddress except: add_txt = " (no DNS, no entry in ipaddresses)" + ipaddress = "X.X.X.X" print "%s%s%s%-78s %s" % (color, tty_bold, tty_white, hostname + add_txt, tty_normal) tags = tags_of_host(hostname) @@ -3130,6 +3132,10 @@ def dump_host(hostname): print tty_yellow + "Host groups: " + tty_normal + ", ".join(hostgroups_of(hostname)) print tty_yellow + "Contact groups: " + tty_normal + ", ".join(host_contactgroups_of([hostname])) agenttype = "TCP (port: %d)" % agent_port_of(hostname) + dapg = get_datasource_program(hostname, ipaddress) + if dapg: + agenttype = "Datasource program: %s" % dapg + if is_snmp_host(hostname): if is_usewalk_host(hostname): agenttype = "SNMP (use stored walk)"
12 years, 10 months
1
0
0
0
← Newer
1
...
10
11
12
13
14
15
16
...
28
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
Results per page:
10
25
50
100
200