Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

by Alex Zurhake

Module: check_mk Branch: master Commit: eea0d1bdf3962e78dd14a66fec7da80f31d6038f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eea0d1bdf3962e… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 13:47:15 2019 +0100 Revert "avoid piling up data" This reverts commit fd2401c5cfd8a31ad13d4c4b58328793a9a25091. --- buildscripts/scripts/nightly-build.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index a211941..831aace 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -35,7 +35,7 @@ node { docker.image(IMAGE).pull() docker.image(IMAGE).inside('-u 0:0 -v /var/jenkins_home/daily-data/:/var/jenkins_home/daily-data/ --network ci_local-infra') { stage('checkout sources') { - sh "rm -rf ${DAILY_DATA}/.." + sh "rm -rf ${DAILY_DATA}" sh 'rm -rf *' // Add line to delete folders older than 10 days dir("${DAILY_DATA}/git") {

5 years, 3 months

Make docker_get_short_id work for kubernetes output

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 993dfa076fda01935bdd3c758d0d08d7124f5a2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=993dfa076fda01… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 22 16:51:24 2019 +0100 Make docker_get_short_id work for kubernetes output CMK-1893 Change-Id: Iac8ec527758cb034fd63de9420fe888f4f6be849 --- checks/docker.include | 2 +- tests/unit/checks/test_docker_parse_helpers.py | 25 ++++++--------------- .../checks/test_docker_parse_legacy_helpers.py | 26 ++++++++++++++++++++++ 3 files changed, 34 insertions(+), 19 deletions(-) diff --git a/checks/docker.include b/checks/docker.include index 0c53a16..00cae82 100644 --- a/checks/docker.include +++ b/checks/docker.include @@ -44,7 +44,7 @@ def docker_get_version(info): def docker_get_short_id(string): - return string.split(":", 1)[-1][:12] + return string.rsplit(":", 1)[-1][:12] def docker_format_labels(obj): diff --git a/tests/unit/checks/test_docker_parse_helpers.py b/tests/unit/checks/test_docker_parse_helpers.py index aa0ebfc..2dd9e6c 100644 --- a/tests/unit/checks/test_docker_parse_helpers.py +++ b/tests/unit/checks/test_docker_parse_helpers.py @@ -3,24 +3,13 @@ import os pytestmark = pytest.mark.checks -execfile(os.path.join(os.path.dirname(__file__), '../../../checks/legacy_docker.include')) +execfile(os.path.join(os.path.dirname(__file__), '../../../checks/docker.include')) -(a)pytest.mark.parametrize('indata,outdata', [ - ("123GB (42%)", 123000000000), - ("0 B", 0), - ("2B", 2), - ("23 kB", 23000), - ("", None), +(a)pytest.mark.parametrize('indata,expected', [ + ("docker-pullable://nginx@sha256:e3456c851a152494c3e4ff5fcc26f240206abac0c9d794affb40e0714846c451", + "e3456c851a15"), ]) -def test_parse_legacy_docker_get_bytes(indata, outdata): - parsed = _legacy_docker_get_bytes(indata) - assert outdata == parsed - - -(a)pytest.mark.parametrize('indata,outdata', [ - ("sha256:8b15606a9e3e430cb7ba739fde2fbb3734a19f8a59a825ffa877f9be49059817", "8b15606a9e3e"), -]) -def test_parse_legacy_docker_trunk_id(indata, outdata): - parsed = _legacy_docker_trunk_id(indata) - assert outdata == parsed +def test_parse_short_id(indata, expected): + actual = docker_get_short_id(indata) + assert actual == expected diff --git a/tests/unit/checks/test_docker_parse_legacy_helpers.py b/tests/unit/checks/test_docker_parse_legacy_helpers.py new file mode 100644 index 0000000..aa0ebfc --- /dev/null +++ b/tests/unit/checks/test_docker_parse_legacy_helpers.py @@ -0,0 +1,26 @@ +import pytest +import os + +pytestmark = pytest.mark.checks + +execfile(os.path.join(os.path.dirname(__file__), '../../../checks/legacy_docker.include')) + + +(a)pytest.mark.parametrize('indata,outdata', [ + ("123GB (42%)", 123000000000), + ("0 B", 0), + ("2B", 2), + ("23 kB", 23000), + ("", None), +]) +def test_parse_legacy_docker_get_bytes(indata, outdata): + parsed = _legacy_docker_get_bytes(indata) + assert outdata == parsed + + +(a)pytest.mark.parametrize('indata,outdata', [ + ("sha256:8b15606a9e3e430cb7ba739fde2fbb3734a19f8a59a825ffa877f9be49059817", "8b15606a9e3e"), +]) +def test_parse_legacy_docker_trunk_id(indata, outdata): + parsed = _legacy_docker_trunk_id(indata) + assert outdata == parsed

5 years, 3 months

k8s_pod_containers: add check and inventory for pod container

by Tom Baerwinkel

Module: check_mk Branch: master Commit: db4d8ccc4df9900912e05b1a46170a54ccbb089c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=db4d8ccc4df990… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 22 16:57:47 2019 +0100 k8s_pod_containers: add check and inventory for pod container CMK-1893 Change-Id: I9cfb3723219426962c593dc1186bd034e5c17643 --- checkman/k8s_pod_container | 15 ++++++ checks/k8s_pod_container | 47 +++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 6 +++ cmk/gui/plugins/views/inventory.py | 31 +++++++++++++ cmk/special_agents/agent_kubernetes.py | 42 +++++++++++++++-- inventory/k8s_pod_container | 53 ++++++++++++++++++++++ .../datasets/k8s_pod_container_regression.py | 18 ++++++++ 7 files changed, 209 insertions(+), 3 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=db4d8ccc4d…

5 years, 3 months

agent_kubernetes, k8s_resources: return resources for individual pods

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 005c489760efee1b4d5b2e19d95a49c4bcad502d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=005c489760efee… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Fri Mar 22 09:45:13 2019 +0100 agent_kubernetes, k8s_resources: return resources for individual pods CMK-1893 Change-Id: I9158f9cf6d74950c74f6639215fe7eca7ff49717 --- checks/k8s_resources | 10 ++++++---- cmk/gui/plugins/metrics/check_mk.py | 4 ++-- cmk/special_agents/agent_kubernetes.py | 10 ++++++++++ .../checks/generictests/datasets/k8s_resources_regression.py | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/checks/k8s_resources b/checks/k8s_resources index 47c482a..45b6161 100644 --- a/checks/k8s_resources +++ b/checks/k8s_resources @@ -27,7 +27,7 @@ def get_k8s_resources_inventory_function(name): def inventory_function(parsed): - if parsed.get('capacity', {}).get(name): + if parsed.get('requests', {}).get(name) is not None: return [(None, {})] return inventory_function @@ -46,11 +46,13 @@ def get_k8s_resources_check_function(name, default, readable): yield 0, 'Limit: %s' % readable(limit), [('k8s_%s_limit' % name, limit)] allocatable = parsed.get('allocatable', {}).get(name, default) - yield 0, 'Allocatable: %s' % readable(allocatable), [('k8s_%s_allocatable' % name, - allocatable)] + if allocatable: + yield 0, 'Allocatable: %s' % readable(allocatable), [('k8s_%s_allocatable' % name, + allocatable)] capacity = parsed.get('capacity', {}).get(name, default) - yield 0, 'Capacity: %s' % readable(capacity), [('k8s_%s_capacity' % name, capacity)] + if capacity: + yield 0, 'Capacity: %s' % readable(capacity), [('k8s_%s_capacity' % name, capacity)] if allocatable: usage = 100.0 * request / allocatable diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 794fc92..0dd85b1 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -8929,7 +8929,7 @@ graph_info["k8s_resources.cpu"] = { ("k8s_cpu_limit", "area"), ("k8s_cpu_request", "area"), ], - "optional_metrics": ["k8s_cpu_limit"], + "optional_metrics": ["k8s_cpu_capacity", "k8s_cpu_allocatable", "k8s_cpu_limit"], } graph_info["k8s_resources.memory"] = { @@ -8940,7 +8940,7 @@ graph_info["k8s_resources.memory"] = { ("k8s_memory_limit", "area"), ("k8s_memory_request", "area"), ], - "optional_metrics": ["k8s_memory_limit"], + "optional_metrics": ["k8s_memory_capacity", "k8s_memory_allocatable", "k8s_memory_limit"], } graph_info["used_cpu_time"] = { diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index f6b6bbe..1dee77f 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -440,6 +440,9 @@ class PodList(ListLike[Pod]): def pods_in_cluster(self): return {'requests': {'pods': len(self)}} + def resources(self): + return {pod.name: pod.resources for pod in self} + def resources_per_node(self): # type: () -> Dict[str, Dict[str, Dict[str, float]]] """ @@ -769,6 +772,12 @@ class ApiData(object): e.get('k8s_pods_%s' % c_metric).insert(self.pods_Metrics[c_metric]) return '\n'.join(e.output()) + def pod_sections(self): + logging.info('Output pod sections') + g = Group() + g.join('k8s_resources', self.pods.resources()) + return '\n'.join(g.output()) + def get_api_client(arguments): # type: (argparse.Namespace) -> client.ApiClient @@ -810,6 +819,7 @@ def main(args=None): print(api_data.cluster_sections()) print(api_data.node_sections()) print(api_data.custom_metrics_section()) + print(api_data.pod_sections()) except Exception as e: if arguments.debug: raise diff --git a/tests/unit/checks/generictests/datasets/k8s_resources_regression.py b/tests/unit/checks/generictests/datasets/k8s_resources_regression.py index 71e9cd5..5854c08 100644 --- a/tests/unit/checks/generictests/datasets/k8s_resources_regression.py +++ b/tests/unit/checks/generictests/datasets/k8s_resources_regression.py @@ -2,7 +2,7 @@ checkname = 'k8s_resources' info = [[ - u'{"allocatable": {"pods": 110, "cpu": 0.9400000000000001, "memory": 609845248.0}, "capacity": {"pods": 110, "cpu": 1.0, "memory": 609845248.0}, "requests": {"cpu": 0.2, "memory": 0.0}, "limits": {"cpu": 0.5, "memory": Infinity}, "allocations": {}}' + u'{"allocatable": {"pods": 110, "cpu": 0.9400000000000001, "memory": 609845248.0}, "capacity": {"pods": 110, "cpu": 1.0, "memory": 609845248.0}, "requests": {"pods": 0, "cpu": 0.2, "memory": 0.0}, "limits": {"cpu": 0.5, "memory": Infinity}, "allocations": {}}' ]] discovery = {

5 years, 3 months

Ensure that no user configures a tag group named "site"

by Lars Michelsen

Module: check_mk Branch: master Commit: c14062b3d1e59c914035c340429f50edde0f4ac6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c14062b3d1e59c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 22 15:11:25 2019 +0100 Ensure that no user configures a tag group named "site" This tag group is set automatically by the builtin host attribute "site" which is implemented using the class HostAttributeSite. Change-Id: I1fc0b3dfd7322408aa02db487cc7e6cc2051add1 --- cmk/gui/tags.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cmk/gui/tags.py b/cmk/gui/tags.py index 43f9c4f..4ef3819 100644 --- a/cmk/gui/tags.py +++ b/cmk/gui/tags.py @@ -427,10 +427,14 @@ class TagConfig(object): # TODO: cleanup this mess # This validation is quite gui specific, I do not want to introduce this into the base classes def _validate_group(self, tag_group): - if len(tag_group.id) == 0: + if not tag_group.id: raise MKUserError("tag_id", _("Please specify an ID for your tag group.")) _validate_tag_id(tag_group.id, "tag_id") + if tag_group.id == "site": + raise MKUserError("tag_id", + _("The tag group %s is reserved for internal use.") % tag_group.id) + for tmp_group in self.tag_groups: if tmp_group == tag_group: continue

5 years, 3 months

agent_kubernetes: make output for nodes and pods optional

by Tom Baerwinkel

Module: check_mk Branch: master Commit: c8076fb507d9af48b2105c3ca43cc2e946961ee8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8076fb507d9af… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Mar 25 13:07:56 2019 +0100 agent_kubernetes: make output for nodes and pods optional CMK-1893 Change-Id: I91394ae75d2d2bd59886876677a858d8227a35db --- checks/agent_kubernetes | 2 + cmk/gui/plugins/wato/datasource_programs.py | 97 ++++++++++++++++++----------- cmk/special_agents/agent_kubernetes.py | 12 +++- 3 files changed, 71 insertions(+), 40 deletions(-) diff --git a/checks/agent_kubernetes b/checks/agent_kubernetes index 9497ce1..1efc29f 100644 --- a/checks/agent_kubernetes +++ b/checks/agent_kubernetes @@ -28,6 +28,8 @@ def agent_kubernetes_arguments(params, _hostname, ipaddress): args = ['--token', passwordstore_get_cmdline("%s", params["token"])] + args += ['--infos', ','.join(params.get('infos', ['nodes']))] + if "port" in params: args += ["--port", str(params["port"])] diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index 5dc5ae0..b4c8290 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -139,46 +139,67 @@ class RulespecSpecialAgentsKubernetes(HostRulespec): @property def valuespec(self): - return Dictionary( - elements=[ - ("token", IndividualOrStoredPassword( - title=_("Token"), - allow_empty=False, - )), - ("port", - Integer( - title=_(u"Port"), - help=_("If no port is given a default value of 443 will be used."), - default_value=443)), - ("url-prefix", - HTTPUrl( - title=_("Custom URL prefix"), - help=_("Defines the scheme (either HTTP or HTTPS) and host part " - "of Kubernetes API calls like e.g. \"https://example.com\". " - "If no prefix is specified HTTPS together with the IP of " - "the host will be used."), - allow_empty=False)), - ("path-prefix", - TextAscii( - title=_("Custom path prefix"), - help=_( - "Specifies a URL path prefix which is prepended to the path in calls " - "to the Kubernetes API. This is e.g. useful if Rancher is used to " - "manage Kubernetes clusters. If no prefix is given \"/\" will be used."), - allow_empty=False)), - ("no-cert-check", - Alternative( - title=_("Disable certificate verification"), - elements=[ - FixedValue(False, title=_("Deactivated"), totext=""), - FixedValue(True, title=_("Activated"), totext=""), - ], - default_value=False)), - ], - optional_keys=["port", "url-prefix", "path-prefix", "no-cert-check"], - title=_(u"Kubernetes"), + return Transform( + Dictionary( + elements=[ + ("token", IndividualOrStoredPassword( + title=_("Token"), + allow_empty=False, + )), + ("infos", + ListChoice( + choices=[ + ("nodes", _("Nodes")), + ("pods", _("Pods")), + ], + default_value=[ + "nodes", + ], + allow_empty=False, + title=_("Retrieve information about..."))), + ("port", + Integer( + title=_(u"Port"), + help=_("If no port is given a default value of 443 will be used."), + default_value=443)), + ("url-prefix", + HTTPUrl( + title=_("Custom URL prefix"), + help=_("Defines the scheme (either HTTP or HTTPS) and host part " + "of Kubernetes API calls like e.g. \"https://example.com\". " + "If no prefix is specified HTTPS together with the IP of " + "the host will be used."), + allow_empty=False)), + ("path-prefix", + TextAscii( + title=_("Custom path prefix"), + help=_( + "Specifies a URL path prefix which is prepended to the path in calls " + "to the Kubernetes API. This is e.g. useful if Rancher is used to " + "manage Kubernetes clusters. If no prefix is given \"/\" will be used." + ), + allow_empty=False)), + ("no-cert-check", + Alternative( + title=_("Disable certificate verification"), + elements=[ + FixedValue(False, title=_("Deactivated"), totext=""), + FixedValue(True, title=_("Activated"), totext=""), + ], + default_value=False)), + ], + optional_keys=["port", "url-prefix", "path-prefix", "no-cert-check"], + title=_(u"Kubernetes"), + ), + forth=self._transform_infos, ) + def _transform_infos(self, value): + if 'infos' in value: + return value + value['infos'] = ['nodes'] + return value + @rulespec_registry.register class RulespecSpecialAgentsVsphere(HostRulespec): diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index f150c8e..ac250ac 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -76,6 +76,12 @@ def parse(args): p.add_argument('host', metavar='HOST', help='Kubernetes host to connect to') p.add_argument('--port', type=int, default=443, help='Port to connect to') p.add_argument('--token', required=True, help='Token for that user') + p.add_argument( + '--infos', + type=lambda x: x.split(','), + required=True, + help='Comma separated list of items that should be fetched', + ) p.add_argument('--url-prefix', help='Custom URL prefix for Kubernetes API calls') p.add_argument( '--path-prefix', @@ -853,9 +859,11 @@ def main(args=None): api_client = get_api_client(arguments) api_data = ApiData(api_client) print(api_data.cluster_sections()) - print(api_data.node_sections()) print(api_data.custom_metrics_section()) - print(api_data.pod_sections()) + if 'nodes' in arguments.infos: + print(api_data.node_sections()) + if 'pods' in arguments.infos: + print(api_data.pod_sections()) except Exception as e: if arguments.debug: raise

5 years, 3 months

FIX BI Special Agent: Fixed two issues preventing the agent to run at all

by Andreas Boesl

Module: check_mk Branch: master Commit: cb676ac4a81ac35c6dafd704b137b2db9700f7de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb676ac4a81ac3… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Mon Mar 25 14:40:20 2019 +0100 FIX BI Special Agent: Fixed two issues preventing the agent to run at all Fixed: Exception determining the credentials for the automation account. Fixed: Web API interface get_bi_aggregations was unable to consider the filter key as optional CMK-1875 Change-Id: I0db02ae33bd5359694fc04e1f35e2fc360447ea7 --- agents/special/agent_bi | 4 +++- cmk/gui/plugins/webapi/webapi.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/agents/special/agent_bi b/agents/special/agent_bi index e1ae2e9..d656ff9 100755 --- a/agents/special/agent_bi +++ b/agents/special/agent_bi @@ -136,7 +136,9 @@ class AggregationRawdataGenerator(object): secret_file_path = Path( cmk.utils.paths.var_dir) / "web" / self._username / "automation.secret" - self._secret = file(secret_file_path).read() + + with secret_file_path.open(encoding="utf-8") as f: + self._secret = f.read() else: self._username, self._secret = self._credentials[1] diff --git a/cmk/gui/plugins/webapi/webapi.py b/cmk/gui/plugins/webapi/webapi.py index 1b47ab0..62f9ad8 100644 --- a/cmk/gui/plugins/webapi/webapi.py +++ b/cmk/gui/plugins/webapi/webapi.py @@ -1006,6 +1006,7 @@ class APICallBIAggregationState(APICallCollection): return { "get_bi_aggregations": { "handler": self._get, + "optional_keys": ["filter"], "required_permissions": required_permissions, }, }

5 years, 3 months

Extracted code from ModeFolder._show_hosts to helper functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 70ad3c4e7b3ad0db0725e40771ac051e983aa795 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70ad3c4e7b3ad0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 26 12:17:51 2019 +0100 Extracted code from ModeFolder._show_hosts to helper functions Change-Id: Ifc832614e6d9921faa1dd97d36aa4b3718da2ac9 --- cmk/gui/wato/pages/folders.py | 312 ++++++++++++++++++++++-------------------- 1 file changed, 160 insertions(+), 152 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=70ad3c4e7b…

5 years, 3 months

The directory is called download and not downloads

by Alex Zurhake

Module: check_mk Branch: master Commit: 416078e7d3a745a892e689a8f62adafe649f4731 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=416078e7d3a745… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 12:11:19 2019 +0100 The directory is called download and not downloads Change-Id: I702182301f000637480092d83fd222eab403ae52 --- buildscripts/scripts/nightly-build.jenkins | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 4ccaabc..82593b0 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -213,14 +213,14 @@ node { // Only master builds should end up on the Website if (BRANCH_NAME == 'master') { sh """ - mkdir -p /bauwelt/downloads/${CMK_VERS} - cd /bauwelt/downloads/${CMK_VERS} + mkdir -p /bauwelt/download/${CMK_VERS} + cd /bauwelt/download/${CMK_VERS} cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true """ withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { sh """ - cd /bauwelt/downloads/${CMK_VERS} + cd /bauwelt/download/${CMK_VERS} ${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh ${CMK_VERS} rsync -av -e "ssh -o StrictHostKeyChecking=no -i ${RELEASE_KEY_DIR}" \ ${PACKAGE_DIR}/${CMK_VERS} \ @@ -228,7 +228,7 @@ node { """ } } else { - dir("${DAILY_DATA}/downloads") { + dir("${DAILY_DATA}/download") { sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*_amd64.deb . || true" sh "cp ${DAILY_DATA}/*-dest/check-mk-enterprise-*.x86_64.rpm . || true" withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) {

5 years, 3 months

avoid piling up data

by Alex Zurhake

Module: check_mk Branch: master Commit: fd2401c5cfd8a31ad13d4c4b58328793a9a25091 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fd2401c5cfd8a3… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Mar 26 10:13:33 2019 +0100 avoid piling up data Change-Id: I4364bd891ee8b7371c119e1a0438bef5b2e0949d --- buildscripts/scripts/nightly-build.jenkins | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index 892d1b4..4ccaabc 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -35,7 +35,7 @@ node { docker.image(IMAGE).pull() docker.image(IMAGE).inside('-u 0:0 -v /var/jenkins_home/daily-data/:/var/jenkins_home/daily-data/ --network ci_local-infra') { stage('checkout sources') { - sh "rm -rf ${DAILY_DATA}" + sh "rm -rf ${DAILY_DATA}/.." sh 'rm -rf *' // Add line to delete folders older than 10 days dir("${DAILY_DATA}/git") {

5 years, 3 months

← Newer
1
...
9
10
11
12
13
14
15
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019