From 44b5c008f11c515df78e3cbdf7a86cd3d6e4bd6f Mon Sep 17 00:00:00 2001 From: Steve Wilkerson Date: Fri, 1 Feb 2019 15:18:34 -0600 Subject: [PATCH] Monitoring job: Remove nagios file mount check This removes the elasticsearch query clause json file check from the single node monitoring job, as it's become a bit unreliable. Instead, we'll rely on the periodic multinode job to validate this works as intended Change-Id: I8d33a2625d5d666af280467dc21d76ed0302f837 --- .../deployment/osh-infra-monitoring/120-nagios.sh | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/tools/deployment/osh-infra-monitoring/120-nagios.sh b/tools/deployment/osh-infra-monitoring/120-nagios.sh index d9f1085fa..f47e25556 100755 --- a/tools/deployment/osh-infra-monitoring/120-nagios.sh +++ b/tools/deployment/osh-infra-monitoring/120-nagios.sh @@ -20,23 +20,11 @@ set -xe make nagios #NOTE: Deploy command -tee /tmp/nagios.yaml << EOF -conf: - nagios: - query_es_clauses: - test_es_query: - hello: world -EOF helm upgrade --install nagios ./nagios \ - --namespace=osh-infra \ - --values=/tmp/nagios.yaml + --namespace=osh-infra #NOTE: Wait for deploy ./tools/deployment/common/wait-for-pods.sh osh-infra #NOTE: Validate Deployment info helm status nagios - -#NOTE: Verify elasticsearch query clauses are functional by execing into pod -NAGIOS_POD=$(kubectl -n osh-infra get pods -l='application=nagios,component=monitoring' --output=jsonpath='{.items[0].metadata.name}') -kubectl exec $NAGIOS_POD -n osh-infra -c nagios -- cat /opt/nagios/etc/objects/query_es_clauses.json | python -m json.tool