From 9b9ae3169a5b4f7b59fb55dad63264fde80f4330 Mon Sep 17 00:00:00 2001 From: grafanabot Date: Wed, 1 Nov 2023 07:00:51 +0000 Subject: [PATCH 1/2] Update `make docs` procedure --- docs/make-docs | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/docs/make-docs b/docs/make-docs index a6cc6b1b9f..badc36a470 100755 --- a/docs/make-docs +++ b/docs/make-docs @@ -6,6 +6,12 @@ # [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. # +# ## 5.1.1 (2023-10-30) +# +# ### Added +# +# - Support for Datadog and Oracle data source plugins repositories. +# # ## 5.1.0 (2023-10-20) # # ### Added @@ -249,8 +255,10 @@ SOURCES_grafana_cloud_frontend_observability_faro_web_sdk='faro-web-sdk' SOURCES_helm_charts_mimir_distributed='mimir' SOURCES_helm_charts_tempo_distributed='tempo' SOURCES_opentelemetry='opentelemetry-docs' +SOURCES_plugins_grafana_datadog_datasource='datadog-datasource' SOURCES_plugins_grafana_jira_datasource='jira-datasource' SOURCES_plugins_grafana_mongodb_datasource='mongodb-datasource' +SOURCES_plugins_grafana_oracle_datasource='oracle-datasource' SOURCES_plugins_grafana_splunk_datasource='splunk-datasource' VERSIONS_as_code='UNVERSIONED' @@ -261,8 +269,10 @@ VERSIONS_grafana_cloud_k6='UNVERSIONED' VERSIONS_grafana_cloud_data_configuration_integrations='UNVERSIONED' VERSIONS_grafana_cloud_frontend_observability_faro_web_sdk='UNVERSIONED' VERSIONS_opentelemetry='UNVERSIONED' +VERSIONS_plugins_grafana_datadog_datasource='latest' VERSIONS_plugins_grafana_jira_datasource='latest' VERSIONS_plugins_grafana_mongodb_datasource='latest' +VERSIONS_plugins_grafana_oracle_datasource='latest' VERSIONS_plugins_grafana_splunk_datasource='latest' VERSIONS_technical_documentation='UNVERSIONED' VERSIONS_website='UNVERSIONED' @@ -272,8 +282,10 @@ PATHS_grafana_cloud='content/docs/grafana-cloud' PATHS_helm_charts_mimir_distributed='docs/sources/helm-charts/mimir-distributed' PATHS_helm_charts_tempo_distributed='docs/sources/helm-charts/tempo-distributed' PATHS_mimir='docs/sources/mimir' +PATHS_plugins_grafana_datadog_datasource='docs/sources' PATHS_plugins_grafana_jira_datasource='docs/sources' PATHS_plugins_grafana_mongodb_datasource='docs/sources' +PATHS_plugins_grafana_oracle_datasource='docs/sources' PATHS_plugins_grafana_splunk_datasource='docs/sources' PATHS_tempo='docs/sources/tempo' PATHS_website='content' From 724ffcf8695fafa45a2f002cc8c652dd6558acb9 Mon Sep 17 00:00:00 2001 From: Jack Baldry Date: Wed, 1 Nov 2023 11:08:12 +0000 Subject: [PATCH 2/2] Use single PR for all updates Signed-off-by: Jack Baldry --- .github/workflows/update-make-docs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update-make-docs.yml b/.github/workflows/update-make-docs.yml index 014fd80057..4b7903bd0a 100644 --- a/.github/workflows/update-make-docs.yml +++ b/.github/workflows/update-make-docs.yml @@ -12,16 +12,16 @@ jobs: - name: Update procedure run: | + BRANCH=update-make-docs + git checkout -b "${BRANCH}" curl -s -Lo docs/docs.mk https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/docs.mk curl -s -Lo docs/make-docs https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/make-docs if git diff --exit-code; then exit 0; fi - BRANCH="$(date +%Y-%m-%d)/update-make-docs" - git checkout -b "${BRANCH}" git add . git config --local user.email "bot@grafana.com" git config --local user.name "grafanabot" git commit -m "Update \`make docs\` procedure" git push -v origin "refs/heads/${BRANCH}" - gh pr create --fill + gh pr create --fill || true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}