Checkmk git commits April 2018

checkmk-commits@lists.checkmk.com

10 participants
287 discussions

5974 FIX Fixed possible exception on background job detail page

by Lars Michelsen

Module: check_mk Branch: master Commit: cdae4c97ea8cf4949a657a42e4e94296f525994d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cdae4c97ea8cf4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Apr 12 21:17:54 2018 +0200 5974 FIX Fixed possible exception on background job detail page When a detail page can not access job information (e.g. the job does not exist anymore), the error message was not displayed correctly. Change-Id: Ieb195d86da68dfe2b65ae65df939f44c80a1d0b8 --- .werks/5974 | 12 ++++++++++++ web/htdocs/gui_background_job.py | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/.werks/5974 b/.werks/5974 new file mode 100644 index 0000000..22d8a88 --- /dev/null +++ b/.werks/5974 @@ -0,0 +1,12 @@ +Title: Fixed possible exception on background job detail page +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1523560619 + +When a detail page can not access job information (e.g. the job does not exist anymore), +the error message was not displayed correctly. diff --git a/web/htdocs/gui_background_job.py b/web/htdocs/gui_background_job.py index e667175..d8e93cf 100644 --- a/web/htdocs/gui_background_job.py +++ b/web/htdocs/gui_background_job.py @@ -269,7 +269,7 @@ class GUIBackgroundJobManager(background_job.BackgroundJobManager): def show_job_details(self, job_id = None, job_snapshot = None): job_info = self._get_job_infos([job_id]) if not job_info: - raise MKGeneralException("Background job with id %s/i> not found" % job_id) + raise MKGeneralException("Background job with id %s not found" % job_id) job_id, job_status = job_info.items()[0] html.write(JobRenderer.render_job_details(job_id, job_status)) @@ -281,7 +281,7 @@ class GUIBackgroundJobManager(background_job.BackgroundJobManager): job_id, job_status = job_info.items()[0] html.write(JobRenderer.render_job_details(job_id, job_status)) else: - raise MKGeneralException("Background job with id %s/i> not found" % job_id) + raise MKGeneralException("Background job with id %s not found" % job_snapshot.get_job_id())

6 years, 5 months

Fixed some semantic errors

by Simon Betz

