[v8.4.x] Fix website build errors (grafana#66109)

* Fix website build errors Signed-off-by: Jack Baldry <jack.baldry@grafana.com> * Add packages_api build in published docs Signed-off-by: Jack Baldry <jack.baldry@grafana.com> * Fix alerting test --------- Signed-off-by: Jack Baldry <jack.baldry@grafana.com> Co-authored-by: Armand Grillet <2117580+armandgrillet@users.noreply.github.com>
mapr · Apr 6, 2023 · 5585f8a · 5585f8a
1 parent f42058f
commit 5585f8a
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 23 deletions.
diff --git a/.github/workflows/publish-technical-documentation-release.yml b/.github/workflows/publish-technical-documentation-release.yml
@@ -36,6 +36,27 @@ jobs:
           release_tag_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)$"
           release_branch_regexp: "^v(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.x$"
 
+      - name: "Generate packages_api docs"
+        uses: "actions/setup-node@v3.2.0"
+        id: "generate-packages_api-docs"
+        with:
+          node-version: '16'
+
+      - name: "Get yarn cache directory path"
+        id: "yarn-cache-dir-path"
+        run: "echo ::set-output name=dir::$(yarn config get cacheFolder)"
+
+      - uses: "actions/cache@v2.1.7"
+        with:
+          path: "${{ steps.yarn-cache-dir-path.outputs.dir }}"
+          key: "yarn-${{ hashFiles('**/yarn.lock') }}"
+          restore-keys: |
+              yarn-
+
+      - run: "yarn install --immutable"
+
+      - run: "./scripts/ci-reference-docs-build.sh"
+
       - name: "Determine technical documentation version"
         if: "steps.has-matching-release-tag.outputs.bool == 'true'"
         uses: "./actions/docs-target"

diff --git a/docs/sources/administration/preferences/change-grafana-name.md b/docs/sources/administration/preferences/change-grafana-name.md
@@ -53,4 +53,4 @@ To change the team name or email, follow these steps:
 
 ## Change user name or email
 
-To learn how to edit your user information, refer to [Edit your profile]({{< relref "../manage-user-preferences/_index.md#edit-your-profile" >}}).
+To learn how to edit your user information, refer to [Edit your profile]({{< relref "../../manage-users/user-admin/user-profile" >}}).
diff --git a/docs/sources/dashboards/_index.md b/docs/sources/dashboards/_index.md
@@ -12,17 +12,17 @@ Dashboard snapshots are static . Queries and expressions cannot be re-executed f
 
 Before you begin, ensure that you have configured a data source. See also:
 
-- [Working with Grafana dashboard UI]({{< relref "./dashboard-ui/_index.md" >}})
-- [Dashboard folders]({{< relref "./dashboard-folders.md" >}})
+- [Working with Grafana dashboard UI]({{< relref "./dashboard-ui" >}})
+- [Dashboard folders]({{< relref "./dashboard_folders" >}})
 - [Create dashboard]({{< relref "./dashboard-create" >}})
