From 3d4ff877211d3105df0e5611961669bd0d53a4ab Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 10 Nov 2020 21:19:05 +0530 Subject: [PATCH] [v7.3.x] Drone: Fix docs building (#28987) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Drone: Fix docs building (#28986) Signed-off-by: Arve Knudsen (cherry picked from commit 9582e0afd94c90c6e014333ba9cb7896fa0468e1) * Updated Co-authored-by: Arve Knudsen Co-authored-by: Torkel Ödegaard --- .drone.yml | 12 +----------- .../field-options/configure-specific-fields.md | 4 +--- scripts/lib.star | 2 +- scripts/master.star | 2 -- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/.drone.yml b/.drone.yml index fc6a1ca5c62..57d612ba6a7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -155,7 +155,7 @@ steps: image: grafana/docs-base:latest commands: - mkdir -p /hugo/content/docs/grafana - - cp -r docs/sources /hugo/content/docs/grafana/latest + - cp -r docs/sources/* /hugo/content/docs/grafana/latest/ - cd /hugo && make prod depends_on: - initialize @@ -458,16 +458,6 @@ steps: depends_on: - build-frontend -- name: build-docs-website - image: grafana/docs-base:latest - commands: - - mkdir -p /hugo/content/docs/grafana - - cp -r docs/sources /hugo/content/docs/grafana/latest - - cd /hugo && make prod - depends_on: - - initialize - - build-frontend-docs - - name: copy-packages-for-docker image: grafana/build-container:1.2.28 commands: diff --git a/docs/sources/panels/field-options/configure-specific-fields.md b/docs/sources/panels/field-options/configure-specific-fields.md index a08987f63e5..f2bcb1306a7 100644 --- a/docs/sources/panels/field-options/configure-specific-fields.md +++ b/docs/sources/panels/field-options/configure-specific-fields.md @@ -11,7 +11,7 @@ Overrides allow you to change the settings for one or more fields. Field options For example, you could change the number of decimal places shown in all numeric fields or columns by changing the **Decimals** option for **Fields with type** that matches **Numeric**. For more information about options, refer to: - [Standard field options]({{< relref "standard-field-options.md" >}}), which apply to all panel visualizations that allow transformations. - - [Table field options]({{< relref "table-field-options.md" >}}), which only apply to table panel visualizations. + - There can also be visualization specific field display options ## Add a field override @@ -26,8 +26,6 @@ You can override as many field options as you want to. - **Fields with type -** Allows you to select fields by type, such as string, numeric, and so on. Properties you add to a rule with this selector are applied to all fields that match the selected type. 1. Click **Add override property**. 1. Select the field option that you want to apply. - - [Standard field options]({{< relref "standard-field-options.md" >}}), which apply to all panel visualizations that allow transformations. - - [Table field options]({{< relref "table-field-options.md" >}}), which only apply to table panel visualizations. 1. Enter options by adding values in the fields. To return options to default values, delete the white text in the fields. 1. Continue to add overrides to this field by clicking **Add override property**, or you can click **Add override** and select a different field to add overrides to. 1. When finished, click **Save** to save all panel edits to the dashboard. diff --git a/scripts/lib.star b/scripts/lib.star index 77f8e2cc6c9..165aba8cc40 100644 --- a/scripts/lib.star +++ b/scripts/lib.star @@ -631,7 +631,7 @@ def build_docs_website_step(): ], 'commands': [ 'mkdir -p /hugo/content/docs/grafana', - 'cp -r docs/sources /hugo/content/docs/grafana/latest', + 'cp -r docs/sources/* /hugo/content/docs/grafana/latest/', 'cd /hugo && make prod', ], } diff --git a/scripts/master.star b/scripts/master.star index 89f53ceb3c7..874d4ed4701 100644 --- a/scripts/master.star +++ b/scripts/master.star @@ -14,7 +14,6 @@ load( 'e2e_tests_step', 'build_storybook_step', 'build_frontend_docs_step', - 'build_docs_website_step', 'copy_packages_for_docker_step', 'build_docker_images_step', 'postgres_integration_tests_step', @@ -54,7 +53,6 @@ def get_steps(edition, is_downstream=False): build_storybook_step(edition=edition, ver_mode=ver_mode), publish_storybook_step(edition=edition, ver_mode=ver_mode), build_frontend_docs_step(edition=edition), - build_docs_website_step(), copy_packages_for_docker_step(), build_docker_images_step(edition=edition, ver_mode=ver_mode, publish=publish), build_docker_images_step(edition=edition, ver_mode=ver_mode, ubuntu=True, publish=publish),