Module: check_mk Branch: master Commit: 25aceee828da0b8be680d465fe143a13fd43b2c8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25aceee828da0b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 12 13:20:23 2018 +0200 Fixed some semantic errors Change-Id: If1151aa0e8f62e81e3474974b66a74765297a09b --- agents/plugins/mk_sap_hana | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/agents/plugins/mk_sap_hana b/agents/plugins/mk_sap_hana index 1d74f1e..5fbeb44 100755 --- a/agents/plugins/mk_sap_hana +++ b/agents/plugins/mk_sap_hana @@ -37,14 +37,14 @@ # Config might include # DB_USER_hpy=foo # DB_PASSWORD_hpy=bar -if [ -f $MK_CONFDIR/sap_hana.cfg ]; +if [ -f "$MK_CONFDIR/sap_hana.cfg" ]; then - . $MK_CONFDIR/sap_hana.cfg + . "$MK_CONFDIR/sap_hana.cfg" fi LSSAP=/usr/sap/hostctrl/exe/lssap -if [[ ! -x $LSSAP ]]; then +if [[ ! -x "$LSSAP" ]]; then exit 1 fi @@ -67,7 +67,7 @@ function process_list () { local sidadm_short=$3 echo "<<<sap_hana_process_list:sep(44)>>>" echo "[[[$sidadm_short]]]" - su - $sidadm -c "sapcontrol -nr $inst_nr -function GetProcessList" + su - "${sidadm}" -c "sapcontrol -nr ${inst_nr} -function GetProcessList" } @@ -76,7 +76,7 @@ function hdb_version () { local sidadm_short=$2 echo "<<<sap_hana_version:sep(58)>>>" echo "[[[$sidadm_short]]]" - su - $sidadm -c "HDB version" + su - "${sidadm}" -c "HDB version" } @@ -89,7 +89,7 @@ function full_backup () { local sidadm_short=$5 echo "<<<sap_hana_full_backup:sep(44)>>>" echo "[[[$sidadm_short]]]" - sudo -i -u ${sidadm} hdbsql -n localhost -i ${inst_nr} -u ${db_user} -p "${db_password}" -j -a -x "SELECT TO_DATE(SYS_END_TIME), days_between(SYS_END_TIME,CURRENT_TIMESTAMP) ,seconds_between(SYS_START_TIME,SYS_END_TIME), STATE_NAME,COMMENT FROM M_BACKUP_CATALOG WHERE ENTRY_TYPE_NAME = 'complete data backup' AND SYS_START_TIME = (SELECT MAX(SYS_START_TIME) FROM M_BACKUP_CATALOG WHERE ENTRY_TYPE_NAME = 'complete data backup');" + sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "SELECT TO_DATE(SYS_END_TIME), days_between(SYS_END_TIME,CURRENT_TIMESTAMP) ,seconds_between(SYS_START_TIME,SYS_END_TIME), STATE_NAME,COMMENT FROM M_BACKUP_CATALOG WHERE ENTRY_TYPE_NAME = 'complete data backup' AND SYS_START_TIME = (SELECT MAX(SYS_START_TIME) FROM M_BACKUP_CATALOG WHERE ENTRY_TYPE_NAME = 'complete data backup');" } @@ -97,14 +97,14 @@ function sap_hana_mem () { local sidadm=$1 local inst_nr=$2 local db_user=$3 - local db_password="$4" + local db_password=$4 local sidadm_short=$5 echo "<<<sap_hana_mem:sep(44)>>>" echo "[[[$sidadm_short]]]" echo "[[[resident]]]" - sudo -i -u ${sidadm} hdbsql -n localhost -i ${inst_nr} -u ${db_user} -p "${db_password}" -j -a -x "SELECT HOST, ROUND(SUM(PHYSICAL_MEMORY_SIZE/1024/1024/1024),2) FROM M_SERVICE_MEMORY GROUP BY HOST;" + sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "SELECT HOST, ROUND(SUM(PHYSICAL_MEMORY_SIZE/1024/1024/1024),2) FROM M_SERVICE_MEMORY GROUP BY HOST;" echo "[[[database]]]" - sudo -i -u ${sidadm} hdbsql -n localhost -i ${inst_nr} -u ${db_user} -p "${db_password}" -j -a -x "select HOST, round(INSTANCE_TOTAL_MEMORY_ALLOCATED_SIZE/(1024*1024*1024), 2), round(ALLOCATION_LIMIT/(1024*1024*1024), 2), ROUND((USED_PHYSICAL_MEMORY + FREE_PHYSICAL_MEMORY)/1024/1024/1024,2) from M_HOST_RESOURCE_UTILIZATION;" + sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "select HOST, round(INSTANCE_TOTAL_MEMORY_ALLOCATED_SIZE/(1024*1024*1024), 2), round(ALLOCATION_LIMIT/(1024*1024*1024), 2), ROUND((USED_PHYSICAL_MEMORY + FREE_PHYSICAL_MEMORY)/1024/1024/1024,2) from M_HOST_RESOURCE_UTILIZATION;" } @@ -117,7 +117,7 @@ function sap_hana_filesystem () { local sidadm_short=$5 echo "<<<sap_hana_filesystem:sep(44)>>>" echo "[[[$sidadm_short]]]" - sudo -i -u ${sidadm} hdbsql -n localhost -i ${inst_nr} -u ${db_user} -p "${db_password}" -j -a -x "select D1.HOST, D1.USAGE_TYPE, ROUND(D2.USED_SIZE/1024/1024/1024,2),ROUND(D1.TOTAL_SIZE/1024/1024/1024,2) FROM M_DISKS AS D1 INNER JOIN M_DISK_USAGE AS D2 ON D1.USAGE_TYPE = D2.USAGE_TYPE;" + sudo -i -u "${sidadm}" hdbsql -n localhost -i "${inst_nr}" -u "${db_user}" -p "${db_password}" -j -a -x "select D1.HOST, D1.USAGE_TYPE, ROUND(D2.USED_SIZE/1024/1024/1024,2),ROUND(D1.TOTAL_SIZE/1024/1024/1024,2) FROM M_DISKS AS D1 INNER JOIN M_DISK_USAGE AS D2 ON D1.USAGE_TYPE = D2.USAGE_TYPE;" } @@ -137,11 +137,11 @@ $LSSAP for line in $($LSSAP | awk -F"|" '{if ($0 ~/\//) print tolower($1)"adm|"$2}' | sed "s/\s*//g") do - sidadm=$(echo "$line" | cut -d"|" -f1) - sidadm_short=$(echo "$sidadm" | sed "s/adm$//") - inst_nr=$(echo "$line" | cut -d"|" -f2) - process_list $sidadm $inst_nr $sidadm_short - hdb_version $sidadm $sidadm_short + sidadm=$(echo "${line}" | cut -d"|" -f1) + sidadm_short=${sidadm/%adm/} + inst_nr=$(echo "${line}" | cut -d"|" -f2) + process_list "${sidadm}" "${inst_nr}" "${sidadm_short}" + hdb_version "${sidadm}" "${sidadm_short}" DB_USER=DB_USER_$sidadm_short DB_USER=${!DB_USER} @@ -149,8 +149,8 @@ do DB_PASSWORD=${!DB_PASSWORD} if [ -n "$DB_USER" ] && [ -n "$DB_PASSWORD" ]; then - full_backup $sidadm $inst_nr ${DB_USER} ${DB_PASSWORD} $sidadm_short - sap_hana_mem $sidadm $inst_nr ${DB_USER} ${DB_PASSWORD} $sidadm_short - sap_hana_filesystem $sidadm $inst_nr ${DB_USER} ${DB_PASSWORD} $sidadm_short + full_backup "${sidadm}" "${inst_nr}" "${DB_USER}" "${DB_PASSWORD}" "${sidadm_short}" + sap_hana_mem "${sidadm}" "${inst_nr}" "${DB_USER}" "${DB_PASSWORD}" "${sidadm_short}" + sap_hana_filesystem "${sidadm}" "${inst_nr}" "${DB_USER}" "${DB_PASSWORD}" "${sidadm_short}" fi done

