Checkmk git commits December 2015

checkmk-commits@lists.checkmk.com

8 participants
193 discussions

by Bastian Kuhn

Module: check_mk Branch: master Commit: 0dd7dffc8c47a832454195dbc5132835d2a7b518 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dd7dffc8c47a8… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 2 14:59:51 2015 +0100 Merge conflict ---

8 years, 9 months

#1308 FIX check_mk_agent.linux: Not longer list prl_fs filesystems

by Bastian Kuhn

Module: check_mk Branch: master Commit: 366754768b171980c6f85717c3a86c15de1d0996 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=366754768b1719… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Wed Dec 2 14:58:47 2015 +0100 #1308 FIX check_mk_agent.linux: Not longer list prl_fs filesystems The Agent now ignores Filesystems from Paralles Desktop. --- .werks/1308 | 10 ++++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1308 b/.werks/1308 new file mode 100644 index 0000000..71a8f5d --- /dev/null +++ b/.werks/1308 @@ -0,0 +1,10 @@ +Title: check_mk_agent.linux: Not longer list prl_fs filesystems +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449064627 +Class: fix + +The Agent now ignores Filesystems from Paralles Desktop. + diff --git a/ChangeLog b/ChangeLog index e321c90..3c75fa9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -111,6 +111,7 @@ * 2800 FIX: mk_mysql: fixed some issues with incorrect assembled command line... * 2744 FIX: waitmax now kills the whole process group and is a bit more robust. * 2842 FIX: jolokia_metrics.perm_gen: fixed wrong calculation of perf variables warn and crit + * 1308 FIX: check_mk_agent.linux: Not longer list prl_fs filesystems... Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 949bc51..9d4e18c 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -152,7 +152,7 @@ fi echo '<<<df>>>' # The exclusion list is getting a bit of a problem. -l should hide any remote FS but seems # to be all but working. -excludefs="-x smbfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs -x zfs" +excludefs="-x smbfs -x cifs -x iso9660 -x udf -x nfsv4 -x nfs -x mvfs -x zfs -x prl_fs" df -PTlk $excludefs | sed 1d # df inodes information

8 years, 9 months

Added apache_status plugin for Windows to treasures

by Mathias Kettner

Module: check_mk Branch: master Commit: f181a3b94cf8399d8ad12671fb888c83d31ac7bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f181a3b94cf839… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 2 14:55:33 2015 +0100 Added apache_status plugin for Windows to treasures thanks to Jean-Marie Duno --- doc/treasures/apache_windows/apache_status.cfg | 30 +++ doc/treasures/apache_windows/apache_status.vbs | 259 ++++++++++++++++++++++++ 2 files changed, 289 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=f181a3b94c…

8 years, 9 months

Remove bogus \n removal in host name which is always an IP address

by Mathias Kettner

