Skip to content

Commit d473778

Browse files
authored
[FIX] Resolved issue causing deploy_esexporter.sh to fail when doing an upgrade-in-place and serviceMonitor CRD is not installed. (#747)
1 parent c03545e commit d473778

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
# SAS Viya Monitoring for Kubernetes
2+
## unreleased
3+
* **Logging**
4+
* [FIX] Resolved issue causing deploy_esexporter.sh to fail when doing an upgrade-in-place and serviceMonitor CRD is not installed.
5+
6+
27
## Version 1.2.36 (15APR2025)
38
* **Overall**
49
* [ANNOUNCEMENT] As announced previously, this project now *requires* the `yq` command-line processor for YAML. Specifically, a recent version (4.32+) of the [Golang-based (Mike Farah) version of `yq`](https://github.com/mikefarah/yq)

logging/bin/deploy_esexporter.sh

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,19 @@ if helm3ReleaseExists es-exporter $LOG_NS; then
4747
helm -n $LOG_NS delete es-exporter
4848
fi
4949

50-
monNamespace=$(kubectl get servicemonitor -A --field-selector=metadata.name=elasticsearch -l sas.com/monitoring-base=kube-viya-monitoring -o=custom-columns=NAMESPACE:.metadata.namespace --no-headers)
51-
if [ -n "$monNamespace" ]; then
52-
log_debug "Removing obsolete serviceMonitor [$monNamespace/elasticsearch]"
53-
kubectl delete -n $monNamespace servicemonitor elasticsearch
54-
log_debug "Deploying an updated serviceMonitor for Elasticsearch [$monNamespace/elasticsearch-v2]"
55-
kubectl apply -n $monNamespace -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
50+
if kubectl get crd servicemonitors.monitoring.coreos.com 2>1 1>/dev/null; then
51+
#serviceMonitor CRD may not be present if metric monitoring stack is not deployed
52+
monNamespace=$(kubectl get servicemonitor -A --field-selector=metadata.name=elasticsearch -l sas.com/monitoring-base=kube-viya-monitoring -o=custom-columns=NAMESPACE:.metadata.namespace --no-headers)
53+
if [ -n "$monNamespace" ]; then
54+
log_debug "Removing obsolete serviceMonitor [$monNamespace/elasticsearch]"
55+
kubectl delete -n $monNamespace servicemonitor elasticsearch
56+
log_debug "Deploying an updated serviceMonitor for Elasticsearch [$monNamespace/elasticsearch-v2]"
57+
kubectl apply -n $monNamespace -f monitoring/monitors/logging/serviceMonitor-elasticsearch-v2.yaml
58+
else
59+
log_debug "No instance of the obsolete elasticsearch serviceMonitor found."
60+
fi
61+
else
62+
log_debug "No serviceMonitor CRD detected; skipping check for obsolete elasticseach serviceMonitor instance."
5663
fi
5764
else
5865
log_debug "No existing Helm release [es-exporter] found."

0 commit comments

Comments
 (0)