Skip to content

Commit

Permalink
Merge pull request sassoftware#637 from sassoftware/newdash
Browse files Browse the repository at this point in the history
Added new Grafana dashboard
  • Loading branch information
ceelias authored May 14, 2024
2 parents c6e35f5 + 87c2a86 commit 1aa0614
Show file tree
Hide file tree
Showing 4 changed files with 8,349 additions and 3 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# SAS Viya Monitoring for Kubernetes

## Unreleased
* **Metrics**
* [CHANGE] New Grafana dashboard Perf/Analysis added
* [CHANGE] Server-Side Apply now used in monitoring/bin/deploy_dashboards.sh script

## Version 1.2.24 (16APR2024)
* **Metrics**
* [FIX] Connect to Grafana using https from auto-provisioning sidecar containers when TLS is enabled
Expand Down
2 changes: 1 addition & 1 deletion bin/kube-include.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ fi
# 2024.01 1.25 1.27
# 2024.02 1.26 1.28
# 2024.03 1.26 1.28
# 2024.04 1.27 1.29
# 2024.04 1.26 1.28

if [[ $KUBE_SERVER_VER =~ v1.2[1-9] ]]; then
:
Expand Down
4 changes: 2 additions & 2 deletions monitoring/bin/deploy_dashboards.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function deploy_dashboards {
log_debug "Deploying dashboard from file [$f]"
name=$(basename $f .json)

kubectl create cm -n $DASH_NS $name --dry-run=client --from-file $f -o yaml | kubectl apply -f -
kubectl create cm -n $DASH_NS $name --dry-run=client --from-file $f -o yaml | kubectl apply --server-side -f -
kubectl label cm -n $DASH_NS $name --overwrite grafana_dashboard=1 sas.com/monitoring-base=kube-viya-monitoring sas.com/dashboardType=$type
fi
done
Expand All @@ -55,7 +55,7 @@ if [ "$1" != "" ]; then
f=$1
log_info "Deploying Grafana dashboard [$f]"
name=$(basename $f .json)
kubectl create cm -n $DASH_NS $name --dry-run=client --from-file $f -o yaml | kubectl apply -f -
kubectl create cm -n $DASH_NS $name --dry-run=client --from-file $f -o yaml | kubectl apply --server-side -f -
kubectl label cm -n $DASH_NS $name --overwrite grafana_dashboard=1 sas.com/monitoring-base=kube-viya-monitoring sas.com/dashboardType=manual
exit $?
else
Expand Down
Loading

0 comments on commit 1aa0614

Please sign in to comment.