From 73034eb3b52dd80e85cc29880e695845042bab71 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 7 Nov 2023 13:07:31 +0100 Subject: [PATCH 1/3] try to use a curl header file to stop jenkins madness --- upload.sh | 45 ++++++--------------------------------------- 1 file changed, 6 insertions(+), 39 deletions(-) diff --git a/upload.sh b/upload.sh index 216d97d..e3d2ec9 100755 --- a/upload.sh +++ b/upload.sh @@ -49,24 +49,13 @@ EOF echo "Uploading $file" url="https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots/$a-${panel}" - curl $url -s -k -v \ - -H 'accept: application/json, text/plain, */*' \ - -H "x-grafana-org-id: ${GRAFANA_ORG_ID}" \ - -H 'content-type: application/json' \ - -H "Authorization: Bearer ${GRAFANA_API_KEY}" \ - -X DELETE > $curllog + curl "$url" -s -v -k curl_headers.txt -X DELETE > $curllog logDelete $url sleep 5 url='https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots' - curl $url -s -k -v \ - -H 'accept: application/json, text/plain, */*' \ - -H "x-grafana-org-id: ${GRAFANA_ORG_ID}" \ - -H 'content-type: application/json' \ - -H "Authorization: Bearer ${GRAFANA_API_KEY}" \ - --data-binary @${file} \ - --compressed > $curllog || failed=true + curl "$url" -s -v -k curl_headers.txt --data-binary @${file} --compressed > $curllog || failed=true logCreate $url else echo "ERROR: $file missing" @@ -78,47 +67,25 @@ done echo "Uploading simple-performance-cluster" url='https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots/simple-performance-cluster' -curl $url -s -k -v \ - -H 'accept: application/json, text/plain, */*' \ - -H "x-grafana-org-id: ${GRAFANA_ORG_ID}" \ - -H 'content-type: application/json' \ - -H "Authorization: Bearer ${GRAFANA_API_KEY}" \ - -X DELETE > $curllog +curl "$url" -s -v -k curl_headers.txt -X DELETE > $curllog logDelete $url sleep 5 url='https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots' -curl $url -s -k -v \ - -H 'accept: application/json, text/plain, */*' \ - -H "x-grafana-org-id: ${GRAFANA_ORG_ID}" \ - -H 'content-type: application/json' \ - -H "Authorization: Bearer ${GRAFANA_API_KEY}" \ - --data-binary @cluster.json \ - --compressed > $curllog || failed=true +curl $url -s -v -k curl_headers.txt --data-binary @cluster.json --compressed > $curllog || failed=true logCreate $url echo "Uploading simple-performance-singleserver-cluster-devel" url='https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots/simple-performance-singleserver-cluster-devel' -curl $url -s -k -v \ - -H 'accept: application/json, text/plain, */*' \ - -H "x-grafana-org-id: ${GRAFANA_ORG_ID}" \ - -H 'content-type: application/json' \ - -H "Authorization: Bearer ${GRAFANA_API_KEY}" \ - -X DELETE > $curllog +curl "$url" -s -v -k curl_headers.txt -X DELETE > $curllog logDelete $url sleep 5 url='https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots' -curl $url -s -k -v \ - -H 'accept: application/json, text/plain, */*' \ - -H "x-grafana-org-id: ${GRAFANA_ORG_ID}" \ - -H 'content-type: application/json' \ - -H "Authorization: Bearer ${GRAFANA_API_KEY}" \ - --data-binary @single-cluster.json \ - --compressed > $curllog || failed=true +curl "$url" -s -v -k curl_headers.txt --data-binary @single-cluster.json --compressed > $curllog || failed=true logCreate $url rm -f $curllog From 23a24434da17a2d75331d3a5057379a49acfab06 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 7 Nov 2023 23:34:22 +0100 Subject: [PATCH 2/3] read headers from text file --- upload.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/upload.sh b/upload.sh index e3d2ec9..e6f47f2 100755 --- a/upload.sh +++ b/upload.sh @@ -49,13 +49,13 @@ EOF echo "Uploading $file" url="https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots/$a-${panel}" - curl "$url" -s -v -k curl_headers.txt -X DELETE > $curllog + curl "$url" -s -v -H @curl_headers.txt -X DELETE > $curllog logDelete $url sleep 5 url='https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots' - curl "$url" -s -v -k curl_headers.txt --data-binary @${file} --compressed > $curllog || failed=true + curl "$url" -s -v -H @curl_headers.txt --data-binary @${file} --compressed > $curllog || failed=true logCreate $url else echo "ERROR: $file missing" @@ -67,25 +67,25 @@ done echo "Uploading simple-performance-cluster" url='https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots/simple-performance-cluster' -curl "$url" -s -v -k curl_headers.txt -X DELETE > $curllog +curl "$url" -s -v -H @curl_headers.txt -X DELETE > $curllog logDelete $url sleep 5 url='https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots' -curl $url -s -v -k curl_headers.txt --data-binary @cluster.json --compressed > $curllog || failed=true +curl $url -s -v -H @curl_headers.txt --data-binary @cluster.json --compressed > $curllog || failed=true logCreate $url echo "Uploading simple-performance-singleserver-cluster-devel" url='https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots/simple-performance-singleserver-cluster-devel' -curl "$url" -s -v -k curl_headers.txt -X DELETE > $curllog +curl "$url" -s -v -H @curl_headers.txt -X DELETE > $curllog logDelete $url sleep 5 url='https://g-dc685c4b12.grafana-workspace.eu-central-1.amazonaws.com/api/snapshots' -curl "$url" -s -v -k curl_headers.txt --data-binary @single-cluster.json --compressed > $curllog || failed=true +curl "$url" -s -v -H @curl_headers.txt --data-binary @single-cluster.json --compressed > $curllog || failed=true logCreate $url rm -f $curllog From 5a5158b57802e2500b4f327dfc5a7cf3a2d35675 Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Wed, 8 Nov 2023 17:03:53 +0100 Subject: [PATCH 3/3] print curl version --- upload.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/upload.sh b/upload.sh index e6f47f2..2f193b1 100755 --- a/upload.sh +++ b/upload.sh @@ -1,4 +1,5 @@ #!/bin/bash +curl --version failed=false logfile=/tmp/logfile.$$ curllog=/tmp/curllog.$$