From fae4e3d7529c86b2a8d66480d1cbc65038696aad Mon Sep 17 00:00:00 2001 From: Vasileios Date: Tue, 15 Sep 2026 15:18:55 +0300 Subject: [PATCH 1/2] fix: resolve script paths relative to script location --- scripts/collect_digest.sh | 24 +++++++++--------------- scripts/collect_tags.sh | 16 +++++++++------- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/scripts/collect_digest.sh b/scripts/collect_digest.sh index 4710d2f..55ab393 100755 --- a/scripts/collect_digest.sh +++ b/scripts/collect_digest.sh @@ -1,11 +1,12 @@ - #!/bin/bash -sudo apt install jq - -# Exit on any error set -e +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" + +sudo apt-get install -y jq + # Check if token argument is provided if [ -z "$1" ]; then echo "Usage: $0 " @@ -15,7 +16,7 @@ fi # Set the token PRIVATE_TOKEN="$1" -./get_digest.sh $PRIVATE_TOKEN +"$SCRIPT_DIR/get_digest.sh" "$PRIVATE_TOKEN" source build.env @@ -23,15 +24,8 @@ cat build.env VALUES_YAML="${2:-values.yaml}" -if [ $VALUES_YAML not eq "values.yaml"]; then - cp ../charts/hypo/values.yaml ../charts/hypo/$VALUES_YAML +if [ "$VALUES_YAML" != "values.yaml" ]; then + cp "$REPO_ROOT/charts/hypo/values.yaml" "$REPO_ROOT/charts/hypo/$VALUES_YAML" fi -cd .. && python3 scripts/helm_update_etsi.py $PKG_MANAGER $OSS_CLIENT $SONATA $TMF_API $PORTAL_CART $TELEMETRY_CLIENT $PEERING_API $REGISTRY_API $FABRIC_API $PORTAL $MONITOR --file=./charts/hypo/$VALUES_YAML - - - - - - - +python3 "$REPO_ROOT/scripts/helm_update_etsi.py" $PKG_MANAGER $OSS_CLIENT $SONATA $TMF_API $PORTAL_CART $TELEMETRY_CLIENT $PEERING_API $REGISTRY_API $FABRIC_API $PORTAL $MONITOR --file="$REPO_ROOT/charts/hypo/$VALUES_YAML" diff --git a/scripts/collect_tags.sh b/scripts/collect_tags.sh index c8e86f7..22afa37 100755 --- a/scripts/collect_tags.sh +++ b/scripts/collect_tags.sh @@ -1,10 +1,12 @@ #!/bin/bash -sudo apt install jq - -# Exit on any error set -e +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)" + +sudo apt-get install -y jq + # Check if token argument is provided if [ -z "$1" ]; then echo "Usage: $0 " @@ -14,7 +16,7 @@ fi # Set the token PRIVATE_TOKEN="$1" -./get_tags.sh $PRIVATE_TOKEN +"$SCRIPT_DIR/get_tags.sh" "$PRIVATE_TOKEN" source build.env @@ -22,8 +24,8 @@ cat build.env VALUES_YAML="${2:-values.yaml}" -if [ $VALUES_YAML not eq "values.yaml"]; then - cp ../charts/hypo/values.yaml ../charts/hypo/$VALUES_YAML +if [ "$VALUES_YAML" != "values.yaml" ]; then + cp "$REPO_ROOT/charts/hypo/values.yaml" "$REPO_ROOT/charts/hypo/$VALUES_YAML" fi -cd .. && python3 scripts/helm_update_etsi.py $PKG_MANAGER $OSS_CLIENT $SONATA $TMF_API $PORTAL_CART $TELEMETRY_CLIENT $PEERING_API $REGISTRY_API $FABRIC_API $PORTAL --file=./charts/hypo/$VALUES_YAML +python3 "$REPO_ROOT/scripts/helm_update_etsi.py" $PKG_MANAGER $OSS_CLIENT $SONATA $TMF_API $PORTAL_CART $TELEMETRY_CLIENT $PEERING_API $REGISTRY_API $FABRIC_API $PORTAL --file="$REPO_ROOT/charts/hypo/$VALUES_YAML" -- GitLab From bd080d0cd14da4e1433e9be8c04454f908debc87 Mon Sep 17 00:00:00 2001 From: Vasileios Date: Wed, 16 Sep 2026 14:43:37 +0300 Subject: [PATCH 2/2] feat: add check_alerts.sh to query Grafana alertmanager API --- scripts/check_alerts.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 scripts/check_alerts.sh diff --git a/scripts/check_alerts.sh b/scripts/check_alerts.sh new file mode 100755 index 0000000..61264c7 --- /dev/null +++ b/scripts/check_alerts.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +set -e + +NODE_IP="${1:-$(kubectl get nodes -o jsonpath='{.items[0].status.addresses[?(@.type=="InternalIP")].address}')}" + +GRAFANA_USER=$(kubectl get secret hypo-grafana -o jsonpath="{.data.admin-user}" | base64 -d) +GRAFANA_PASS=$(kubectl get secret hypo-grafana -o jsonpath="{.data.admin-password}" | base64 -d) + +echo "Using Node IP: $NODE_IP" +curl -s -u "$GRAFANA_USER:$GRAFANA_PASS" "http://${NODE_IP}:30030/api/alertmanager/grafana/api/v2/alerts" | jq -- GitLab