Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Lars Michelsen

Module: check_mk Branch: master Commit: bc2b1150f0212c41048f6c5cfb69acd4a5ee1ff7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc2b1150f0212c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 19:57:19 2018 +0100 YAPFed watolib Change-Id: Ic71d21800b82fd4b75dfc826e7555a18c78af0a0 --- cmk/gui/wato/__init__.py | 776 ++++--- cmk/gui/wato/pages/global_settings.py | 39 +- cmk/gui/watolib.py | 3948 +++++++++++++++------------------ 3 files changed, 2315 insertions(+), 2448 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bc2b1150f0…

5 years, 10 months

6893 FIX diskstat: Make check compatible with addional kernel versions

by Florian Kromer

Module: check_mk Branch: master Commit: b2862ea15fd570eaa4ac4ce90a8ee829c2f1ae4f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2862ea15fd570… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Tue Nov 13 18:06:22 2018 +0100 6893 FIX diskstat: Make check compatible with addional kernel versions Previuously the diskstat check could potentially not work due to kernel dependencies. The werk add ensures proper working for additional kernel versions. Change-Id: If1be3e0b2007c0eb795f5b9840afb3ef6880c1b7 --- .werks/6893 | 11 +++++++++++ checks/diskstat | 11 +++++++++++ 2 files changed, 22 insertions(+) diff --git a/.werks/6893 b/.werks/6893 new file mode 100644 index 0000000..5ae6ad3 --- /dev/null +++ b/.werks/6893 @@ -0,0 +1,11 @@ +Title: diskstat: Make check compatible with addional kernel versions +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1542128326 +Class: fix + +Previuously the diskstat check could potentially not work due to kernel dependencies. +The werk add ensures proper working for additional kernel versions. diff --git a/checks/diskstat b/checks/diskstat index 666ba53..a3971e8 100644 --- a/checks/diskstat +++ b/checks/diskstat @@ -54,6 +54,15 @@ # c7 6978 /dev/vx/dsk/datadg/lalavol # c7 6979 /dev/vx/dsk/datadg/oravol +# output may have zeros appended +# +# 8 0 sda 111918756 929875 3960367050 349083041 20142495 1149711 1021234448 851284769 0 233177192 1197549009 0 0 0 0 +# 8 1 sda1 226 0 27481 3388 381 3 31472 35862 0 8123 39260 0 0 0 0 +# 8 2 sda2 111918500 929875 3960337473 349079568 20142114 1149708 1021202976 851248906 0 233176504 1197492420 0 0 0 0 +# 253 0 dm-0 883953 0 92124097 10287533 108572 0 2251672 809814 0 7545567 11097424 0 0 0 0 +# 253 1 dm-1 21046 0 172072 157766 164020 0 1312160 29292970 0 124138 29451007 0 0 0 0 +# 253 2 dm-2 750714 0 19747073 7702216 1445987 0 36811608 9817313 0 7159271 17520030 0 0 0 0 + # Fields in /proc/diskstats # Index 0 -- major number # Index 1 -- minor number @@ -104,6 +113,8 @@ def parse_diskstat(info): timestamp_str, proc_diskstat, name_info = diskstat_extract_name_info(info) + # limit diskstat to first elements before actual parsing + proc_diskstat = [ds[:15] for ds in proc_diskstat] timestamp = int(timestamp_str) # Here we discover real partitions and exclude them:

5 years, 10 months

YAPFed livestatus python client

by Lars Michelsen

Module: check_mk Branch: master Commit: c7a58895f466b7dc6618389dda3374bbd48d54df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7a58895f466b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 15:01:53 2018 +0100 YAPFed livestatus python client Change-Id: I91e7b4b8f2f1c596600d3aeebe2ff7e91c8d5374 --- livestatus/api/python/example.py | 54 +++++----- livestatus/api/python/example_multisite.py | 65 ++++++------ livestatus/api/python/livestatus.py | 163 +++++++++++++++-------------- livestatus/api/python/make_nagvis_map.py | 27 +++-- 4 files changed, 156 insertions(+), 153 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=c7a58895f4…

5 years, 10 months

YAPFed windows agent integration tests