6 years, 5 months

Fixed some semantic errors

by Simon Betz

Module: check_mk Branch: master Commit: 4466b9ac6bcef0b663a43fcd95d373c4bb629d51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4466b9ac6bcef0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 12 13:10:28 2018 +0200 Fixed some semantic errors Change-Id: I4850043996aed91e4bdb5fdf45076ec7fe3e8227 --- agents/plugins/mk_site_object_counts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/agents/plugins/mk_site_object_counts b/agents/plugins/mk_site_object_counts index 7c5f9f7..8241a69 100755 --- a/agents/plugins/mk_site_object_counts +++ b/agents/plugins/mk_site_object_counts @@ -39,15 +39,14 @@ function get_tag_stats () { local site="$2" local header="$3" local tags=($(echo "$header" | tr ' ' '\n')) - if [ -n "$tags" ] && [ -S "$socket" ]; + if [ "${#tags[@]}" -ne 0 ] && [ -S "$socket" ]; then local tags_query="GET hosts\n" for tag in "${tags[@]}"; do tags_query="${tags_query}Stats: custom_variables ~ TAGS ${tag}\n" done - echo "Tags|$header|$(echo -e "${tags_query}" | \ - waitmax 3 /omd/sites/${site}/bin/unixcat ${socket})" + echo "Tags|$header|$(echo -e "${tags_query}" | waitmax 3 "/omd/sites/${site}/bin/unixcat" "${socket}")" fi } @@ -57,15 +56,14 @@ function get_check_command_stats () { local site="$2" local header="$3" local service_check_commands=($(echo "$header" | tr ' ' '\n')) - if [ -n "$service_check_commands" ] && [ -S "$socket" ]; + if [ "${#service_check_commands[@]}" -ne 0 ] && [ -S "$socket" ]; then local service_check_commands_query="GET services\n" for service_check_command in "${service_check_commands[@]}"; do service_check_commands_query="${service_check_commands_query}Stats: check_command ~~ ${service_check_command}$\n" done - echo "Service check commands|$header|$(echo -e "${service_check_commands_query}" | \ - waitmax 3 /omd/sites/${site}/bin/unixcat ${socket})" + echo "Service check commands|$header|$(echo -e "${service_check_commands_query}" | waitmax 3 "/omd/sites/${site}/bin/unixcat" "${socket}")" fi } @@ -80,10 +78,14 @@ function get_check_command_stats () { # | | # '----------------------------------------------------------------------' +SITES= +TAGS= +SERVICE_CHECK_COMMANDS= + if [ -e "$MK_CONFDIR/site_object_counts.cfg" ]; then - . $MK_CONFDIR/site_object_counts.cfg + . "$MK_CONFDIR/site_object_counts.cfg" fi

6 years, 5 months

5970 Cascading livestatus proxy is now possible

by Lars Michelsen

Module: check_mk Branch: master Commit: 6fda98fb8cc91a507e486c84860eadf0b8b7f709 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fda98fb8cc91a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 11 11:48:16 2018 +0200 5970 Cascading livestatus proxy is now possible It is now possible to cascade livestatus proxy configurations. This comes in handy to build cascaded distributed GUI (status GUI) setups. The feature has been build for a scenario like this: <ul> <li>A distributed setup where you have remote sites that are not directly reachable</li> <li>These remote sites are only reachable through a single "location master" site</li> <li>You use the "location masters" for configuration of all the related sites</li> <li>The central site is only used as central operating site (overview, reporting) and not for configuration</li> </ul> To get a cascading setup, configure Check_MK like this: <ul> <li>Location master: Create one site in "Distributed configuration" for each local site. Configure the connection parameters to use the Livestatus Proxy. Set the new option to open a TCP port for this connection and insert a TCP port that is currently not used on the local machine (e.g. 6560).</li> <li>Central viewer site: Create one site in "Distributed configuration" for each remote site. Configure it to use the Livestatus Proxy. Set the destination IP address to the IP address of the "Location master" server and set the TCP port to the port you configured for the site in the previous step.</li> </ul> After this you should be able to connect to your cascaded remote sites through the Livestatus Proxy of the "Location master". Change-Id: I28bf7940ad6ee63462fb3bd59da0c6c1727583a4 --- .werks/5970 | 37 +++++++++++++++++++++++++++++++++++ web/htdocs/wato.py | 3 ++- web/htdocs/watolib.py | 22 +++++++++++++++++++++ web/plugins/wato/omd_configuration.py | 22 +-------------------- 4 files changed, 62 insertions(+), 22 deletions(-) diff --git a/.werks/5970 b/.werks/5970 new file mode 100644 index 0000000..7872423 --- /dev/null +++ b/.werks/5970 @@ -0,0 +1,37 @@ +Title: Cascading livestatus proxy is now possible +Level: 2 +Component: liveproxy +Compatible: compat +Edition: cee +Version: 1.5.0b2 +Date: 1523438853 +Class: feature + +It is now possible to cascade livestatus proxy configurations. This comes in +handy to build cascaded distributed GUI (status GUI) setups. + +The feature has been build for a scenario like this: + +<ul> +<li>A distributed setup where you have remote sites that are not directly +reachable</li> <li>These remote sites are only reachable through a single +"location master" site</li> <li>You use the "location masters" for +configuration of all the related sites</li> <li>The central site is only used +as central operating site (overview, reporting) and not for configuration</li> +</ul> + +To get a cascading setup, configure Check_MK like this: + +<ul> +<li>Location master: Create one site in "Distributed configuration" for each +local site. Configure the connection parameters to use the Livestatus Proxy. +Set the new option to open a TCP port for this connection and insert a TCP port +that is currently not used on the local machine (e.g. 6560).</li> <li>Central +viewer site: Create one site in "Distributed configuration" for each remote +site. Configure it to use the Livestatus Proxy. Set the destination IP address +to the IP address of the "Location master" server and set the TCP port to the +port you configured for the site in the previous step.</li> +</ul> + +After this you should be able to connect to your cascaded remote sites through +the Livestatus Proxy of the "Location master". diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 1570cca..103ed30 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17471,7 +17471,8 @@ from watolib import \ ACTest, \ ACResultCRIT, \ ACResultWARN, \ - ACResultOK + ACResultOK, \ + LivestatusViaTCP def make_action_link(vars): diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index aef3b35..f345c05 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -10024,3 +10024,25 @@ def format_config_value(value): return format_func(value) +class LivestatusViaTCP(Dictionary): + def __init__(self, **kwargs): + kwargs["elements"] = [ + ("port", Integer( + title = _("TCP port"), + minvalue = 1, + maxvalue = 65535, + default_value = kwargs.get("tcp_port", 6557), + )), + ("only_from", ListOfStrings( + title = _("Restrict access to IP addresses"), + help = _("The access to Livestatus via TCP will only be allowed from the " + "configured source IP addresses. You can either configure specific " + "IP addresses or networks in the syntax <tt>10.3.3.0/24</tt>."), + + valuespec = IPv4Network(), + orientation = "horizontal", + allow_empty = False, + )), + ] + kwargs["optional_keys"] = [ "only_from" ] + super(LivestatusViaTCP, self).__init__(**kwargs) diff --git a/web/plugins/wato/omd_configuration.py b/web/plugins/wato/omd_configuration.py index 6933ad5..6905396 100644 --- a/web/plugins/wato/omd_configuration.py +++ b/web/plugins/wato/omd_configuration.py @@ -83,27 +83,7 @@ register_configvar(group, register_configvar(group, "site_livestatus_tcp", Optional( - Dictionary( - elements = [ - ("port", Integer( - title = _("TCP port"), - minvalue = 1, - maxvalue = 65535, - default_value = 6557, - )), - ("only_from", ListOfStrings( - title = _("Restrict access to IP addresses"), - help = _("The access to Livestatus via TCP will only be allowed from the " - "configured source IP addresses. You can either configure specific " - "IP addresses or networks in the syntax <tt>10.3.3.0/24</tt>."), - - valuespec = IPv4Network(), - orientation = "horizontal", - allow_empty = False, - )), - ], - optional_keys = [ "only_from" ], - ), + LivestatusViaTCP(), title = _("Access to Livestatus via TCP"), help = _("Check_MK Livestatus usually listens only on a local UNIX socket - " "for reasons of performance and security. This option is used "

6 years, 5 months

Refactoring: Moved liveproxyd tests to enterprise hierarchy

by Lars Michelsen

Module: check_mk Branch: master Commit: 6e13fe91b326ca7a5727281b786db82c536b2d94 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6e13fe91b326ca… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 2 16:33:21 2018 +0200 Refactoring: Moved liveproxyd tests to enterprise hierarchy The edition related tests need to be stored in edition specific paths. This is enterprise/tests for the CEE. Change-Id: I00ca53b747941388289558876e353dc66a7fdce4 --- tests/integration/livestatus/test_liveproxyd.py | 222 ------------------------ 1 file changed, 222 deletions(-) diff --git a/tests/integration/livestatus/test_liveproxyd.py b/tests/integration/livestatus/test_liveproxyd.py deleted file mode 100644 index ea0662e..0000000 --- a/tests/integration/livestatus/test_liveproxyd.py +++ /dev/null @@ -1,222 +0,0 @@ -#!/usr/bin/env python - -import os -import time -import pytest -import signal -from testlib import web - -(a)pytest.fixture(scope="module") -def default_cfg(web): - print "Applying default config" - web.add_host("livestatus-test-host", attributes={ - "ipaddress": "127.0.0.1", - }) - - web.discover_services("livestatus-test-host") - - web.activate_changes() - yield None - - # - # Cleanup code - # - print "Cleaning up default config" - - web.delete_host("livestatus-test-host") - - -def _toggle_liveproxyd(site, use_liveproxyd): - cfg = "on" if use_liveproxyd else "off" - site.set_config("LIVEPROXYD", cfg, with_restart=True) - - if use_liveproxyd: - assert site.file_exists("tmp/run/liveproxyd.pid") - else: - assert not site.file_exists("tmp/run/liveproxyd.pid") - - -def _change_liveproxyd_sites(site, sites): - site.write_file("etc/check_mk/liveproxyd.mk", - """sites.update(%r)""" % sites) - - # Trigger config reload - os.kill(int(site.read_file("tmp/run/liveproxyd.pid").strip()), signal.SIGUSR1) - - def _all_sockets_opened(): - return all([ site.file_exists("tmp/run/liveproxy/%s" % site_id) - for site_id in sites.keys() ]) - - timeout = time.time() + 60 - while timeout > time.time() and not _all_sockets_opened(): - time.sleep(0.5) - - assert _all_sockets_opened(), "Liveproxyd sockets not opened after 60 seconds" - - -def _use_liveproxyd_for_local_site(site, proto="unix"): - if proto != None: - if proto == "unix": - socket = None - else: - socket = ("127.0.0.1", site.livestatus_port) - - sites = { - site.id: { - 'cache': True, - 'channel_timeout': 3.0, - 'channels': 5, - 'connect_retry': 4.0, - 'heartbeat': (5, 2.0), - 'query_timeout': 120.0, - 'socket': socket, - } - } - else: - sites = {} - - _change_liveproxyd_sites(site, sites) - - -(a)pytest.mark.parametrize(("use_liveproxyd"), [ True, False ]) -def test_omd_toggle(default_cfg, site, use_liveproxyd): - _toggle_liveproxyd(site, use_liveproxyd) - - -(a)pytest.mark.parametrize(("proto"), [ "unix", "tcp" ]) -def test_simple_query(default_cfg, site, proto): - import livestatus - - if proto == "tcp": - site.open_livestatus_tcp() - - _toggle_liveproxyd(site, use_liveproxyd=True) - _use_liveproxyd_for_local_site(site, proto=proto) - - live = livestatus.MultiSiteConnection( - sites={ - site.id: { - 'alias': u'Der Master', - 'customer': 'provider', - 'disable_wato': True, - 'disabled': False, - 'insecure': False, - 'multisiteurl': '', - 'persist': False, - 'replicate_ec': False, - 'replicate_mkps': False, - 'replication': '', - 'socket': "unix:%s/tmp/run/liveproxy/%s" % (site.root, site.id), - 'status_host': None, - 'timeout': 10, - 'user_login': True, - 'user_sync': 'all', - } - } - ) - - assert live.dead_sites() == {} - - rows = live.query("GET hosts") - assert type(rows) == list - assert len(rows) >= 2 # header + min 1 host - - -def test_large_number_of_sites(default_cfg, site): - import livestatus - - _toggle_liveproxyd(site, use_liveproxyd=True) - - # Increase nofiles limit of CMC to prevent that it runs in "too many open files" resource limits - #exit_code = site.execute(["prlimit", "-p", site.read_file("tmp/run/cmc.pid").strip(), "-n4096"]).wait() - #assert exit_code == 0 - - site_sockets, num_sites, num_channels = {}, 200, 3 - for site_num in range(num_sites): - # Currently connect to local site - site_id = "site%03d" % site_num - - #if site_num % 2 == 0: - to_livestatus = None - #else: - # to_livestatus = ('127.0.0.1', 6999) - - site_sockets[site_id] = { - "to_livestatus" : to_livestatus, - "to_proxy" : "unix:%s/tmp/run/liveproxy/%s" % (site.root, site_id), - } - - liveproxyd_sites, livestatus_api_sites = {}, {} - - for site_id, site_sockets in site_sockets.items(): - liveproxyd_sites[site_id] = { - 'cache': False, - 'channel_timeout': 3.0, - 'channels': num_channels, - 'connect_retry': 4.0, - 'heartbeat': (5, 2.0), - 'query_timeout': 120.0, - 'socket': site_sockets["to_livestatus"], - } - - livestatus_api_sites[site_id] ={ - 'alias': u'Site %s' % site_id, - 'disable_wato': True, - 'disabled': False, - 'insecure': False, - 'multisiteurl': '', - 'persist': False, - 'replicate_ec': False, - 'replicate_mkps': False, - 'replication': '', - 'socket': site_sockets["to_proxy"], - 'status_host': None, - 'timeout': 2, - 'user_login': True, - 'user_sync': 'all', - } - - try: - site.write_file("etc/check_mk/conf.d/liveproxyd-test.mk", - "cmc_livestatus_threads = %d\n" % (num_channels*num_sites + 20)) - - site.write_file("etc/check_mk/multisite.d/sites.mk", - "sites.update(%r)\n" % livestatus_api_sites) - - site.execute(["cmk", "-O"]) - - # Disable limits of livestatus xinetd service - #site.execute(["sed", "-i", "-r", - # "'/^\s+cps\s+=/d;/^\s+instances\s+=/d;/^\s+per_source\s+=/d'", - # "etc/xinetd.d/mk-livestatus"]) - #site.execute(["omd", "restart", "xinetd"]) - - _change_liveproxyd_sites(site, liveproxyd_sites) - - def _num_connections_opened(): - # Need to reconstruct the object on each call because connect is - # currently done in constructor :-/ - live = livestatus.MultiSiteConnection(livestatus_api_sites) - assert live.dead_sites() == {} - - live.set_prepend_site(True) - rows = live.query("GET status\nColumns: program_version\n") - live.set_prepend_site(False) - - assert type(rows) == list - return len(rows) - - # Wait up to 30 seconds for all connections to be established. When opening so - # many connections to one cmc at the time some connects may fail temporarily - timeout = time.time() + 90 - while timeout > time.time() and _num_connections_opened() != len(livestatus_api_sites): - time.sleep(0.5) - - num_open = _num_connections_opened() - assert num_open == len(livestatus_api_sites), \ - "Liveproxyd sockets not opened after 60 seconds" - - finally: - _use_liveproxyd_for_local_site(site, proto="unix") - site.delete_file("etc/check_mk/conf.d/liveproxyd-test.mk") - site.delete_file("etc/check_mk/multisite.d/sites.mk")

6 years, 5 months

Refactoring: Add cmk.liveproxy module: New home for liveproxy implementation

by Lars Michelsen

Module: check_mk Branch: master Commit: 4b0f9f35458943e1dccae685b1552b8be2ec0897 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4b0f9f35458943… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 2 17:25:00 2018 +0200 Refactoring: Add cmk.liveproxy module: New home for liveproxy implementation Change-Id: Ie4845fa1552ea277910d5da7c437896983a4840e --- cmk/.f12 | 18 ++++++++++++++++-- cmk/cee | 1 + 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/cmk/.f12 b/cmk/.f12 index 8a4a24f..33167f8 100755 --- a/cmk/.f12 +++ b/cmk/.f12 @@ -5,6 +5,20 @@ SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} ROOT=/omd/sites/$SITE -sudo rsync -a * $ROOT/lib/python/cmk/ +echo "Update site $SITE..." + +echo "Copy CRE files..." +sudo rsync \ + --exclude=cee \ + --exclude=cee.py \ + -a * $ROOT/lib/python/cmk/ sudo pycompile -q $ROOT/lib/python/cmk/ -echo "Installed to $ROOT/lib/python/cmk/" + +# Also deploy all other directories of same type +if [ ${ALL_EDITIONS:-1} != 0 ]; then + for WHAT in enterprise managed; do + if [ -e ../$WHAT/cmk/.f12 ]; then + (cd ../$WHAT/cmk; ONLY_COPY=1 ALL_EDITIONS=0 bash .f12) + fi + done +fi diff --git a/cmk/cee b/cmk/cee new file mode 120000 index 0000000..b0d2e19 --- /dev/null +++ b/cmk/cee @@ -0,0 +1 @@ +../enterprise/cmk/cee \ No newline at end of file

6 years, 5 months

Make _what an instance attribute for custom host/user attributes

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 7e3a87fb2fb256e4e69798de546e5a7d48e1cd1c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7e3a87fb2fb256… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Apr 11 15:43:56 2018 +0200 Make _what an instance attribute for custom host/user attributes Previously, _what was a class attribute defined in subclasses, but was used already in the base classes. Now, _what is made an instance attribute defined in the base class itself. This makes the use of _what more explicit. This is sufficient to make pylint happy again. In the long run _what has to be moved to the subclasses, because base classes should not now implementation details of child classes. Change-Id: I19edbe611a115aab26a28009e337981636b8e405 --- web/htdocs/wato.py | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index d6adb02..1570cca 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -15522,6 +15522,15 @@ class ModePatternEditor(WatoMode): # '----------------------------------------------------------------------' class CustomAttrMode(WatoMode): + def __init__(self, what): + # TODO: move _what to the subclasses. + # Note: _what is used in _from_vars defined in the subclass + # ModeEditCustomAttr but called in the base class WatoMode. + # Therefore, we have to set it before init right now. + self._what = what + super(CustomAttrMode, self).__init__() + + @classmethod def custom_attr_types(cls): return [ @@ -15572,6 +15581,10 @@ class CustomAttrMode(WatoMode): class ModeEditCustomAttr(CustomAttrMode): + def __init__(self, what): + super(ModeEditCustomAttr, self).__init__(what) + + def _from_vars(self): self._name = html.var("edit") # missing -> new custom attr self._new = self._name == None @@ -15733,8 +15746,8 @@ class ModeEditCustomAttr(CustomAttrMode): class ModeEditCustomUserAttr(ModeEditCustomAttr): - # TODO: Cleanup "what" variable - _what = "user" + def __init__(self): + super(ModeEditCustomUserAttr, self).__init__('user') def title(self): if self._new: @@ -15749,7 +15762,8 @@ class ModeEditCustomUserAttr(ModeEditCustomAttr): class ModeEditCustomHostAttr(ModeEditCustomAttr): - _what = "host" + def __init__(self): + super(ModeEditCustomHostAttr, self).__init__('host') def title(self): if self._new: @@ -15765,8 +15779,8 @@ class ModeEditCustomHostAttr(ModeEditCustomAttr): class ModeCustomAttrs(CustomAttrMode): - def __init__(self): - super(ModeCustomAttrs, self).__init__() + def __init__(self, what): + super(ModeCustomAttrs, self).__init__(what) self._load_attributes(lock=html.is_transaction()) @@ -15822,7 +15836,9 @@ class ModeCustomAttrs(CustomAttrMode): class ModeCustomUserAttrs(ModeCustomAttrs): - _what = "user" + def __init__(self): + super(ModeCustomUserAttrs, self).__init__('user') + def title(self): return _("Custom User Attributes") @@ -15835,7 +15851,9 @@ class ModeCustomUserAttrs(ModeCustomAttrs): class ModeCustomHostAttrs(ModeCustomAttrs): - _what = "host" + def __init__(self): + super(ModeCustomHostAttrs, self).__init__('host') + def title(self): return _("Custom Host Attributes")

6 years, 5 months

Make pylint happy in cmk/schedule.py

by Tom Baerwinkel

Module: check_mk Branch: master Commit: aefe581c22d47811b66b3c2fe62ebd205e44d6d7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aefe581c22d478… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Apr 11 17:50:19 2018 +0200 Make pylint happy in cmk/schedule.py Change-Id: Iec0fbcc9ab91078f926283a79deb903ab2e368ed --- cmk/schedule.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/schedule.py b/cmk/schedule.py index 9ece34a..9aedec7 100644 --- a/cmk/schedule.py +++ b/cmk/schedule.py @@ -37,7 +37,7 @@ from dateutil.relativedelta import relativedelta from dateutil.rrule import rrule, DAILY, WEEKLY, MONTHLY -class Schedule: +class Schedule(object): """ Abstract base class for schedules. A default implementation for the last and next event at a given datetime are provided.

6 years, 5 months

5620 orion_system, orion_system.charging, orion_system.dc, orion_backup, orion_batterytest: New checks for Delta Energy Systems devices

by Simon Betz

Module: check_mk Branch: master Commit: 7b7b9b8af6d5e7ec6d14ec42f2884992cf3afd50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7b7b9b8af6d5e7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 19 14:06:18 2018 +0100 5620 orion_system, orion_system.charging, orion_system.dc, orion_backup, orion_batterytest: New checks for Delta Energy Systems devices Change-Id: Ia67ed061db61b8356f5d8fc2a33468faeb90a503 --- .werks/5620 | 10 +++ checkman/orion_backup | 17 +++++ checkman/orion_batterytest | 18 ++++++ checkman/orion_system | 14 ++++ checkman/orion_system.charging | 14 ++++ checkman/orion_system.dc | 14 ++++ checks/orion_backup | 54 ++++++++++++++++ checks/orion_batterytest | 64 ++++++++++++++++++ checks/orion_system | 143 +++++++++++++++++++++++++++++++++++++++++ 9 files changed, 348 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=7b7b9b8af6…

6 years, 5 months

5768 sap_hana check plugins are instance aware

by Simon Betz

Module: check_mk Branch: master Commit: 4481d1321e3dcd78d25bb4219f2b6f347ad1fd09 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4481d1321e3dcd… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 23 11:59:22 2018 +0100 5768 sap_hana check plugins are instance aware If you have already installed the {{sap_hana}} plugin and discovered service, please re-discover the affected hosts. Change-Id: I36f3c335a464147efb9ae6fcebe7cdd7c5fc9d90 --- .werks/5768 | 12 +++++++++++ agents/plugins/mk_sap_hana | 27 +++++++++++++++++------ checkman/sap_hana_full_backup | 3 +++ checks/sap_hana_filesystem | 22 ++++++++++++------- checks/sap_hana_full_backup | 36 ++++++++++++++++++++++++------- checks/sap_hana_mem | 50 +++++++++++++++++++++++++------------------ checks/sap_hana_process_list | 32 ++++++++++++++++----------- checks/sap_hana_version | 28 ++++++++++++++++-------- 8 files changed, 144 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=4481d1321e…

6 years, 5 months

← Newer
1
...
14
15
16
17
18
19
20
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2018