-- [Manage dashboards]({{< relref "./dashboard-manage.md" >}})
-- [Annotations]({{< relref "./annotations.md" >}})
-- [Playlist]({{< relref "./playlist.md" >}})
-- [Search]({{< relref "./search.md" >}})
-- [Keyboard shortcuts]({{< relref "./shortcuts.md" >}})
-- [Reporting]({{< relref "./reporting.md" >}})
-- [Time range controls]({{< relref "./time-range-controls.md" >}})
-- [Dashboard version history]({{< relref "./dashboard-history.md" >}})
-- [Dashboard export and import]({{< relref "./export-import.md" >}})
-- [Dashboard JSON model]({{< relref "./json-model.md" >}})
-- [Scripted dashboards]({{< relref "./scripted-dashboards.md" >}})
+- [Manage dashboards]({{< relref "./dashboard-manage" >}})
+- [Annotations]({{< relref "./annotations" >}})
+- [Playlist]({{< relref "./playlist" >}})
+- [Search]({{< relref "./search" >}})
+- [Keyboard shortcuts]({{< relref "./shortcuts" >}})
+- [Reporting]({{< relref "./reporting" >}})
+- [Time range controls]({{< relref "./time-range-controls" >}})
+- [Dashboard version history]({{< relref "./dashboard_history" >}})
+- [Dashboard export and import]({{< relref "./export-import" >}})
+- [Dashboard JSON model]({{< relref "./json-model" >}})
+- [Scripted dashboards]({{< relref "./scripted-dashboards" >}})
diff --git a/docs/sources/manage-users/server-admin/server-admin-manage-orgs.md b/docs/sources/manage-users/server-admin/server-admin-manage-orgs.md
@@ -29,11 +29,13 @@ Grafana displays all organizations set up on the server, listed in alphabetical
 Add an organization to your Grafana server.
 
 {{< docs/list >}}
+
 {{< docs/shared "manage-users/view-server-org-list.md" >}}
 
 1. Click **+ New org**.
 1. Enter the name of the new organization and then click **Create**.
-   {{< /docs/list >}}
+
+{{< /docs/list >}}
 
 Two things happen:
 

diff --git a/docs/sources/shared/manage-users/view-server-org-list-and-edit.md b/docs/sources/shared/manage-users/view-server-org-list-and-edit.md
@@ -3,7 +3,9 @@ title: View org list as server admin
 ---
 
 {{< docs/list >}}
-{{< docs/shared "manage-users/view-server-org-list.md" >}}
+
+{{< docs/shared lookup="manage-users/view-server-org-list.md" source="grafana" version="v8.4" >}}
 
 1. Click the name of the organization that you want to edit.
-   {{< /docs/list >}}
+
+{{< /docs/list >}}
diff --git a/docs/sources/shared/manage-users/view-server-user-list-search.md b/docs/sources/shared/manage-users/view-server-user-list-search.md
@@ -3,7 +3,9 @@ title: View user list and search - list format
 ---
 
 {{< docs/list >}}
-{{< docs/shared "manage-users/view-server-user-list.md" >}}
+
+{{< docs/shared lookup="manage-users/view-server-user-list.md" source="grafana" version="v8.4" >}}
 
 1. Click the user account that you want to edit. If necessary, use the search field to find the account.
-   {{< /docs/list >}}
+
+{{< /docs/list >}}
diff --git a/docs/sources/whatsnew/whats-new-in-v8-0.md b/docs/sources/whatsnew/whats-new-in-v8-0.md
@@ -129,7 +129,7 @@ Under the hood, the new theme architecture enables us to bring more sophisticate
 
 When you inspect a panel, you can now download log results as a text (.txt) file.
 
-[Download log results]({{< relref "../panels/working-with-panels/download-log-results.md" >}}) was added as a result of this feature.
+[Download query results]({{< relref "../panels/working-with-panels/download-query-results.md" >}}) was added as a result of this feature.
 
 ### Inspector in Explore
 

diff --git a/pkg/tests/api/alerting/api_alertmanager_test.go b/pkg/tests/api/alerting/api_alertmanager_test.go
@@ -206,7 +206,8 @@ func TestAMConfigAccess(t *testing.T) {
 	})
 
 	t.Run("when creating silence", func(t *testing.T) {
-		body := `
+		now := time.Now()
+		body := fmt.Sprintf(`
 		{
 			"comment": "string",
 			"createdBy": "string",
@@ -218,9 +219,10 @@ func TestAMConfigAccess(t *testing.T) {
 				"value": "string"
 			  }
 			],
-			"startsAt": "2021-03-31T13:17:04.419Z"
+			"startsAt": "%s",
+			"endsAt": "%s"
 		  }
-		`
+		`, now.Format(time.RFC3339), now.Add(10*time.Second).Format(time.RFC3339))
 
 		testCases := []testCase{
 			{