by Lars Michelsen

Module: check_mk Branch: master Commit: 1d893f9e43b85d4c48468639c5ba4b6fea68e2f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1d893f9e43b85d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 15:03:48 2018 +0100 YAPFed windows agent integration tests Change-Id: I1ca647913f5ca5a67508289ad70f50095751d2d5 --- agents/windows/it/conftest.py | 9 +- agents/windows/it/lock.py | 4 +- agents/windows/it/remote.py | 30 +++--- agents/windows/it/test_agent_start_parameters.py | 70 +++++--------- agents/windows/it/test_section_check_mk.py | 71 +++++--------- agents/windows/it/test_section_df.py | 14 +-- agents/windows/it/test_section_dotnet_clrmemory.py | 3 +- agents/windows/it/test_section_eventlog.py | 64 +++++-------- agents/windows/it/test_section_fileinfo.py | 32 ++----- agents/windows/it/test_section_logfiles.py | 94 ++++++------------- agents/windows/it/test_section_mem.py | 3 +- agents/windows/it/test_section_mrpe.py | 40 ++++---- .../windows/it/test_section_openhardwaremonitor.py | 29 +++--- agents/windows/it/test_section_plugin_group.py | 104 +++++++++------------ agents/windows/it/test_section_ps.py | 6 +- agents/windows/it/test_section_services.py | 6 +- agents/windows/it/test_section_spool.py | 12 +-- agents/windows/it/test_section_systemtime.py | 3 +- agents/windows/it/test_section_uptime.py | 3 +- agents/windows/it/test_section_winperf.py | 4 +- agents/windows/it/test_section_wmi_cpuload.py | 3 +- agents/windows/it/test_section_wmi_webservices.py | 23 ++--- agents/windows/msibuild/msi-update | 72 ++++++++------ 23 files changed, 273 insertions(+), 426 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=1d893f9e43…

5 years, 10 months

6902 FIX apache_status: Ignore certificate for localhost

by Moritz Kiemer

Module: check_mk Branch: master Commit: fcb7d0269ae0cb7009f14f63d24df6c32d7bb9df URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fcb7d0269ae0cb… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Nov 13 09:26:45 2018 +0100 6902 FIX apache_status: Ignore certificate for localhost If a https server at 127.0.0.1 or [::1] is checked, ignore the certificate in case the name does not match. Previously we tried to contact the server via http on port 80 instead, but the server may not be listening on that port. You need to change the protocol to http if you are monitoring a https server that also listenes on port 80 and the servers address is not either the address the certificate was issued for or one of 127.0.0.1, [::1] and "localhost". Change-Id: I2db8af14aeb238494e558358c07d27f7733fa8cb --- .werks/6902 | 19 +++++++++++++++++++ agents/plugins/apache_status | 14 +++++++------- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/.werks/6902 b/.werks/6902 new file mode 100644 index 0000000..4c5eb7e --- /dev/null +++ b/.werks/6902 @@ -0,0 +1,19 @@ +Title: apache_status: Ignore certificate for localhost +Level: 1 +Component: checks +Compatible: incomp +Edition: cre +Version: 1.6.0i1 +Date: 1542097441 +Class: fix + +If a https server at 127.0.0.1 or [::1] is checked, ignore the certificate in +case the name does not match. + +Previously we tried to contact the server via http on port 80 instead, +but the server may not be listening on that port. + +You need to change the protocol to http if you are monitoring a https +server that also listenes on port 80 and the servers address is not +either the address the certificate was issued for or one of +127.0.0.1, [::1] and "localhost". diff --git a/agents/plugins/apache_status b/agents/plugins/apache_status index 07e7de3..693a31c 100755 --- a/agents/plugins/apache_status +++ b/agents/plugins/apache_status @@ -46,6 +46,7 @@ import re import socket import sys import urllib2 +import ssl config_dir = os.getenv("MK_CONFDIR", "/etc/check_mk") config_file = config_dir + "/apache_status.conf" @@ -62,9 +63,7 @@ socket.setdefaulttimeout(5.0) # None or list of (proto, ipaddress, port) tuples. # proto is 'http' or 'https' servers = None -ssl_ports = [ - 443, -] +ssl_ports = [443] if os.path.exists(config_file): execfile(config_file) @@ -150,12 +149,13 @@ for server in servers: else: raise except Exception, e: - if 'doesn\'t match' in str(e): + if 'doesn\'t match' in str(e) and address in ("127.0.0.1", "[::1]", "localhost"): # HACK: workaround if SSL port is found and localhost is using # SSL connections but certificate does not match - portspec = ':80' - url = 'http://%s%s/server-status?auto' % (address, portspec) - fd = urllib2.urlopen(url) + no_cert_context = ssl.create_default_context() + no_cert_context.check_hostname = False + no_cert_context.verify_mode = ssl.CERT_NONE + fd = urllib2.urlopen(url, context=no_cert_context) else: raise

