From 4a53df0c9b89ca4766a222e0faac5b08020ec501 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 4 Sep 2023 11:47:17 +0000
Subject: [PATCH] Update `make docs` procedure (#2952)

Co-authored-by: grafanabot <bot@grafana.com>
Co-authored-by: Jack Baldry <jack.baldry@grafana.com>
---
 docs/make-docs | 52 +++++++++++++++++++++++++++++++++-----------------
 1 file changed, 34 insertions(+), 18 deletions(-)

diff --git a/docs/make-docs b/docs/make-docs
index 79219618..60759480 100755
--- a/docs/make-docs
+++ b/docs/make-docs
@@ -6,6 +6,13 @@
 # [Semantic versioning](https://semver.org/) is used to help the reader identify the significance of changes.
 # Changes are relevant to this script and the support docs.mk GNU Make interface.
 
+# ## 4.2.0 (2023-09-01)
+
+# ### Added
+
+# - Retry the initial webserver request up to ten times to allow for the process to start.
+#   If it is still failing after ten seconds, an error message is logged.
+
 # ## 4.1.1 (2023-07-20)
 
 # ### Fixed
@@ -439,30 +446,39 @@ await_build() {
   url="$1"
   req="$(if command -v curl >/dev/null 2>&1; then echo 'curl -s -o /dev/null'; else echo 'wget -q'; fi)"
 
-  sleep 2
+  i=1
+  max=10
+  while [ "${i}" -ne "${max}" ]
+  do
+    sleep 1
+    debg "Retrying request to webserver assuming the process is still starting up."
+    i=$((i + 1))
 
-  if ${req} "${url}"; then
-    echo
-    echo "View documentation locally:"
-    for x in ${url_src_dst_vers}; do
-      IFS='^' read -r url _ _ <<POSIX_HERESTRING
+    if ${req} "${url}"; then
+      echo
+      echo "View documentation locally:"
+      for x in ${url_src_dst_vers}; do
+        IFS='^' read -r url _ _ <<POSIX_HERESTRING
 $x
 POSIX_HERESTRING
 
-      if [ -n "${url}" ]; then
-        if [ "${_url}" != "arbitrary" ]; then
-          echo "  ${url}"
+        if [ -n "${url}" ]; then
+          if [ "${_url}" != "arbitrary" ]; then
+            echo "  ${url}"
+          fi
         fi
-      fi
-    done
-    echo
-    echo 'Press Ctrl+C to stop the server'
-  else
-    echo
-    errr 'The build was interrupted or a build error occurred, check the previous logs for possible causes.'
-  fi
+      done
+      echo
+      echo 'Press Ctrl+C to stop the server'
 
-  unset url req
+      unset i max req url
+      return
+    fi
+  done
+
+  echo
+  errr 'The build was interrupted or a build error occurred, check the previous logs for possible causes.'
+  unset i max req url
 }
 
 debg() {