From 7b841fe77eb9ab362b7506c05b4b64cfa6c9aa47 Mon Sep 17 00:00:00 2001 From: Tim Van Steenburgh Date: Thu, 13 Apr 2017 15:11:33 -0400 Subject: [PATCH] Fix nagios checks. --- .../layers/kubernetes-master/reactive/kubernetes_master.py | 5 +++++ .../layers/kubernetes-worker/reactive/kubernetes_worker.py | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py index 6e6bde349e8..a392a9dbff5 100644 --- a/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py +++ b/cluster/juju/layers/kubernetes-master/reactive/kubernetes_master.py @@ -49,6 +49,11 @@ from charmhelpers.fetch import apt_install from charmhelpers.contrib.charmsupport import nrpe +# Override the default nagios shortname regex to allow periods, which we +# need because our bin names contain them (e.g. 'snap.foo.daemon'). The +# default regex in charmhelpers doesn't allow periods, but nagios itself does. +nrpe.Check.shortname_re = '[\.A-Za-z0-9-_]+$' + os.environ['PATH'] += os.pathsep + os.path.join(os.sep, 'snap', 'bin') diff --git a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py index 88c907f387a..c887dc23421 100644 --- a/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py +++ b/cluster/juju/layers/kubernetes-worker/reactive/kubernetes_worker.py @@ -39,6 +39,11 @@ from charmhelpers.core.host import service_stop, service_restart from charmhelpers.contrib.charmsupport import nrpe +# Override the default nagios shortname regex to allow periods, which we +# need because our bin names contain them (e.g. 'snap.foo.daemon'). The +# default regex in charmhelpers doesn't allow periods, but nagios itself does. +nrpe.Check.shortname_re = '[\.A-Za-z0-9-_]+$' + kubeconfig_path = '/root/cdk/kubeconfig' os.environ['PATH'] += os.pathsep + os.path.join(os.sep, 'snap', 'bin')