5 years, 10 months

6649 PagerDuty: Notification plugin

by Óscar Nájera

Module: check_mk Branch: master Commit: da2a25a9cc400f96547eb9409d5198090218d70a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=da2a25a9cc400f… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Mon Nov 12 15:49:08 2018 +0100 6649 PagerDuty: Notification plugin Check_MK now support native integration with Pager Duty and can send notifications about state changes of hosts and services into a configured Pager Duty service. In Pager Duty a new integration service has to be set up. Select as "Integration Type" Check_MK and configure your service as better suited for your use case. Save the returned "Integration Key". In Check_MK, under "WATO - Notifications", create an new notification rule and select PagerDuty. Copy the "Integration Key" from Pager Duty as parameter. Optionally you can save the integration key in Check_MK's password manager and retrieve it here. If you want incidents in Pager Duty to include hyperlinks back to Check_MK, enable the field URL prefix for links to Check_MK. CMK-1236 Change-Id: If4db68111dc98e8c771d1703f8a6d14bf51428eb --- .werks/6649 | 23 ++++++ cmk/gui/plugins/wato/notifications.py | 51 ++++++++++++ cmk/notification_plugins/pagerduty.py | 108 +++++++++++++++++++++++++ cmk/notification_plugins/utils.py | 53 ++++++++---- notifications/pagerduty | 9 +++ tests/unit/cmk/notifications/test_pagerduty.py | 81 +++++++++++++++++++ tests/unit/cmk/notifications/test_utils.py | 10 +++ 7 files changed, 320 insertions(+), 15 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=da2a25a9cc…

5 years, 10 months

Add missing modules to Pipfile

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 32544ce453cefb22a4ff2a6e2cb92efc6149b67f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=32544ce453cefb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Nov 13 15:23:32 2018 +0100 Add missing modules to Pipfile Change-Id: I7fe669febacf4688b36e27127723ba45426000cc --- Pipfile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Pipfile b/Pipfile index 3f5f0b8..e528921 100644 --- a/Pipfile +++ b/Pipfile @@ -69,7 +69,7 @@ pyghmi = "==1.2.14" typing = "==3.6.6" scandir = "==1.9" pathlib2 = "==2.3.2" -python-dateutil = "==2.7.3" +python-dateutil = "==2.7.5" python-snap7 = "==0.10" rrdtool = "==0.1.14" # Actually we ship the binding which comes with rrdtool itself... azure-common = "==1.1.16" @@ -89,9 +89,14 @@ msrest = "==0.6.1" # needed by azure stuff msrestazure = "==0.5.0" # needed by azure stuff oauthlib = "==2.1.0" # needed by azure stuff requests-oauthlib = "==1.0.0" # needed by azure stuff -urllib3 = "==1.24" # needed by azure stuff +urllib3 = "==1.24.1" # needed by azure stuff Werkzeug = "==0.14.1" # Added for the GUI passlib = "==1.7.1" # Added for the GUI +docutils = "==0.14" # needed for aws stuff +futures = "==3.2.0" # needed for aws stuff +jmespath = "==0.9.3" # needed for aws stuff +botocore = "==1.12.43" # needed for aws stuff +s3transfer = "==0.1.13" # needed for aws stuff boto3 = "==1.9.42" # needed for aws stuff [requires]

5 years, 10 months