Module: check_mk Branch: master Commit: 6c5d5a437e2ff7d2c41791c03d9f63a48aa38466 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6c5d5a437e2ff7… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Dec 2 14:24:32 2015 +0100 Remove bogus \n removal in host name which is always an IP address --- mkeventd/bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index fc79159..6dd2160 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1284,7 +1284,7 @@ class EventServer: text = text.decode("latin-1") event = { 'time' : time.time(), - 'host' : host.replace('\n', ''), + 'host' : host, 'ipaddress' : ipaddress, 'priority' : 5, # notice 'facility' : 31, # not used by syslog -> we use this for all traps

8 years, 9 months

#2855 FIX ibm_svc_mdiskgrp: Fixed crash when capacity of pool is 0

by Lars Michelsen

Module: check_mk Branch: master Commit: 2b637b89d5b913aec1a604965e1da429ec9271fc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2b637b89d5b913… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 13:37:26 2015 +0100 #2855 FIX ibm_svc_mdiskgrp: Fixed crash when capacity of pool is 0 --- .werks/2855 | 10 ++++++++++ ChangeLog | 1 + checks/ibm_svc_mdiskgrp | 2 ++ 3 files changed, 13 insertions(+) diff --git a/.werks/2855 b/.werks/2855 new file mode 100644 index 0000000..e9406d6 --- /dev/null +++ b/.werks/2855 @@ -0,0 +1,10 @@ +Title: ibm_svc_mdiskgrp: Fixed crash when capacity of pool is 0 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449059825 + + diff --git a/ChangeLog b/ChangeLog index a84ad8e..8491810 100644 --- a/ChangeLog +++ b/ChangeLog @@ -121,6 +121,7 @@ * 2852 FIX: check_http: SSL can now be configured to use specific SSL version * 2853 FIX: cisco_asa_failover: Added support for CISCO PIX security devices * 2854 FIX: winperf_if: Assuming interfaces without status to be up + * 2855 FIX: ibm_svc_mdiskgrp: Fixed crash when capacity of pool is 0 Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/ibm_svc_mdiskgrp b/checks/ibm_svc_mdiskgrp index 6cbb77c..5934b45 100644 --- a/checks/ibm_svc_mdiskgrp +++ b/checks/ibm_svc_mdiskgrp @@ -94,6 +94,8 @@ def check_ibm_svc_mdiskgrp(item, params, info): yield status, message, perfdata # Compute provisioning + if not capacity: + return # provisioning does not make sense when capacity is 0 provisioning = 100.0 * virtual_capacity / capacity if "provisioning_levels" in params: warn, crit = params["provisioning_levels"]

8 years, 9 months

#2854 FIX winperf_if: Assuming interfaces without status to be up

by Lars Michelsen

Module: check_mk Branch: master Commit: 918e40c259a13a121bb0d2a2b27bad066b6ece19 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=918e40c259a13a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 13:30:37 2015 +0100 #2854 FIX winperf_if: Assuming interfaces without status to be up --- .werks/2854 | 10 ++++++++++ ChangeLog | 1 + checks/winperf_if | 4 +++- 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/.werks/2854 b/.werks/2854 new file mode 100644 index 0000000..d3cc492 --- /dev/null +++ b/.werks/2854 @@ -0,0 +1,10 @@ +Title: winperf_if: Assuming interfaces without status to be up +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i4 +Date: 1449059417 + + diff --git a/ChangeLog b/ChangeLog index 654398b..a84ad8e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -120,6 +120,7 @@ * 2873 FIX: megaraid_pdisks: handle case "Copyback" correctly... * 2852 FIX: check_http: SSL can now be configured to use specific SSL version * 2853 FIX: cisco_asa_failover: Added support for CISCO PIX security devices + * 2854 FIX: winperf_if: Assuming interfaces without status to be up Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/winperf_if b/checks/winperf_if index 9843a5f..99fd6e2 100644 --- a/checks/winperf_if +++ b/checks/winperf_if @@ -220,7 +220,9 @@ def convert_winperf_if(info, nic_names, nic_index): # NetConnectionTable Stuff: # # if we have no status, but link information, we assume IF is connected - connection_status = nic.get('NetConnectionStatus', '2') + connection_status = nic.get('NetConnectionStatus') + if not connection_status: + connection_status = '2' # Windows NetConnectionStatus Table connection_states = {

8 years, 9 months

#2874 netstat_an.bat: Restrict output of connections to TCP,

by Mathias Kettner

safes performance Message-ID: <565ee3f2.uDnl69CJ8BdS/VrO%mk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: application/octet-stream Content-Transfer-Encoding: base64 TW9kdWxlOiBjaGVja19tawpCcmFuY2g6IG1hc3RlcgpDb21taXQ6IDlkMWE3ZGUzZDZiZGM1 YWQxYmZmZGUwYzRmZDFjMTIzMTBiMGY0ZDYKVVJMOiAgICBodHRwOi8vZ2l0Lm1hdGhpYXMt a2V0dG5lci5kZS9naXQvP3A9Y2hlY2tfbWsuZ2l0O2E9Y29tbWl0O2g9OWQxYTdkZTNkNmJk YzVhZDFiZmZkZTBjNGZkMWMxMjMxMGIwZjRkNgoKQXV0aG9yOiBNYXRoaWFzIEtldHRuZXIg PG1rQG1hdGhpYXMta2V0dG5lci5kZT4KRGF0ZTogICBXZWQgRGVjICAyIDEzOjI4OjI3IDIw MTUgKzAxMDAKCiMyODc0IG5ldHN0YXRfYW4uYmF0OiBSZXN0cmljdCBvdXRwdXQgb2YgY29u bmVjdGlvbnMgdG8gVENQLCBzYWZlcyBwZXJmb3JtYW5jZQoKLS0tCgogLndlcmtzLzI4NzQg ICAgICAgICAgICAgICAgICAgICAgICAgICB8ICAgIDkgKysrKysrKysrCiBDaGFuZ2VMb2cg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAgMSArCiBhZ2VudHMvd2luZG93cy9w bHVnaW5zL25ldHN0YXRfYW4uYmF0IHwgICAgMiArLQogMyBmaWxlcyBjaGFuZ2VkLCAxMSBp bnNlcnRpb25zKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvLndlcmtzLzI4NzQg Yi8ud2Vya3MvMjg3NApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi40NmQ2 ZTU2Ci0tLSAvZGV2L251bGwKKysrIGIvLndlcmtzLzI4NzQKQEAgLTAsMCArMSw5IEBACitU aXRsZTogbmV0c3RhdF9hbi5iYXQ6IFJlc3RyaWN0IG91dHB1dCBvZiBjb25uZWN0aW9ucyB0 byBUQ1AsIHNhZmVzIHBlcmZvcm1hbmNlCitMZXZlbDogMQorQ29tcG9uZW50OiBjaGVja3MK K0NvbXBhdGlibGU6IGNvbXBhdAorVmVyc2lvbjogMS4yLjdpNAorRGF0ZTogMTQ0OTA1OTI3 OQorQ2xhc3M6IGZlYXR1cmUKKworCmRpZmYgLS1naXQgYS9DaGFuZ2VMb2cgYi9DaGFuZ2VM b2cKaW5kZXggOWUyOTFkZS4uNjliNGUzYiAxMDA2NDQKLS0tIGEvQ2hhbmdlTG9nCisrKyBi L0NoYW5nZUxvZwpAQCAtNTIsNiArNTIsNyBAQAogICAgICogMjgwMyBuZXRhcHBfYXBpX3Zv bHVtZXM6IGNsdXN0ZXJlZCB2b2x1bWVzIG5vdyBsb25nZXIgc2hvdyB0aGUgY3VycmVudCBu b2RlIG5hbWUgaW4gdGhlIHNlcnZpY2UgZGVzY3JpcHRpb24uLi4KICAgICAgICAgICAgIE5P VEU6IFBsZWFzZSByZWZlciB0byB0aGUgbWlncmF0aW9uIG5vdGVzIQogICAgICogMjc4MCBj aXNjb192c3M6IGRldGVjdCB0aGlzIGNoZWNrIG9uIG5ld2VyICgxNS4xKSBkZXZpY2VzCisg ICAgKiAyODc0IG5ldHN0YXRfYW4uYmF0OiBSZXN0cmljdCBvdXRwdXQgb2YgY29ubmVjdGlv bnMgdG8gVENQLCBzYWZlcyBwZXJmb3JtYW5jZQogICAgICogMjY2MCBGSVg6IGZpeGVkIHdp bmRvd3MgYWdlbnQgdXNpbmcgdGhlIHdyb25nIHdvcmtpbmcgZGlyZWN0b3J5Li4uCiAgICAg KiAyNjY0IEZJWDogcHM6IFNwZWVkdXAgaW4gc2l0dWF0aW9uIHdpdGggbWFueSBtYXRjaGlu ZyBwcm9jZXNzZXMuLi4KICAgICAqIDI2NjEgRklYOiB3aW5kb3dzIGFnZW50OiBmaXhlZCBp bmNvbXBsZXRlIHByb2Nlc3MgbGlzdC4uLgpkaWZmIC0tZ2l0IGEvYWdlbnRzL3dpbmRvd3Mv cGx1Z2lucy9uZXRzdGF0X2FuLmJhdCBiL2FnZW50cy93aW5kb3dzL3BsdWdpbnMvbmV0c3Rh dF9hbi5iYXQKaW5kZXggMWI2YWJkOC4uMjIxYTBmYiAxMDA2NDQKLS0tIGEvYWdlbnRzL3dp bmRvd3MvcGx1Z2lucy9uZXRzdGF0X2FuLmJhdAorKysgYi9hZ2VudHMvd2luZG93cy9wbHVn aW5zL25ldHN0YXRfYW4uYmF0CkBAIC0xLDMgKzEsMyBAQAogQGVjaG8gb2ZmDQogZWNobyBe PF48Xjx3aW5fbmV0c3RhdF4+Xj5ePg0KLW5ldHN0YXQgLWFuDQorbmV0c3RhdCAtYW5wIFRD UCAmIG5ldHN0YXQg4oCTYW5wIFRDUHY2DQoK

8 years, 9 months

#2853 FIX cisco_asa_failover: Added support for CISCO PIX security devices

by Lars Michelsen

Module: check_mk Branch: master Commit: 79912461030a6d261902e48d1d819b50b10e6fa8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79912461030a6d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 12:57:35 2015 +0100 #2853 FIX cisco_asa_failover: Added support for CISCO PIX security devices --- .werks/2853 | 9 +++++++++ ChangeLog | 1 + checks/cisco_asa_failover | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2853 b/.werks/2853 new file mode 100644 index 0000000..46a57ca --- /dev/null +++ b/.werks/2853 @@ -0,0 +1,9 @@ +Title: cisco_asa_failover: Added support for CISCO PIX security devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449057437 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 3b05569..0a1775c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,7 @@ * 2850 FIX: juniper_cpu: Better error handling of empty data reported by device * 2873 FIX: megaraid_pdisks: handle case "Copyback" correctly... * 2852 FIX: check_http: SSL can now be configured to use specific SSL version + * 2853 FIX: cisco_asa_failover: Added support for CISCO PIX security devices Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/cisco_asa_failover b/checks/cisco_asa_failover index 0f4e565..361bac2 100644 --- a/checks/cisco_asa_failover +++ b/checks/cisco_asa_failover @@ -92,7 +92,8 @@ check_info["cisco_asa_failover"] = { "inventory_function" : inventory_cisco_asa_failover, "service_description": "Cluster Status", "has_perfdata" : False, - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security") \ + or "cisco pix security" in oid(".1.3.6.1.2.1.1.1.0").lower(), "snmp_info" : (".1.3.6.1.4.1.9.9.147.1.2.1.1.1", [ "2", # CISCO-FIREWALL-MIB::cfwHardwareInformation "3", # CISCO-FIREWALL-MIB::cfwHardwareStatusValue

8 years, 9 months

#2852 FIX check_http: SSL can now be configured to use specific SSL version

by Lars Michelsen

Module: check_mk Branch: master Commit: 44ed9304e01a6fab7b8118ec8ed112b6edb464a4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=44ed9304e01a6f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Dec 2 12:49:11 2015 +0100 #2852 FIX check_http: SSL can now be configured to use specific SSL version --- .werks/2852 | 9 +++++++++ ChangeLog | 1 + checks/check_http | 5 ++++- web/plugins/wato/active_checks.py | 20 +++++++++++++------- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/.werks/2852 b/.werks/2852 new file mode 100644 index 0000000..1bb011f --- /dev/null +++ b/.werks/2852 @@ -0,0 +1,9 @@ +Title: check_http: SSL can now be configured to use specific SSL version +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i4 +Date: 1449056927 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 9e291de..3e1b58a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ * 2849 FIX: winperf_processor.util: Fixed crash in case no CPU infos are sent * 2850 FIX: juniper_cpu: Better error handling of empty data reported by device * 2873 FIX: megaraid_pdisks: handle case "Copyback" correctly... + * 2852 FIX: check_http: SSL can now be configured to use specific SSL version Multisite: * 2684 Added icons for downloading agent data / walks of hosts... diff --git a/checks/check_http b/checks/check_http index 5d4e9da..85f882d 100644 --- a/checks/check_http +++ b/checks/check_http @@ -54,8 +54,11 @@ def check_http_arguments(params): else: address = "$_HOSTADDRESS_4$" - if settings.get("ssl"): + ssl = settings.get("ssl") + if ssl in [ True, "auto" ]: args += ' --ssl' + elif ssl: + args += ' --ssl=%s' % quote_shell_string(ssl) if "cert_host" in settings: omit_ip = True diff --git a/web/plugins/wato/active_checks.py b/web/plugins/wato/active_checks.py index 64a8e82..c64e2be 100644 --- a/web/plugins/wato/active_checks.py +++ b/web/plugins/wato/active_checks.py @@ -763,13 +763,19 @@ register_rule(group, ) ), ip_address_family_element, - ( "ssl", - FixedValue( - value = True, - totext = _("use SSL/HTTPS"), - title = _("Use SSL/HTTPS for the connection.") - ) - ), + ("ssl", Transform( + DropdownChoice( + title = _("Use SSL/HTTPS for the connection"), + choices = [ + ("auto", _("Use SSL with auto negotiation")), + ("1", _("Use SSL, enforce TLSv1")), + ("2", _("Use SSL, enforce SSLv2")), + ("3", _("Use SSL, enforce SSLv3")), + ], + default_value = "auto", + ), + forth = lambda x: x == True and "auto" or x, + )), ( "sni", FixedValue( value = True,

8 years, 9 months

#2804 FIX Avoid redeclaration errors in graphs when using pnp basket

by Andreas Boesl

Module: check_mk Branch: master Commit: 6d301a5e13aa74e7c8d722c3d0fdc48cf7f549a3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6d301a5e13aa74… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Dec 2 12:46:34 2015 +0100 #2804 FIX Avoid redeclaration errors in graphs when using pnp basket The pnp basket might include the same template files multiple times. This caused redeclaration exceptions in a number of check templates, e.g. default, mem-linux. --- .werks/2804 | 10 ++++++ ChangeLog | 1 + pnp-templates/check_mk-hp_blade_psu.php | 25 +++++++------- pnp-templates/check_mk-mem.linux.php | 54 ++++++++++++++++--------------- pnp-templates/default.php | 15 +++++---- 5 files changed, 59 insertions(+), 46 deletions(-) diff --git a/.werks/2804 b/.werks/2804 new file mode 100644 index 0000000..23f4370 --- /dev/null +++ b/.werks/2804 @@ -0,0 +1,10 @@ +Title: Avoid redeclaration errors in graphs when using pnp basket +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i4 +Date: 1449056407 +Class: fix + +The pnp basket might include the same template files multiple times. +This caused redeclaration exceptions in a number of check templates, e.g. default, mem-linux. diff --git a/ChangeLog b/ChangeLog index 9e291de..c31f389 100644 --- a/ChangeLog +++ b/ChangeLog @@ -144,6 +144,7 @@ * 2846 FIX: View refresh could reset checkboxes on views where "always show checkboxes" is enabled * 2778 FIX: Fixed correct scaling of sidebar on newer versions of Chrome browser * 2781 FIX: Fix role handling of "Custom Links" snapin in case of adapted roles... + * 2804 FIX: Avoid redeclaration errors in graphs when using pnp basket... WATO: * 2442 WATO remove host: improved cleanup of obsolete host files... diff --git a/pnp-templates/check_mk-hp_blade_psu.php b/pnp-templates/check_mk-hp_blade_psu.php index e6b4ab3..1fb978d 100644 --- a/pnp-templates/check_mk-hp_blade_psu.php +++ b/pnp-templates/check_mk-hp_blade_psu.php @@ -30,23 +30,20 @@ # Author: Lars Michelsen <lm(a)mathias-kettner.de> # -function getAllPsuFiles($path) { - $files = array(); - if($h = opendir($path)) { - while(($file = readdir($h)) !== false) { - if(preg_match('/^PSU_[0-9]+_output\.rrd$/', $file, $aRet)) - $files[] = $aRet[0]; - } - natcasesort($files); - closedir($h); - } - return $files; -} - $colors = array("008CFF", "6FBEFF", "2F7EBF", "00589F"); $path = dirname($RRDFILE[1]); -$files = getAllPsuFiles($path); + +# get all psu files +$files = array(); +if($h = opendir($path)) { + while(($file = readdir($h)) !== false) { + if(preg_match('/^PSU_[0-9]+_output\.rrd$/', $file, $aRet)) + $files[] = $aRet[0]; + } + natcasesort($files); + closedir($h); +} $opt[0] = "-l 0 --vertical-label \"Watt\" --title \"HP Blade Enclosure - PSU Power Usage\" "; $def[0] = ''; diff --git a/pnp-templates/check_mk-mem.linux.php b/pnp-templates/check_mk-mem.linux.php index a633cbe..ddb1177 100644 --- a/pnp-templates/check_mk-mem.linux.php +++ b/pnp-templates/check_mk-mem.linux.php @@ -33,37 +33,39 @@ foreach ($NAME as $i => $n) { $mem_defines[$n] = "DEF:$n=$RRDFILE[$i]:$DS[$i]:MAX "; } -function mem_area($varname, $color, $title, $stacked) -{ - return mem_curve("AREA", $varname, $color, $title, $stacked); -} - -function mem_line($varname, $color, $title, $stacked) -{ - return mem_curve("LINE1", $varname, $color, $title, $stacked); -} +# avoid redeclaration errors if this file is include multiple times (e.g. by basket) +if (!function_exists('mem_area')) { + function mem_area($varname, $color, $title, $stacked) + { + return mem_curve("AREA", $varname, $color, $title, $stacked); + } -function mem_curve($how, $varname, $color, $title, $stacked) -{ - global $mem_defines; - $tit = sprintf("%-30s", $title); - if (isset($mem_defines[$varname])) { - $x = $mem_defines[$varname] . "$how:$varname#$color:\"$tit\""; - if ($stacked) - $x .= ":STACK"; - $x .= " "; - $x .= "CDEF:${varname}_gb=$varname,1073741824,/ "; - $x .= "GPRINT:${varname}_gb:LAST:\"%6.1lf GB last\" "; - $x .= "GPRINT:${varname}_gb:AVERAGE:\"%6.1lf GB avg\" "; - $x .= "GPRINT:${varname}_gb:MAX:\"%6.1lf GB max\\n\" "; - return $x; + function mem_line($varname, $color, $title, $stacked) + { + return mem_curve("LINE1", $varname, $color, $title, $stacked); } - else { - return ""; + + function mem_curve($how, $varname, $color, $title, $stacked) + { + global $mem_defines; + $tit = sprintf("%-30s", $title); + if (isset($mem_defines[$varname])) { + $x = $mem_defines[$varname] . "$how:$varname#$color:\"$tit\""; + if ($stacked) + $x .= ":STACK"; + $x .= " "; + $x .= "CDEF:${varname}_gb=$varname,1073741824,/ "; + $x .= "GPRINT:${varname}_gb:LAST:\"%6.1lf GB last\" "; + $x .= "GPRINT:${varname}_gb:AVERAGE:\"%6.1lf GB avg\" "; + $x .= "GPRINT:${varname}_gb:MAX:\"%6.1lf GB max\\n\" "; + return $x; + } + else { + return ""; + } } } - # 1. Overview $opt[] = $defopt . "--title \"RAM + Swap overview\""; $def[] = "" diff --git a/pnp-templates/default.php b/pnp-templates/default.php index 2e0609b..9151127 100644 --- a/pnp-templates/default.php +++ b/pnp-templates/default.php @@ -2,12 +2,15 @@ # Fetch dynamic PNP template from Check_MK's new metrics system -function get_apache_port() { - $path = getenv("OMD_ROOT") . "/etc/omd/site.conf"; - foreach (file($path) as $line) { - if (strpos($line, "CONFIG_APACHE_TCP_PORT") === 0) { - list($key, $val) = explode("=", $line); - return trim($val, "'\n\r"); +# avoid redeclaration errors if this file is include multiple times (e.g. by basket) +if (!function_exists('get_apache_port')) { + function get_apache_port() { + $path = getenv("OMD_ROOT") . "/etc/omd/site.conf"; + foreach (file($path) as $line) { + if (strpos($line, "CONFIG_APACHE_TCP_PORT") === 0) { + list($key, $val) = explode("=", $line); + return trim($val, "'\n\r"); + } } } }

8 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2015