YAPFed active checks

by Lars Michelsen

Module: check_mk Branch: master Commit: bc370a2effbd9f6b23c7ec7464bf932c3484d2c3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bc370a2effbd9f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 13:04:01 2018 +0100 YAPFed active checks Change-Id: I22c3642c44eeb63efa6576be8e86e753c83f90e6 --- active_checks/check_bi_aggr | 51 +++++---- active_checks/check_cpu_peaks | 67 ++++++------ active_checks/check_form_submit | 97 ++++++++++------- active_checks/check_mail | 121 +++++++++++++-------- active_checks/check_mail_loop | 164 +++++++++++++++++----------- active_checks/check_mailboxes | 122 ++++++++++++++------- active_checks/check_notify_count | 29 +++-- active_checks/check_sftp | 82 ++++++++------ active_checks/check_sql | 228 +++++++++++++++++++++++++-------------- active_checks/check_traceroute | 47 ++++---- active_checks/check_uniserv | 36 ++++--- 11 files changed, 640 insertions(+), 404 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bc370a2eff…

5 years, 10 months

YAPFed agent plugins

by Lars Michelsen

Module: check_mk Branch: master Commit: dc3c18ce8097984f274afb6132d77f031c1ac173 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dc3c18ce809798… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 13 13:18:05 2018 +0100 YAPFed agent plugins Change-Id: Ie6d7b203a17f90486798321c8ff41933e8d065f0 --- agents/plugins/apache_status | 12 +-- agents/plugins/isc_dhcpd | 10 +-- agents/plugins/mailman_lists | 2 +- agents/plugins/mk_inotify | 81 +++++++++-------- agents/plugins/mk_jolokia | 21 +++-- agents/plugins/mk_logwatch | 2 + agents/plugins/mk_mongodb | 35 ++++---- agents/plugins/mk_sap | 146 +++++++++++++++++------------- agents/plugins/mk_tinkerforge | 145 +++++++++++++++++------------- agents/plugins/mtr | 168 +++++++++++++++++++++-------------- agents/plugins/nginx_status | 14 +-- agents/plugins/plesk_backups | 36 ++++---- agents/plugins/plesk_domains | 14 +-- agents/plugins/unitrends_replication | 11 +-- 14 files changed, 400 insertions(+), 297 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dc3c18ce80…

5 years, 10 months

update for WK6678

by Andreas Boesl

Module: check_mk Branch: master Commit: 649c7ab9530ea95e5b17c60f2702d829f98c2b09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=649c7ab9530ea9… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Nov 13 14:55:44 2018 +0100 update for WK6678 Change-Id: Ic056478651654afc1c20d461c7bb9c2c99e6f6e1 --- web/htdocs/status.css | 2 +- web/htdocs/themes/facelift/theme.css | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/web/htdocs/status.css b/web/htdocs/status.css index 555b2f2..36dd1de 100644 --- a/web/htdocs/status.css +++ b/web/htdocs/status.css @@ -109,7 +109,7 @@ table.data tr.data td.stale.hstate1 { } /* in DOWNTIME */ -.stated, .hstated, .stated a, .hstated a { +.stated, .hstated, .stated a, .hstated a, .even0 .hstated, .odd0 .hstated, .even0 .hstated a, .odd0 .hstated a{ background-color: #0af; color: #fff; } diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 494b17e..939c296 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -1363,7 +1363,8 @@ div.color { color: #fff !important; border-color: #7b7b7b !important; } -.stated, .hstated, .stated a, .stated body.main .popup_menu span, body.main .popup_menu .stated span, .hstated a, .hstated body.main .popup_menu span, body.main .popup_menu .hstated span { +.stated, .hstated, .stated a, .stated body.main .popup_menu span, body.main .popup_menu .stated span, .hstated a, .hstated body.main .popup_menu span, body.main .popup_menu .hstated span, +.even0 .hstated, .odd0 .hstated, .even0 .hstated a, .odd0 .hstated a { background-color: #888 !important; color: #fff !important; border-color: #7b7b7b !important; }

5 years, 10 months

← Newer
1
...
28
29
30
31
32
33
34
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018