diff --git a/.betterer.results b/.betterer.results index 65cff40dd87a..1dddf6342c4e 100644 --- a/.betterer.results +++ b/.betterer.results @@ -6769,18 +6769,6 @@ exports[`better eslint`] = { [0, 0, 0, "Do not use any type assertions.", "1"], [0, 0, 0, "Do not use any type assertions.", "2"] ], - "public/app/plugins/datasource/mssql/datasource.ts:5381": [ - [0, 0, 0, "Unexpected any. Specify a different type.", "0"], - [0, 0, 0, "Unexpected any. Specify a different type.", "1"], - [0, 0, 0, "Do not use any type assertions.", "2"], - [0, 0, 0, "Unexpected any. Specify a different type.", "3"], - [0, 0, 0, "Unexpected any. Specify a different type.", "4"], - [0, 0, 0, "Unexpected any. Specify a different type.", "5"], - [0, 0, 0, "Unexpected any. Specify a different type.", "6"], - [0, 0, 0, "Unexpected any. Specify a different type.", "7"], - [0, 0, 0, "Do not use any type assertions.", "8"], - [0, 0, 0, "Unexpected any. Specify a different type.", "9"] - ], "public/app/plugins/datasource/mssql/response_parser.ts:5381": [ [0, 0, 0, "Do not use any type assertions.", "0"], [0, 0, 0, "Unexpected any. Specify a different type.", "1"], diff --git a/.drone.yml b/.drone.yml index 36d79aef606f..0ed90b0cddd5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -28,7 +28,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build verify-drone @@ -80,14 +80,14 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -95,7 +95,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: event: @@ -136,7 +136,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn run prettier:check @@ -147,7 +147,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: lint-frontend trigger: event: @@ -192,7 +192,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -201,25 +201,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: event: @@ -266,12 +266,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update && apt-get install make @@ -280,7 +280,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.19.3 + image: golang:1.19.4 name: lint-backend trigger: event: @@ -332,7 +332,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -341,18 +341,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - failure: ignore image: grafana/drone-downstream @@ -372,7 +372,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -381,7 +381,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -390,7 +390,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -398,7 +398,7 @@ steps: - compile-build-cmd - yarn-install environment: null - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - . scripts/build/gpg-test-vars.sh && ./bin/build package --jobs 8 --edition oss @@ -409,7 +409,7 @@ steps: - build-frontend - build-frontend-packages environment: null - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ./scripts/grafana-server/start-server @@ -422,7 +422,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -500,7 +500,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-storybook when: paths: @@ -511,7 +511,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -598,7 +598,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -611,13 +611,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -633,7 +633,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -649,7 +649,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests trigger: event: @@ -705,7 +705,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - |- @@ -717,7 +717,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: codespell - commands: - yarn run prettier:checkDocs @@ -725,7 +725,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -767,13 +767,13 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build shellcheck depends_on: - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: shellcheck trigger: event: @@ -818,7 +818,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - |- @@ -830,7 +830,7 @@ steps: wan" > words_to_ignore.txt - codespell -I words_to_ignore.txt docs/ - rm words_to_ignore.txt - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: codespell - commands: - yarn run prettier:checkDocs @@ -838,7 +838,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: lint-docs - commands: - mkdir -p /hugo/content/docs/grafana @@ -889,14 +889,14 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -904,7 +904,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: branch: main @@ -942,7 +942,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn run prettier:check @@ -953,7 +953,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: lint-frontend trigger: branch: main @@ -995,7 +995,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1004,25 +1004,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: branch: main @@ -1062,12 +1062,12 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - make gen-go depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update && apt-get install make @@ -1076,7 +1076,7 @@ steps: - wire-install environment: CGO_ENABLED: "1" - image: golang:1.19.3 + image: golang:1.19.4 name: lint-backend - commands: - ./bin/build verify-drone @@ -1128,7 +1128,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -1137,18 +1137,18 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - git clone "https://$${GITHUB_TOKEN}@github.com/grafana/grafana-enterprise.git" @@ -1169,7 +1169,7 @@ steps: from_secret: github_token TEST_TAG: v0.0.0-test failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: trigger-test-release when: paths: @@ -1183,7 +1183,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1192,7 +1192,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -1201,7 +1201,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -1211,7 +1211,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -1222,14 +1222,14 @@ steps: - build-frontend-packages environment: GPG_KEY_PASSWORD: - from_secret: gpg_key_password + from_secret: packages_gpg_passphrase GPG_PRIV_KEY: - from_secret: gpg_priv_key + from_secret: packages_gpg_private_key GPG_PUB_KEY: - from_secret: gpg_pub_key + from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ./scripts/grafana-server/start-server @@ -1242,7 +1242,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -1320,7 +1320,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-storybook when: paths: @@ -1331,7 +1331,7 @@ steps: - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - yarn wait-on http://$HOST:$PORT @@ -1375,7 +1375,7 @@ steps: GRAFANA_MISC_STATS_API_KEY: from_secret: grafana_misc_stats_api_key failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: publish-frontend-metrics when: repo: @@ -1456,7 +1456,7 @@ steps: environment: NPM_TOKEN: from_secret: npm_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: release-canary-npm-packages when: repo: @@ -1552,7 +1552,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1565,13 +1565,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -1587,7 +1587,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -1603,7 +1603,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests trigger: branch: main @@ -1755,7 +1755,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - echo $DRONE_RUNNER_NAME @@ -1770,11 +1770,11 @@ steps: GCP_KEY: from_secret: gcp_key GPG_KEY_PASSWORD: - from_secret: gpg_key_password + from_secret: packages_gpg_passphrase GPG_PRIV_KEY: - from_secret: gpg_priv_key + from_secret: packages_gpg_private_key GPG_PUB_KEY: - from_secret: gpg_pub_key + from_secret: packages_gpg_public_key GRAFANA_COM_API_KEY: from_secret: grafana_api_key image: grafana/grafana-ci-deploy:1.3.3 @@ -1908,32 +1908,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss ${DRONE_TAG} @@ -1942,7 +1942,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss ${DRONE_TAG} @@ -1951,7 +1951,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -1961,7 +1961,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --sign ${DRONE_TAG} @@ -1972,21 +1972,21 @@ steps: - build-frontend-packages environment: GPG_KEY_PASSWORD: - from_secret: gpg_key_password + from_secret: packages_gpg_passphrase GPG_PRIV_KEY: - from_secret: gpg_priv_key + from_secret: packages_gpg_private_key GPG_PUB_KEY: - from_secret: gpg_pub_key + from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -2025,7 +2025,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -2103,7 +2103,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-storybook when: event: @@ -2161,7 +2161,7 @@ steps: from_secret: gcp_key PRERELEASE_BUCKET: from_secret: prerelease_bucket - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: store-npm-packages trigger: event: @@ -2211,14 +2211,14 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2226,7 +2226,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: event: @@ -2268,7 +2268,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2277,25 +2277,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: event: @@ -2365,13 +2365,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -2387,7 +2387,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -2403,7 +2403,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests trigger: event: @@ -2526,7 +2526,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2542,7 +2542,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -2550,19 +2550,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2572,14 +2572,14 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - ./bin/build build-backend --jobs 8 --edition enterprise ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2588,7 +2588,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise ${DRONE_TAG} @@ -2597,7 +2597,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -2607,14 +2607,14 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 ${DRONE_TAG} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise --sign ${DRONE_TAG} @@ -2626,21 +2626,21 @@ steps: - build-backend-enterprise2 environment: GPG_KEY_PASSWORD: - from_secret: gpg_key_password + from_secret: packages_gpg_passphrase GPG_PRIV_KEY: - from_secret: gpg_priv_key + from_secret: packages_gpg_private_key GPG_PUB_KEY: - from_secret: gpg_pub_key + from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -2680,7 +2680,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -2782,14 +2782,14 @@ steps: - build-backend-enterprise2 environment: GPG_KEY_PASSWORD: - from_secret: gpg_key_password + from_secret: packages_gpg_passphrase GPG_PRIV_KEY: - from_secret: gpg_priv_key + from_secret: packages_gpg_private_key GPG_PUB_KEY: - from_secret: gpg_pub_key + from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package-enterprise2 - commands: - ./bin/grabpl upload-cdn --edition enterprise2 @@ -2811,7 +2811,7 @@ steps: from_secret: gcp_key PRERELEASE_BUCKET: from_secret: prerelease_bucket - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: store-npm-packages - commands: - ./bin/grabpl upload-packages --edition enterprise2 @@ -2866,7 +2866,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -2882,7 +2882,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -2898,7 +2898,7 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci @@ -2906,7 +2906,7 @@ steps: - init-enterprise - yarn-install failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -2915,7 +2915,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: event: @@ -2955,7 +2955,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mkdir -p bin @@ -2977,7 +2977,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -2989,7 +2989,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -2999,25 +2999,25 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: event: @@ -3057,7 +3057,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mkdir -p bin @@ -3079,7 +3079,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -3091,7 +3091,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3101,25 +3101,25 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -tags=pro -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-enterprise2 - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: event: @@ -3195,7 +3195,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -3211,7 +3211,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -3221,13 +3221,13 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -3243,7 +3243,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -3259,7 +3259,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -3268,7 +3268,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -3277,7 +3277,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: memcached-integration-tests trigger: event: @@ -3412,7 +3412,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition oss @@ -3500,7 +3500,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -3571,7 +3571,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build artifacts docker fetch --edition enterprise @@ -3724,7 +3724,7 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - ./bin/grabpl artifacts npm retrieve --tag v${TAG} @@ -3746,7 +3746,7 @@ steps: NPM_TOKEN: from_secret: npm_token failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: release-npm-packages trigger: event: @@ -3787,7 +3787,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build publish packages --edition oss --gcp-key /tmp/gcpkey.json ${DRONE_TAG} @@ -3797,11 +3797,11 @@ steps: GCP_KEY: from_secret: gcp_key GPG_KEY_PASSWORD: - from_secret: gpg_key_password + from_secret: packages_gpg_passphrase GPG_PRIV_KEY: - from_secret: gpg_priv_key + from_secret: packages_gpg_private_key GPG_PUB_KEY: - from_secret: gpg_pub_key + from_secret: packages_gpg_public_key GRAFANA_COM_API_KEY: from_secret: grafana_api_key image: grafana/grafana-ci-deploy:1.3.3 @@ -3900,7 +3900,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build publish packages --edition enterprise --gcp-key /tmp/gcpkey.json ${DRONE_TAG} @@ -3910,11 +3910,11 @@ steps: GCP_KEY: from_secret: gcp_key GPG_KEY_PASSWORD: - from_secret: gpg_key_password + from_secret: packages_gpg_passphrase GPG_PRIV_KEY: - from_secret: gpg_priv_key + from_secret: packages_gpg_private_key GPG_PUB_KEY: - from_secret: gpg_pub_key + from_secret: packages_gpg_public_key GRAFANA_COM_API_KEY: from_secret: grafana_api_key image: grafana/grafana-ci-deploy:1.3.3 @@ -4012,7 +4012,7 @@ steps: environment: GCP_KEY: from_secret: gcp_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: artifacts-page trigger: event: @@ -4057,32 +4057,32 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - ./bin/build build-backend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4091,7 +4091,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} @@ -4100,7 +4100,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition oss @@ -4110,7 +4110,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build package --jobs 8 --edition oss --build-id ${DRONE_BUILD_NUMBER} --sign @@ -4121,21 +4121,21 @@ steps: - build-frontend-packages environment: GPG_KEY_PASSWORD: - from_secret: gpg_key_password + from_secret: packages_gpg_passphrase GPG_PRIV_KEY: - from_secret: gpg_priv_key + from_secret: packages_gpg_private_key GPG_PUB_KEY: - from_secret: gpg_pub_key + from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition oss --shouldSave @@ -4174,7 +4174,7 @@ steps: environment: ARCH: linux-amd64 PORT: 3001 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -4252,7 +4252,7 @@ steps: - build-frontend-packages environment: NODE_OPTIONS: --max_old_space_size=4096 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-storybook when: paths: @@ -4331,14 +4331,14 @@ steps: - commands: - yarn install --immutable depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci depends_on: - yarn-install failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -4346,7 +4346,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: ref: @@ -4382,7 +4382,7 @@ steps: depends_on: [] environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4391,25 +4391,25 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: ref: @@ -4473,13 +4473,13 @@ steps: in output.' - CODEGEN_VERIFY=1 make gen-cue depends_on: [] - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -4495,7 +4495,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -4511,7 +4511,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests trigger: ref: @@ -4618,7 +4618,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4633,7 +4633,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - go build -o ./bin/build -ldflags '-extldflags -static' ./pkg/build/cmd @@ -4641,19 +4641,19 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - make gen-go depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -4663,14 +4663,14 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - ./bin/build build-backend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend - commands: - ./bin/build build-frontend --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -4679,7 +4679,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend - commands: - ./bin/build build-frontend-packages --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -4688,7 +4688,7 @@ steps: - yarn-install environment: NODE_OPTIONS: --max_old_space_size=8192 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-frontend-packages - commands: - ./bin/build build-plugins --jobs 8 --edition enterprise @@ -4698,7 +4698,7 @@ steps: environment: GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-plugins - commands: - ./bin/build build-backend --jobs 8 --edition enterprise2 --build-id ${DRONE_BUILD_NUMBER} @@ -4706,7 +4706,7 @@ steps: depends_on: - wire-install - compile-build-cmd - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: build-backend-enterprise2 - commands: - ./bin/build package --jobs 8 --edition enterprise --build-id ${DRONE_BUILD_NUMBER} @@ -4719,21 +4719,21 @@ steps: - build-backend-enterprise2 environment: GPG_KEY_PASSWORD: - from_secret: gpg_key_password + from_secret: packages_gpg_passphrase GPG_PRIV_KEY: - from_secret: gpg_priv_key + from_secret: packages_gpg_private_key GPG_PUB_KEY: - from_secret: gpg_pub_key + from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package - commands: - ls dist/*.tar.gz* - cp dist/*.tar.gz* packaging/docker/ depends_on: - package - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: copy-packages-for-docker - commands: - ./bin/build build-docker --edition enterprise --shouldSave @@ -4773,7 +4773,7 @@ steps: ARCH: linux-amd64 PORT: 3001 RUNDIR: scripts/grafana-server/tmp-grafana-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: grafana-server - commands: - apt-get install -y netcat @@ -4882,14 +4882,14 @@ steps: - build-backend-enterprise2 environment: GPG_KEY_PASSWORD: - from_secret: gpg_key_password + from_secret: packages_gpg_passphrase GPG_PRIV_KEY: - from_secret: gpg_priv_key + from_secret: packages_gpg_private_key GPG_PUB_KEY: - from_secret: gpg_pub_key + from_secret: packages_gpg_public_key GRAFANA_API_KEY: from_secret: grafana_api_key - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: package-enterprise2 - commands: - ./bin/grabpl upload-cdn --edition enterprise2 @@ -4949,7 +4949,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -4964,7 +4964,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -4980,7 +4980,7 @@ steps: - yarn install --immutable depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: yarn-install - commands: - yarn betterer ci @@ -4988,7 +4988,7 @@ steps: - init-enterprise - yarn-install failure: ignore - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: betterer-frontend - commands: - yarn run ci:test-frontend @@ -4997,7 +4997,7 @@ steps: - yarn-install environment: TEST_MAX_WORKERS: 50% - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-frontend trigger: ref: @@ -5031,7 +5031,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mkdir -p bin @@ -5052,7 +5052,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5064,7 +5064,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5074,25 +5074,25 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -short -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: ref: @@ -5126,7 +5126,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mkdir -p bin @@ -5147,7 +5147,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - echo $DRONE_RUNNER_NAME @@ -5159,7 +5159,7 @@ steps: - init-enterprise environment: CGO_ENABLED: 0 - image: golang:1.19.3 + image: golang:1.19.4 name: compile-build-cmd - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5169,25 +5169,25 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - go test -tags=pro -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-enterprise2 - commands: - go test -run Integration -covermode=atomic -timeout=30m ./pkg/... depends_on: - wire-install - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: test-backend-integration trigger: ref: @@ -5257,7 +5257,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: clone-enterprise - commands: - mv bin/grabpl /tmp/ @@ -5272,7 +5272,7 @@ steps: environment: GITHUB_TOKEN: from_secret: github_token - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: init-enterprise - commands: - '# It is required that code generated from Thema/CUE be committed and in sync @@ -5282,13 +5282,13 @@ steps: - CODEGEN_VERIFY=1 make gen-cue depends_on: - init-enterprise - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: verify-gen-cue - commands: - make gen-go depends_on: - verify-gen-cue - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: wire-install - commands: - apt-get update @@ -5304,7 +5304,7 @@ steps: GRAFANA_TEST_DB: postgres PGPASSWORD: grafanatest POSTGRES_HOST: postgres - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: postgres-integration-tests - commands: - apt-get update @@ -5320,7 +5320,7 @@ steps: environment: GRAFANA_TEST_DB: mysql MYSQL_HOST: mysql - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: mysql-integration-tests - commands: - dockerize -wait tcp://redis:6379/0 -timeout 120s @@ -5329,7 +5329,7 @@ steps: - wire-install environment: REDIS_URL: redis://redis:6379/0 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: redis-integration-tests - commands: - dockerize -wait tcp://memcached:11211 -timeout 120s @@ -5338,7 +5338,7 @@ steps: - wire-install environment: MEMCACHED_HOSTS: memcached:11211 - image: grafana/build-container:1.6.4 + image: grafana/build-container:1.6.6 name: memcached-integration-tests trigger: ref: @@ -5585,13 +5585,31 @@ kind: secret name: gcp_upload_artifacts_key --- get: - name: public-key + name: application_id + path: infra/data/ci/datasources/cpp-azure-resourcemanager-credentials +kind: secret +name: azure_sp_app_id +--- +get: + name: application_secret + path: infra/data/ci/datasources/cpp-azure-resourcemanager-credentials +kind: secret +name: azure_sp_app_pw +--- +get: + name: tenant_id + path: infra/data/ci/datasources/cpp-azure-resourcemanager-credentials +kind: secret +name: azure_tenant +--- +get: + name: public-key-b64 path: infra/data/ci/packages-publish/gpg kind: secret name: packages_gpg_public_key --- get: - name: private-key + name: private-key-b64 path: infra/data/ci/packages-publish/gpg kind: secret name: packages_gpg_private_key @@ -5620,7 +5638,25 @@ get: kind: secret name: packages_secret_access_key --- +get: + name: aws_region + path: secret/data/common/aws-marketplace +kind: secret +name: aws_region +--- +get: + name: aws_access_key_id + path: secret/data/common/aws-marketplace +kind: secret +name: aws_access_key_id +--- +get: + name: aws_secret_access_key + path: secret/data/common/aws-marketplace +kind: secret +name: aws_secret_access_key +--- kind: signature -hmac: 0917581158865ce294a75dbb92b036908d5d126211c4b35cbf38fba143944665 +hmac: 613244b7c6b51cdcbfb71f124850e27da526b72b2c07c7c660356b484b3e7cb4 ... \ No newline at end of file diff --git a/.github/workflows/cloud-data-sources-code-coverage.yml b/.github/workflows/cloud-data-sources-code-coverage.yml index a848dc4c1d02..a92386946784 100644 --- a/.github/workflows/cloud-data-sources-code-coverage.yml +++ b/.github/workflows/cloud-data-sources-code-coverage.yml @@ -11,6 +11,8 @@ on: branches-ignore: - dependabot/** - backport-* + # @PERCONA - disable workflow + - '*' jobs: workflow-call: diff --git a/.github/workflows/detect-breaking-changes-build-skip.yml b/.github/workflows/detect-breaking-changes-build-skip.yml new file mode 100644 index 000000000000..58e3cb564245 --- /dev/null +++ b/.github/workflows/detect-breaking-changes-build-skip.yml @@ -0,0 +1,34 @@ +# Workflow for skipping the Levitate detection +# (This is needed because workflows that are skipped due to path filtering will show up as pending in Github. +# As this has the same name as the one in detect-breaking-changes-build.yml it will take over in these cases and succeed quickly.) + +name: Levitate / Detect breaking changes + +on: + pull_request: + paths-ignore: + - "packages/**" + branches: + - 'main' + +jobs: + detect: + name: Detect breaking changes + runs-on: ubuntu-latest + + steps: + - name: Skipping + run: echo "No modifications in the public API (packages/), skipping." + + # Build and persist output as a JSON (we need to tell the report workflow that the check has been skipped) + - name: Persisting the check output + run: | + mkdir -p ./levitate + echo "{ \"shouldSkip\": true }" > ./levitate/result.json + + # Upload artifact (so it can be used in the more privileged "report" workflow) + - name: Upload check output as artifact + uses: actions/upload-artifact@v3 + with: + name: levitate + path: levitate/ diff --git a/.github/workflows/detect-breaking-changes-build.yml b/.github/workflows/detect-breaking-changes-build.yml index 544e792e8f13..daadcbde738e 100644 --- a/.github/workflows/detect-breaking-changes-build.yml +++ b/.github/workflows/detect-breaking-changes-build.yml @@ -1,6 +1,11 @@ name: Levitate / Detect breaking changes -on: pull_request +on: + pull_request: + paths: + - 'packages/**' + branches: + - 'main' jobs: buildPR: @@ -18,10 +23,6 @@ jobs: with: node-version: 16.16.0 - - uses: actions/setup-node@v3 - with: - node-version: 16.16.0 - - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn config get cacheFolder)" diff --git a/.github/workflows/doc-validator.yml b/.github/workflows/doc-validator.yml index 63a2ef54dcb4..695b07ef3386 100644 --- a/.github/workflows/doc-validator.yml +++ b/.github/workflows/doc-validator.yml @@ -7,7 +7,7 @@ jobs: doc-validator: runs-on: "ubuntu-latest" container: - image: "grafana/doc-validator:latest" + image: "grafana/doc-validator:v1.5.0" steps: - name: "Checkout code" uses: "actions/checkout@v3" diff --git a/.github/workflows/ox-code-coverage.yml b/.github/workflows/ox-code-coverage.yml index b6cbf2996b7b..847249fa6e77 100644 --- a/.github/workflows/ox-code-coverage.yml +++ b/.github/workflows/ox-code-coverage.yml @@ -8,6 +8,8 @@ on: branches-ignore: - dependabot/** - backport-* + # @PERCONA - disable workflow + - '*' jobs: workflow-call: diff --git a/.github/workflows/publish-technical-documentation-next.yml b/.github/workflows/publish-technical-documentation-next.yml new file mode 100644 index 000000000000..1b23f8ba3f20 --- /dev/null +++ b/.github/workflows/publish-technical-documentation-next.yml @@ -0,0 +1,35 @@ +name: "publish-technical-documentation-next" + +on: + push: + branches: + - "main" + paths: + - "docs/sources/**" + - "packages/grafana-*/**" + workflow_dispatch: +jobs: + sync: + if: "github.repository == 'grafana/grafana'" + runs-on: "ubuntu-latest" + steps: + - name: "Checkout Grafana repo" + uses: "actions/checkout@v3" + + - name: "Clone website-sync Action" + # WEBSITE_SYNC_GRAFANA is a fine-grained GitHub Personal Access Token that expires. + # It must be updated in the grafanabot GitHub account. + run: "git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.WEBSITE_SYNC_GRAFANA }}@github.com/grafana/website-sync ./.github/actions/website-sync" + + - name: "Publish to website repository (next)" + uses: "./.github/actions/website-sync" + id: "publish-next" + with: + repository: "grafana/website" + branch: "master" + host: "github.com" + # PUBLISH_TO_WEBSITE_GRAFANA is a fine-grained GitHub Personal Access Token that expires. + # It must be updated in the grafanabot GitHub account. + github_pat: "grafanabot:${{ secrets.PUBLISH_TO_WEBSITE_GRAFANA }}" + source_folder: "docs/sources" + target_folder: "content/docs/grafana/next" diff --git a/.github/workflows/publish-technical-documentation-release.yml b/.github/workflows/publish-technical-documentation-release.yml new file mode 100644 index 000000000000..e57b25ec17de --- /dev/null +++ b/.github/workflows/publish-technical-documentation-release.yml @@ -0,0 +1,65 @@ +name: "publish-technical-documentation-release" + +on: + push: + branches: + - v[0-9]+.[0-9]+.x + tags: + - v[0-9]+.[0-9]+.[0-9]+ + paths: + - "docs/sources/**" + - "packages/grafana-*/**" + workflow_dispatch: +jobs: + sync: + if: "github.repository == 'grafana/grafana'" + runs-on: "ubuntu-latest" + steps: + - name: "Checkout Grafana repo" + uses: "actions/checkout@v3" + with: + fetch-depth: 0 + + - name: "Checkout Actions library" + uses: "actions/checkout@v3" + with: + repository: "grafana/grafana-github-actions" + path: "./actions" + + - name: "Install Actions from library" + run: "npm install --production --prefix ./actions" + + - name: "Determine if there is a matching release tag" + id: "has-matching-release-tag" + uses: "./actions/has-matching-release-tag" + with: + ref_name: "${{ github.ref_name }}" + 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: "Determine technical documentation version" + if: "steps.has-matching-release-tag.outputs.bool == 'true'" + uses: "./actions/docs-target" + id: "target" + with: + ref_name: "${{ github.ref_name }}" + + - name: "Clone website-sync Action" + if: "steps.has-matching-release-tag.outputs.bool == 'true'" + # WEBSITE_SYNC_GRAFANA is a fine-grained GitHub Personal Access Token that expires. + # It must be updated in the grafanabot GitHub account. + run: "git clone --single-branch --no-tags --depth 1 -b master https://grafanabot:${{ secrets.WEBSITE_SYNC_GRAFANA }}@github.com/grafana/website-sync ./.github/actions/website-sync" + + - name: "Publish to website repository (release)" + if: "steps.has-matching-release-tag.outputs.bool == 'true'" + uses: "./.github/actions/website-sync" + id: "publish-release" + with: + repository: "grafana/website" + branch: "master" + host: "github.com" + # PUBLISH_TO_WEBSITE_GRAFANA is a fine-grained GitHub Personal Access Token that expires. + # It must be updated in the grafanabot GitHub account. + github_pat: "grafanabot:${{ secrets.PUBLISH_TO_WEBSITE_GRAFANA }}" + source_folder: "docs/sources" + target_folder: "content/docs/grafana/${{ steps.target.outputs.target }}" diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml deleted file mode 100644 index 89c45a1643b6..000000000000 --- a/.github/workflows/publish.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: publish_docs - -on: - push: - branches: - - undefined # to prevent it from firing - paths: - - "docs/sources/**" - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - uses: percona-platform/checkout@v2 # only platform actions allowed! - - name: publish-to-git - uses: ./.github/actions/gha-publish-to-git - id: publish - with: - repository: grafana/website - branch: master - host: github.com - github_pat: "${{ secrets.GH_BOT_ACCESS_TOKEN }}" - source_folder: docs/sources - target_folder: content/docs/grafana/latest - - shell: bash - run: | - test -n "${{ steps.publish.outputs.commit_hash }}" - test -n "${{ steps.publish.outputs.working_directory }}" diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ff6529fd487..a6596a89a3f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,81 @@ + + +# 9.2.10 (2023-01-24) + +### Features and enhancements + +- **TextPanel:** Refactor to functional component (#60885). [#61940](https://github.com/grafana/grafana/pull/61940), [@ryantxu](https://github.com/ryantxu) +- **[v9.2.x] Chore:** Upgrade Go to 1.19.4. [#60826](https://github.com/grafana/grafana/pull/60826), [@sakjur](https://github.com/sakjur) + +### Bug fixes + +- **Live:** Fix `Subscription to the channel already exists` live streaming error. [#61420](https://github.com/grafana/grafana/pull/61420), [@grafanabot](https://github.com/grafanabot) +- **Live:** Fix `Subscription to the channel already exists` live streaming error. [#61419](https://github.com/grafana/grafana/pull/61419), [@grafanabot](https://github.com/grafanabot) +- **Live:** Fix `Subscription to the channel already exists` live streaming error. [#61406](https://github.com/grafana/grafana/pull/61406), [@ArturWierzbicki](https://github.com/ArturWierzbicki) + + + + + +# 9.2.7 (2022-11-29) + +### Bug fixes + +- **Access Control:** Clear user's permission cache after resource creation. [#59318](https://github.com/grafana/grafana/pull/59318), [@IevaVasiljeva](https://github.com/IevaVasiljeva) +- **Azure Monitor:** Fix empty/errored responses for Logs variables. [#59240](https://github.com/grafana/grafana/pull/59240), [@andresmgot](https://github.com/andresmgot) +- **Azure Monitor:** Fix resource picker selection for subresources. [#56392](https://github.com/grafana/grafana/pull/56392), [@andresmgot](https://github.com/andresmgot) +- **Navigation:** Fix crash when Help is disabled. [#58919](https://github.com/grafana/grafana/pull/58919), [@lpskdl](https://github.com/lpskdl) +- **PostgreSQL:** Fix missing CA field from configuration. [#59280](https://github.com/grafana/grafana/pull/59280), [@oscarkilhed](https://github.com/oscarkilhed) +- **SQL Datasources:** Fix annotation migration. [#59438](https://github.com/grafana/grafana/pull/59438), [@zoltanbedi](https://github.com/zoltanbedi) +- **SQL:** Fix code editor for SQL datasources. [#58116](https://github.com/grafana/grafana/pull/58116), [@zoltanbedi](https://github.com/zoltanbedi) +- **SSE:** Make sure to forward headers, user and cookies/OAuth token. [#58897](https://github.com/grafana/grafana/pull/58897), [@kylebrandt](https://github.com/kylebrandt) +- **TimeseriesPanel:** Preserve string fields for data link interpolation. [#58424](https://github.com/grafana/grafana/pull/58424), [@mdvictor](https://github.com/mdvictor) + + + + +# 9.2.6 (2022-11-22) + +### Features and enhancements + +- **Alerting:** Support Prometheus durations in Provisioning API. [#58293](https://github.com/grafana/grafana/pull/58293), [@bartpeeters](https://github.com/bartpeeters) +- **SSE:** Keep value name from numeric table. [#58831](https://github.com/grafana/grafana/pull/58831), [@kylebrandt](https://github.com/kylebrandt) +- **Transformations:** Make Card Descriptions Clickable. [#58717](https://github.com/grafana/grafana/pull/58717), [@zuchka](https://github.com/zuchka) + +### Bug fixes + +- **MS/My/PostgresSQL:** Migrate annotation query. [#58847](https://github.com/grafana/grafana/pull/58847), [@zoltanbedi](https://github.com/zoltanbedi) +- **Search:** Fixes issue with Recent/Starred section always displaying "General" folder. [#58746](https://github.com/grafana/grafana/pull/58746), [@JoaoSilvaGrafana](https://github.com/JoaoSilvaGrafana) +- **Server:** Write internal server error on missing write. [#57813](https://github.com/grafana/grafana/pull/57813), [@sakjur](https://github.com/sakjur) + + + + +# 9.2.5 (2022-11-16) + +### Features and enhancements + +- **Alerting:** Log when alert rule cannot be screenshot to help debugging. [#58537](https://github.com/grafana/grafana/pull/58537), [@grobinson-grafana](https://github.com/grobinson-grafana) +- **Alerting:** Suggest previously entered custom labels. [#57783](https://github.com/grafana/grafana/pull/57783), [@VikaCep](https://github.com/VikaCep) +- **Canvas:** Improve disabled inline editing UX. [#58610](https://github.com/grafana/grafana/pull/58610), [@nmarrs](https://github.com/nmarrs) +- **Canvas:** Improve disabled inline editing UX. [#58609](https://github.com/grafana/grafana/issues/58609) +- **Chore:** Upgrade go-sqlite3 to v1.14.16. [#58581](https://github.com/grafana/grafana/pull/58581), [@sakjur](https://github.com/sakjur) +- **Plugins:** Ensure CallResource responses contain valid Content-Type header. [#58506](https://github.com/grafana/grafana/pull/58506), [@xnyo](https://github.com/xnyo) +- **Prometheus:** Handle errors and warnings in buffered client. [#58657](https://github.com/grafana/grafana/pull/58657), [@itsmylife](https://github.com/itsmylife) +- **Prometheus:** Upgrade HTTP client library to v1.13.1. [#58363](https://github.com/grafana/grafana/pull/58363), [@marefr](https://github.com/marefr) + +### Bug fixes + +- **Alerting:** Fix screenshots were not cached. [#58493](https://github.com/grafana/grafana/pull/58493), [@grobinson-grafana](https://github.com/grobinson-grafana) +- **Canvas:** Fix setting icon from field data. [#58499](https://github.com/grafana/grafana/pull/58499), [@nmarrs](https://github.com/nmarrs) +- **Plugins:** Fix don't set Content-Type header if status is 204 for call resource. [#50780](https://github.com/grafana/grafana/pull/50780), [@sd2k](https://github.com/sd2k) + +### Plugin development fixes & changes + +- **Toolkit:** Fix compilation loop when watching plugins for changes. [#58167](https://github.com/grafana/grafana/pull/58167), [@jackw](https://github.com/jackw) +- **Tooltips:** Make tooltips in FormField and FormLabel interactive and keyboard friendly. [#57706](https://github.com/grafana/grafana/pull/57706), [@asimpson](https://github.com/asimpson) + + # 9.2.4 (2022-11-07) @@ -383,6 +461,27 @@ Issue [#55364](https://github.com/grafana/grafana/issues/55364) - **CustomScrollbar:** Add optional scroll indicators to `CustomScrollbar`. [#54705](https://github.com/grafana/grafana/pull/54705), [@ashharrison90](https://github.com/ashharrison90) - **Build:** Introduce ESM and Treeshaking to NPM package builds. [#51517](https://github.com/grafana/grafana/pull/51517), [@jackw](https://github.com/jackw) + + +# 9.1.8 (2022-10-11) + +### Features and enhancements + +- **Alerting:** Update imported prometheus alertmanager version. Backport (#56228). [#56429](https://github.com/grafana/grafana/pull/56429), [@joeblubaugh](https://github.com/joeblubaugh) +- **Chore:** Upgrade Go to 1.19.2. [#56355](https://github.com/grafana/grafana/pull/56355), [@sakjur](https://github.com/sakjur) + +### Bug fixes + +- **Alerting:** Fix evaluation interval validation. [#56115](https://github.com/grafana/grafana/pull/56115), [@konrad147](https://github.com/konrad147) +- **Alerting:** Fix migration to create rules with group index 1. [#56511](https://github.com/grafana/grafana/pull/56511), [@yuri-tceretian](https://github.com/yuri-tceretian) +- **Alerting:** Fix migration to not add label "alertname". [#56509](https://github.com/grafana/grafana/pull/56509), [@yuri-tceretian](https://github.com/yuri-tceretian) +- **Azure Monitor:** Fix empty Logs response for Alerting. [#56378](https://github.com/grafana/grafana/pull/56378), [@andresmgot](https://github.com/andresmgot) +- **Azure Monitor:** Fix subscription selector when changing data sources. [#56284](https://github.com/grafana/grafana/pull/56284), [@andresmgot](https://github.com/andresmgot) +- **Caching:** Fix wrong memcached setting name in defaults. (Enterprise) +- **Google Cloud Monitoring:** Fix bucket bound for distributions. [#56565](https://github.com/grafana/grafana/pull/56565), [@andresmgot](https://github.com/andresmgot) + + + # 9.1.7 (2022-10-04) @@ -1578,6 +1677,26 @@ In the Loki data source, for consistency and performance reasons, we changed how The dependency to [grafana/aws-sdk](https://github.com/grafana/grafana-aws-sdk-react) is moved from [grafana/ui](https://github.com/grafana/grafana/blob/main/packages/grafana-ui/package.json) to the plugin. This means that any plugin that use SIGV4 auth need to pass a SIGV4 editor component as a prop to the `DataSourceHttpSettings` component. Issue [#43559](https://github.com/grafana/grafana/issues/43559) + + +# 8.5.15 (2022-11-08) + +### Features and enhancements + +- **Chore:** Upgrade Go to 1.19.2. [#56857](https://github.com/grafana/grafana/pull/56857), [@sakjur](https://github.com/sakjur) + + + + + +# 8.5.14 (2022-10-11) + +### Features and enhancements + +- **Access Control:** Allow org admins to invite new users. [#55585](https://github.com/grafana/grafana/pull/55585), [@IevaVasiljeva](https://github.com/IevaVasiljeva) + + + # 8.5.13 (2022-09-20) diff --git a/Dockerfile b/Dockerfile index 1032ba60ae79..972ca3ad8aca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ COPY emails emails ENV NODE_ENV production RUN yarn build -FROM golang:1.19.3-alpine3.15 as go-builder +FROM golang:1.19.4-alpine3.15 as go-builder RUN apk add --no-cache gcc g++ make @@ -82,7 +82,7 @@ RUN export GF_GID_NAME=$(getent group $GF_GID | cut -d':' -f1) && \ chown -R "grafana:$GF_GID_NAME" "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \ chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" -COPY --from=go-builder /grafana/bin/*/grafana-server /grafana/bin/*/grafana-cli ./bin/ +COPY --from=go-builder /grafana/bin/*/grafana-server /grafana/bin/*/grafana-cli /grafana/bin/*/grafana ./bin/ COPY --from=js-builder /grafana/public ./public COPY --from=js-builder /grafana/tools ./tools diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 077d97a0c99b..5f3afbf369cc 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -21,7 +21,7 @@ COPY emails emails ENV NODE_ENV production RUN yarn build -FROM golang:1.19.3 AS go-builder +FROM golang:1.19.4 AS go-builder WORKDIR /src/grafana @@ -77,7 +77,7 @@ RUN mkdir -p "$GF_PATHS_HOME/.aws" && \ chown -R grafana:grafana "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" && \ chmod -R 777 "$GF_PATHS_DATA" "$GF_PATHS_HOME/.aws" "$GF_PATHS_LOGS" "$GF_PATHS_PLUGINS" "$GF_PATHS_PROVISIONING" -COPY --from=go-builder /src/grafana/bin/*/grafana-server /src/grafana/bin/*/grafana-cli bin/ +COPY --from=go-builder /src/grafana/bin/*/grafana-server /src/grafana/bin/*/grafana-cli /grafana/bin/*/grafana bin/ COPY --from=js-builder /usr/src/app/public public COPY --from=js-builder /usr/src/app/tools tools diff --git a/Makefile b/Makefile index 74bbe322e6e1..7d6ccf06d416 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ WIRE_TAGS = "oss" -include local/Makefile include .bingo/Variables.mk -.PHONY: all deps-go deps-js deps build-go build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help gen-go gen-cue +.PHONY: all deps-go deps-js deps build-go build-backend build-server build-cli build-js build build-docker-full build-docker-full-ubuntu lint-go golangci-lint test-go test-js gen-ts test run run-frontend clean devenv devenv-down protobuf drone help gen-go gen-cue GO = go GO_FILES ?= ./pkg/... @@ -76,6 +76,10 @@ build-go: $(MERGED_SPEC_TARGET) gen-go ## Build all Go binaries. @echo "build go files" $(GO) run build.go $(GO_BUILD_FLAGS) build +build-backend: ## Build Grafana backend. + @echo "build backend" + $(GO) run build.go $(GO_BUILD_FLAGS) build-backend + build-server: ## Build Grafana server. @echo "build server" $(GO) run build.go $(GO_BUILD_FLAGS) build-server diff --git a/conf/defaults.ini b/conf/defaults.ini index 895a74597642..2d6e1235b605 100644 --- a/conf/defaults.ini +++ b/conf/defaults.ini @@ -139,6 +139,12 @@ type = database # memcache: 127.0.0.1:11211 connstr = +# prefix prepended to all the keys in the remote cache +prefix = + +# This enables encryption of values stored in the remote cache +encryption = + #################################### Data proxy ########################### [dataproxy] diff --git a/conf/provisioning/alerting/sample.yaml b/conf/provisioning/alerting/sample.yaml index f050d1b51d20..bb797b6a4cfd 100644 --- a/conf/provisioning/alerting/sample.yaml +++ b/conf/provisioning/alerting/sample.yaml @@ -23,7 +23,7 @@ apiVersion: 1 # # evaluation - should be obtained via the API # data: # - refId: A -# datasourceUid: "-100" +# datasourceUid: "__expr__" # model: # conditions: # - evaluator: @@ -40,7 +40,7 @@ apiVersion: 1 # type: query # datasource: # type: __expr__ -# uid: "-100" +# uid: "__expr__" # expression: 1==0 # intervalMs: 1000 # maxDataPoints: 43200 diff --git a/conf/sample.ini b/conf/sample.ini index 93e8257ca76d..227c90e895d0 100644 --- a/conf/sample.ini +++ b/conf/sample.ini @@ -145,6 +145,12 @@ # memcache: 127.0.0.1:11211 ;connstr = +# prefix prepended to all the keys in the remote cache +; prefix = + +# This enables encryption of values stored in the remote cache +;encryption = + #################################### Data proxy ########################### [dataproxy] diff --git a/docs/Makefile b/docs/Makefile index db800ce9240e..4f553a5e8788 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -1,6 +1,6 @@ .PHONY: pull docs docs-quick docs-no-pull docs-test docs-local-static -IMAGE = grafana/grafana-docs-dev:latest +IMAGE = grafana/docs-base:latest CONTENT_PATH = /hugo/content/docs/grafana/next LOCAL_STATIC_PATH = ../../website/static PORT = 3002:3002 @@ -10,10 +10,7 @@ pull: docs: pull docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "make server" - -docs-quick: pull - docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "make server-quick" - + docs-no-pull: docker run -v $(shell pwd)/sources:$(CONTENT_PATH):Z -p $(PORT) --rm -it $(IMAGE) /bin/bash -c "make server" diff --git a/docs/sources/_index.md b/docs/sources/_index.md index 94ecbe3826a2..9fa484e80a8b 100644 --- a/docs/sources/_index.md +++ b/docs/sources/_index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/ - - /docs/grafana/latest/guides/reference/admin/ - /docs/grafana/v1.1/ - /docs/grafana/v3.1/ + - guides/reference/admin/ description: Guides, Installation and Feature Documentation keywords: - grafana diff --git a/docs/sources/administration/_index.md b/docs/sources/administration/_index.md index 7e227b686118..8aa62783f00e 100644 --- a/docs/sources/administration/_index.md +++ b/docs/sources/administration/_index.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/administration/ description: Administration title: Administration weight: 40 diff --git a/docs/sources/administration/api-keys/index.md b/docs/sources/administration/api-keys/index.md index b8f539d8b292..e4ffcf855c59 100644 --- a/docs/sources/administration/api-keys/index.md +++ b/docs/sources/administration/api-keys/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/administration/api-keys/about-api-keys/ - - /docs/grafana/latest/administration/api-keys/ - - /docs/grafana/latest/administration/api-keys/create-api-key/ + - about-api-keys/ + - create-api-key/ description: This section contains information about API keys in Grafana keywords: - API keys diff --git a/docs/sources/administration/data-source-management/index.md b/docs/sources/administration/data-source-management/index.md index 30678636308e..c260187f539b 100644 --- a/docs/sources/administration/data-source-management/index.md +++ b/docs/sources/administration/data-source-management/index.md @@ -1,13 +1,12 @@ --- aliases: - - /docs/grafana/latest/datasources/add-a-data-source/ - - /docs/grafana/latest/features/datasources/add-a-data-source/ - - /docs/grafana/latest/enterprise/datasource_permissions/ - - /docs/grafana/latest/permissions/datasource_permissions/ - - /docs/grafana/latest/administration/data-source-management/ - - /docs/grafana/latest/enterprise/query-caching/ -title: Data source management + - ../datasources/add-a-data-source/ + - ../enterprise/datasource_permissions/ + - ../enterprise/query-caching/ + - ../features/datasources/add-a-data-source/ + - ../permissions/datasource_permissions/ description: Data source management information for Grafana administrators +title: Data source management weight: 100 --- @@ -23,11 +22,8 @@ Before you can create your first dashboard, you need to add your data source. To add a data source: -1. Move your cursor to the cog icon on the side menu which will show the configuration options. - - {{< figure src="/static/img/docs/v75/sidemenu-datasource-7-5.png" max-width="150px" class="docs-image--no-shadow">}} - -1. Click on **Data sources**. The data sources page opens showing a list of previously configured data sources for the Grafana instance. +1. Select the cog icon on the side menu to show the configuration options. +1. Select **Data sources**. 1. Click **Add data source** to see a list of all supported data sources. @@ -37,9 +33,7 @@ To add a data source: 1. Move the cursor over the data source you want to add. - {{< figure src="/static/img/docs/v75/select-data-source-7-5.png" max-width="700px" class="docs-image--no-shadow">}} - -1. Click **Select**. The data source configuration page opens. +1. Click **Select**. 1. Configure the data source following instructions specific to that data source. See [Data sources]({{< relref "../../datasources" >}}) for links to configuration instructions for all supported data sources. @@ -51,8 +45,6 @@ Data source permissions allow you to restrict access for users to query a data s ### Enable data source permissions -{{< figure src="/static/img/docs/enterprise/datasource_permissions_enable_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/static/img/docs/enterprise/datasource_permissions_enable.gif" >}} - By default, data sources in an organization can be queried by any user in that organization. For example, a user with the `Viewer` role can issue any possible query to a data source, not just queries that exist on dashboards they have access to. @@ -70,8 +62,6 @@ When permissions are enabled for a data source in an organization, the user who ### Allow users and teams to query a data source -{{< figure src="/static/img/docs/enterprise/datasource_permissions_add_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/static/img/docs/enterprise/datasource_permissions_add.gif" >}} - After you have enabled permissions for a data source you can assign query permissions to users and teams which will allow access to query the data source. **Assign query permission to users and teams:** @@ -86,8 +76,6 @@ After you have enabled permissions for a data source you can assign query permis ### Disable data source permissions -{{< figure src="/static/img/docs/enterprise/datasource_permissions_disable_still.png" class="docs-image--no-shadow docs-image--right" max-width= "600px" animated-gif="/static/img/docs/enterprise/datasource_permissions_disable.gif" >}} - If you have enabled permissions for a data source and want to return data source permissions to the default, then you can disable permissions with a click of a button. Note that _all_ existing permissions created for the data source will be deleted. diff --git a/docs/sources/administration/enterprise-licensing/_index.md b/docs/sources/administration/enterprise-licensing/_index.md index 8532ee88b7f2..5f860eff4e4e 100644 --- a/docs/sources/administration/enterprise-licensing/_index.md +++ b/docs/sources/administration/enterprise-licensing/_index.md @@ -1,14 +1,13 @@ --- aliases: - - /docs/grafana/latest/enterprise/license/ - - /docs/grafana/latest/enterprise/activate-license/ - - /docs/grafana/latest/enterprise/license/activate-license/ - - /docs/grafana/latest/enterprise/license-expiration/ - - /docs/grafana/latest/enterprise/license/license-expiration/ - - /docs/grafana/latest/enterprise/license-restrictions/ - - /docs/grafana/latest/enterprise/license/license-restrictions/ - - /docs/grafana/latest/administration/enterprise-licensing/ - - /docs/grafana/latest/administration/enterprise-licensing/license-restrictions/ + - ../enterprise/activate-license/ + - ../enterprise/license-expiration/ + - ../enterprise/license-restrictions/ + - ../enterprise/license/ + - ../enterprise/license/activate-license/ + - ../enterprise/license/license-expiration/ + - ../enterprise/license/license-restrictions/ + - license-restrictions/ description: Activate and manage a Grafana Enterprise license keywords: - grafana diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/_index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/_index.md index 6646f468cc80..048927ec389c 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/_index.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/_index.md @@ -1,10 +1,10 @@ --- aliases: - - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/ - - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/about-ge-license-through-aws/ - - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws/ - - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/ -description: Activate your Grafana Enterprise license purchased in AWS Marketplace to take advantage of Grafana Enterprise observability features + - ../../enterprise/activate-aws-marketplace-license/about-ge-license-through-aws/ + - ../../enterprise/license/activate-aws-marketplace-license/ + - ../../enterprise/license/activate-aws-marketplace-license/about-ge-license-through-aws/ +description: Activate your Grafana Enterprise license purchased in AWS Marketplace + to take advantage of Grafana Enterprise observability features keywords: - grafana - aws diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md index 8a8356bc8c6b..3b6036cd45d5 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-ecs/ - - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-ecs/ - - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-ecs/ + - ../../../enterprise/activate-aws-marketplace-license/activate-license-on-ecs/ + - ../../../enterprise/license/activate-aws-marketplace-license/activate-license-on-ecs/ description: Activate a Grafana Enterprise license from AWS Marketplace on ECS keywords: - grafana diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md index 65900e4295ab..b4c13f83e5f4 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-eks/ - - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-eks/ - - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-eks/ + - ../../../enterprise/activate-aws-marketplace-license/activate-license-on-eks/ + - ../../../enterprise/license/activate-aws-marketplace-license/activate-license-on-eks/ description: Activate a Grafana Enterprise license from AWS Marketplace on EKS keywords: - grafana diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/index.md index e8a958775345..8b28046a8a26 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/index.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/ - - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/ - - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/ + - ../../../enterprise/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/ + - ../../../enterprise/license/activate-aws-marketplace-license/activate-license-on-instance-outside-aws/ description: Activate a Grafana Enterprise license from AWS on an instance deployed outside of AWS keywords: diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md index 9e1849a44b09..17f265280276 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/manage-license-in-aws-marketplace/ - - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/manage-license-in-aws-marketplace/ - - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/manage-license-in-aws-marketplace/ + - ../../../enterprise/activate-aws-marketplace-license/manage-license-in-aws-marketplace/ + - ../../../enterprise/license/activate-aws-marketplace-license/manage-license-in-aws-marketplace/ description: Manage your Grafana Enterprise license in AWS Marketplace keywords: - grafana diff --git a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license/index.md b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license/index.md index 338b4849a8ce..98b817b02a84 100644 --- a/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license/index.md +++ b/docs/sources/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/enterprise/activate-aws-marketplace-license/transfer-ge-license/ - - /docs/grafana/latest/enterprise/license/activate-aws-marketplace-license/transfer-ge-license/ - - /docs/grafana/latest/administration/enterprise-licensing/activate-aws-marketplace-license/transfer-ge-license/ + - ../../../enterprise/activate-aws-marketplace-license/transfer-ge-license/ + - ../../../enterprise/license/activate-aws-marketplace-license/transfer-ge-license/ description: Transfer your AWS Marketplace Grafana Enterprise license keywords: - grafana diff --git a/docs/sources/administration/organization-management/index.md b/docs/sources/administration/organization-management/index.md index f8e8fa37cada..92fbbdce6e1f 100644 --- a/docs/sources/administration/organization-management/index.md +++ b/docs/sources/administration/organization-management/index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/administration/manage-organizations/ - - /docs/grafana/latest/manage-users/server-admin/ - - /docs/grafana/latest/manage-users/server-admin/server-admin-manage-orgs/ - - /docs/grafana/latest/administration/organization-management/ + - ../manage-users/server-admin/ + - ../manage-users/server-admin/server-admin-manage-orgs/ + - manage-organizations/ description: Describes how to use organizations to isolate dashboard to users and teams. keywords: @@ -60,8 +59,6 @@ Complete this task when you want to view a list of existing organizations. A list of organizations appears. -![Server Admin organization list](/static/img/docs/manage-users/server-org-list-7-3.png) - ## Create an organization Create an organization when you want to isolate dashboards and other resources from each other. @@ -117,5 +114,3 @@ Edit an organization when you want to change its name. 1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Orgs**. 1. Click the organization you want to edit. 1. Update the organization name and click **Update**. - -![Server admin Edit Organization](/static/img/docs/manage-users/server-admin-edit-org-7-3.png) diff --git a/docs/sources/administration/organization-preferences/index.md b/docs/sources/administration/organization-preferences/index.md index ccd7c5930607..f9691935a6c9 100644 --- a/docs/sources/administration/organization-preferences/index.md +++ b/docs/sources/administration/organization-preferences/index.md @@ -1,12 +1,11 @@ --- aliases: - - /docs/grafana/latest/administration/preferences/ - - /docs/grafana/latest/administration/preferences/change-grafana-name/ - - /docs/grafana/latest/administration/preferences/change-grafana-theme/ - - /docs/grafana/latest/administration/preferences/change-grafana-timezone/ - - /docs/grafana/latest/administration/change-home-dashboard/ - - /docs/grafana/latest/administration/preferences/change-home-dashboard/ - - /docs/grafana/latest/administration/organization-preferences/ + - change-home-dashboard/ + - preferences/ + - preferences/change-grafana-name/ + - preferences/change-grafana-theme/ + - preferences/change-grafana-timezone/ + - preferences/change-home-dashboard/ title: Organization preferences weight: 500 --- diff --git a/docs/sources/administration/plugin-management/index.md b/docs/sources/administration/plugin-management/index.md index 5bd9ad9df65c..f412babb947c 100644 --- a/docs/sources/administration/plugin-management/index.md +++ b/docs/sources/administration/plugin-management/index.md @@ -1,11 +1,10 @@ --- aliases: - - /docs/grafana/latest/plugins/ - - /docs/grafana/latest/plugins/catalog/ - - /docs/grafana/latest/plugins/installation/ - - /docs/grafana/latest/plugins/plugin-signature-verification/ - - /docs/grafana/latest/plugins/plugin-signatures/ - - /docs/grafana/latest/administration/plugin-management/ + - ../plugins/ + - ../plugins/catalog/ + - ../plugins/installation/ + - ../plugins/plugin-signature-verification/ + - ../plugins/plugin-signatures/ title: Plugin management weight: 600 --- @@ -88,8 +87,6 @@ To browse for available plugins: 1. Click the **All** filter to browse all available plugins. 1. Click the **Data sources**, **Panels**, or **Applications** buttons to filter by plugin type. -![Plugin catalog browse](/static/img/docs/plugins/plugins-catalog-browse-9.2.png) - ### Install a plugin To install a plugin: @@ -101,8 +98,6 @@ To install a plugin: When the update is complete, you see a confirmation message that the installation was successful. -![Plugin catalog install](/static/img/docs/plugins/plugins-catalog-install-8-1.png) - ### Update a plugin To update a plugin: @@ -113,8 +108,6 @@ To update a plugin: When the update is complete, you see a confirmation message that the update was successful. -![Plugin catalog update](/static/img/docs/plugins/plugins-catalog-update-8-1.png) - ### Uninstall a plugin To uninstall a plugin: @@ -125,8 +118,6 @@ To uninstall a plugin: When the update is complete, you see a confirmation message that the uninstall was successful. -![Plugin catalog uninstall](/static/img/docs/plugins/plugins-catalog-uninstall-8-1.png) - ## Install Grafana plugins Grafana supports data source, panel, and app plugins. Having panels as plugins makes it easy to create and add any kind of panel, to show your data, or improve your favorite dashboards. Apps enable the bundling of data sources, panels, dashboards, and Grafana pages into a cohesive experience. diff --git a/docs/sources/administration/provisioning/index.md b/docs/sources/administration/provisioning/index.md index 02067c567967..57164c7bed3a 100644 --- a/docs/sources/administration/provisioning/index.md +++ b/docs/sources/administration/provisioning/index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/administration/provisioning/ - - /docs/grafana/latest/installation/provisioning/ + - ../installation/provisioning/ description: Describes provisioning settings for Grafana using configuration files. keywords: - grafana diff --git a/docs/sources/administration/recorded-queries/index.md b/docs/sources/administration/recorded-queries/index.md index 7d00420b7b6a..ea9ce5d495e5 100644 --- a/docs/sources/administration/recorded-queries/index.md +++ b/docs/sources/administration/recorded-queries/index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/recorded-queries/ - - /docs/grafana/latest/administration/recorded-queries/ + - ../enterprise/recorded-queries/ description: Grafana Enterprise recorded queries keywords: - grafana diff --git a/docs/sources/administration/roles-and-permissions/_index.md b/docs/sources/administration/roles-and-permissions/_index.md index da031df37559..2a938536b325 100644 --- a/docs/sources/administration/roles-and-permissions/_index.md +++ b/docs/sources/administration/roles-and-permissions/_index.md @@ -1,11 +1,10 @@ --- aliases: - - /docs/grafana/latest/administration/manage-users-and-permissions/about-users-and-permissions/ - - /docs/grafana/latest/manage-users/ - - /docs/grafana/latest/permissions/ - - /docs/grafana/latest/permissions/organization_roles/ - - /docs/grafana/latest/permissions/overview/ - - /docs/grafana/latest/administration/roles-and-permissions/ + - ../manage-users/ + - ../permissions/ + - ../permissions/organization_roles/ + - ../permissions/overview/ + - manage-users-and-permissions/about-users-and-permissions/ description: Information about Grafana user, team, and organization roles and permissions title: Roles and permissions weight: 300 diff --git a/docs/sources/administration/roles-and-permissions/access-control/_index.md b/docs/sources/administration/roles-and-permissions/access-control/_index.md index d45526f58eb2..d5b712df3e0f 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/_index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/_index.md @@ -1,10 +1,8 @@ --- aliases: - - /docs/grafana/latest/enterprise/access-control/ - - /docs/grafana/latest/enterprise/access-control/ - - /docs/grafana/latest/enterprise/access-control/about-rbac/ - - /docs/grafana/latest/enterprise/access-control/roles/ - - /docs/grafana/latest/administration/roles-and-permissions/access-control/ + - ../../enterprise/access-control/ + - ../../enterprise/access-control/about-rbac/ + - ../../enterprise/access-control/roles/ description: Role-based access control (RBAC) provides a standardized way of granting, changing, and revoking access so that users can view and modify Grafana resources, such as users and reports. diff --git a/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md b/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md index b3c0120479a1..4c3fe77abd14 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/assign-rbac-roles/index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/enterprise/access-control/assign-rbac-roles/ - - /docs/grafana/latest/enterprise/access-control/manage-role-assignments/manage-built-in-role-assignments/ - - /docs/grafana/latest/enterprise/access-control/manage-role-assignments/manage-user-role-assignments/ - - /docs/grafana/latest/administration/roles-and-permissions/access-control/assign-rbac-roles/ + - ../../../enterprise/access-control/assign-rbac-roles/ + - ../../../enterprise/access-control/manage-role-assignments/manage-built-in-role-assignments/ + - ../../../enterprise/access-control/manage-role-assignments/manage-user-role-assignments/ description: Learn how to assign RBAC roles to users and teams in Grafana. menuTitle: Assign RBAC roles title: Assign Grafana RBAC roles @@ -53,8 +52,6 @@ In both cases, the assignment applies only to the user, team or service account 4. In the **Role** column, select the fixed role that you want to assign to the user, team or service account. 5. Click **Update**. -![User role picker in an organization](/static/img/docs/enterprise/user_role_picker_in_org.png) - **To assign a fixed role as a server administrator:** 1. Sign in to Grafana, hover your cursor over **Server Admin** (the shield icon) in the left navigation menu, and click **Users**. @@ -62,8 +59,6 @@ In both cases, the assignment applies only to the user, team or service account 1. In the **Organizations** section, select a role within an organization that you want to assign to the user. 1. Click **Update**. -![User role picker in Organization](/static/img/docs/enterprise/user_role_picker_global.png) - ## Assign fixed or custom roles to a team using provisioning Instead of using the Grafana role picker, you can use file-based provisioning to assign fixed roles to teams. If you have a large number of teams, provisioning can provide an easier approach to assigning and managing role assignments. diff --git a/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md b/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md index 99cbacf35a9b..c8a3222d9d8d 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/configure-rbac/index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/access-control/configure-rbac/ - - /docs/grafana/latest/administration/roles-and-permissions/access-control/configure-rbac/ + - ../../../enterprise/access-control/configure-rbac/ description: Learn how to configure RBAC. menuTitle: Configure RBAC title: Configure RBAC in Grafana @@ -14,9 +13,10 @@ weight: 30 The table below describes all RBAC configuration options. Like any other Grafana configuration, you can apply these options as [environment variables]({{< relref "../../../../setup-grafana/configure-grafana/#configure-with-environment-variables" >}}). -| Setting | Required | Description | Default | -| ------------------ | -------- | ---------------------------------------------------------------------------- | ------- | -| `permission_cache` | No | Enable to use in memory cache for loading and evaluating users' permissions. | `true` | +| Setting | Required | Description | Default | +| ------------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- | +| `permission_cache` | No | Enable to use in memory cache for loading and evaluating users' permissions. | `true` | +| `permission_validation_enabled` | No | Grafana enforces validation for permissions when a user creates or updates a role. The system checks the internal list of scopes and actions for each permission to determine they are valid. By default, if a scope or action is not recognized, Grafana logs a warning message. When set to `true`, Grafana returns an error. | `false` | ## Example RBAC configuration diff --git a/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md b/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md index eae204127ff1..966517b87005 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/custom-role-actions-scopes/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/enterprise/access-control/custom-role-actions-scopes/ - - /docs/grafana/latest/enterprise/access-control/permissions/ - - /docs/grafana/latest/administration/roles-and-permissions/access-control/custom-role-actions-scopes/ + - ../../../enterprise/access-control/custom-role-actions-scopes/ + - ../../../enterprise/access-control/permissions/ description: Learn about Grafana RBAC permissions, actions, and scopes. menuTitle: RBAC permissions, actions, and scopes title: Grafana RBAC permissions, actions, and scopes diff --git a/docs/sources/administration/roles-and-permissions/access-control/manage-rbac-roles/index.md b/docs/sources/administration/roles-and-permissions/access-control/manage-rbac-roles/index.md index 125390be437e..4950d9b03283 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/manage-rbac-roles/index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/manage-rbac-roles/index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/enterprise/access-control/manage-rbac-roles/ - - /docs/grafana/latest/enterprise/access-control/manage-role-assignments/ - - /docs/grafana/latest/enterprise/access-control/provisioning/ - - /docs/grafana/latest/administration/roles-and-permissions/access-control/manage-rbac-roles/ + - ../../../enterprise/access-control/manage-rbac-roles/ + - ../../../enterprise/access-control/manage-role-assignments/ + - ../../../enterprise/access-control/provisioning/ description: Learn how to view permissions associated with roles, create custom roles, and update and delete roles in Grafana. menuTitle: Manage RBAC roles diff --git a/docs/sources/administration/roles-and-permissions/access-control/plan-rbac-rollout-strategy/index.md b/docs/sources/administration/roles-and-permissions/access-control/plan-rbac-rollout-strategy/index.md index 19aa9ab6a400..812db8e28ebf 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/plan-rbac-rollout-strategy/index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/plan-rbac-rollout-strategy/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/enterprise/access-control/plan-rbac-rollout-strategy/ - - /docs/grafana/latest/enterprise/access-control/usage-scenarios/ - - /docs/grafana/latest/administration/roles-and-permissions/access-control/plan-rbac-rollout-strategy/ + - ../../../enterprise/access-control/plan-rbac-rollout-strategy/ + - ../../../enterprise/access-control/usage-scenarios/ description: Plan your RBAC rollout strategy before you begin assigning roles to users and teams. menuTitle: Plan your RBAC rollout strategy diff --git a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md index ee92d91a5cf7..ad4de0666f4b 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/enterprise/access-control/fine-grained-access-control-references/ - - /docs/grafana/latest/enterprise/access-control/rbac-fixed-basic-role-definitions/ - - /docs/grafana/latest/administration/roles-and-permissions/access-control/rbac-fixed-basic-role-definitions/ + - ../../../enterprise/access-control/fine-grained-access-control-references/ + - ../../../enterprise/access-control/rbac-fixed-basic-role-definitions/ description: This topic includes a table that lists permission associated with Grafana fixed and basic roles. menuTitle: RBAC role definitions diff --git a/docs/sources/administration/roles-and-permissions/access-control/rbac-grafana-provisioning/index.md b/docs/sources/administration/roles-and-permissions/access-control/rbac-grafana-provisioning/index.md index 29a5b6eac9ac..63a5576c5998 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/rbac-grafana-provisioning/index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/rbac-grafana-provisioning/index.md @@ -1,10 +1,9 @@ --- aliases: - - /docs/grafana/latest/enterprise/access-control/rbac-provisioning/ - - /docs/grafana/latest/administration/roles-and-permissions/access-control/rbac-provisioning/ - - /docs/grafana/latest/administration/roles-and-permissions/access-control/rbac-grafana-provisioning -description: Learn about RBAC Grafana provisioning and view an example YAML provisioning file - that configures Grafana role assignments. + - ../../../enterprise/access-control/rbac-provisioning/ + - rbac-provisioning/ +description: Learn about RBAC Grafana provisioning and view an example YAML provisioning + file that configures Grafana role assignments. menuTitle: Provisioning RBAC with Grafana title: Provisioning RBAC with Grafana weight: 60 diff --git a/docs/sources/administration/roles-and-permissions/access-control/rbac-terraform-provisioning/index.md b/docs/sources/administration/roles-and-permissions/access-control/rbac-terraform-provisioning/index.md index 329dacb71a77..bb475881de9e 100644 --- a/docs/sources/administration/roles-and-permissions/access-control/rbac-terraform-provisioning/index.md +++ b/docs/sources/administration/roles-and-permissions/access-control/rbac-terraform-provisioning/index.md @@ -1,8 +1,8 @@ --- aliases: - - /docs/grafana/latest/enterprise/access-control/rbac-provisioning/rbac-terraform-provisioning -description: Learn about RBAC Terraform provisioning and view an example of provisioning configuration - for Grafana roles and role assignments. + - ../../../enterprise/access-control/rbac-provisioning/rbac-terraform-provisioning/ +description: Learn about RBAC Terraform provisioning and view an example of provisioning + configuration for Grafana roles and role assignments. menuTitle: Provisioning RBAC with Terraform title: Provisioning RBAC with Terraform weight: 60 diff --git a/docs/sources/administration/service-accounts/index.md b/docs/sources/administration/service-accounts/index.md index 3a6927de265c..7b6a87d6df1b 100644 --- a/docs/sources/administration/service-accounts/index.md +++ b/docs/sources/administration/service-accounts/index.md @@ -1,10 +1,9 @@ --- aliases: - - /docs/grafana/latest/administration/service-accounts/ - - /docs/grafana/latest/administration/service-accounts/about-service-accounts/ - - /docs/grafana/latest/administration/service-accounts/add-service-account-token/ - - /docs/grafana/latest/administration/service-accounts/create-service-account/ - - /docs/grafana/latest/administration/service-accounts/enable-service-accounts/ + - about-service-accounts/ + - add-service-account-token/ + - create-service-account/ + - enable-service-accounts/ description: This page contains information about service accounts in Grafana keywords: - API keys diff --git a/docs/sources/administration/stats-and-license/index.md b/docs/sources/administration/stats-and-license/index.md index a8ff69faa0e7..955ce8a03a67 100644 --- a/docs/sources/administration/stats-and-license/index.md +++ b/docs/sources/administration/stats-and-license/index.md @@ -1,11 +1,10 @@ --- aliases: - - /docs/grafana/latest/administration/view-server/ - - /docs/grafana/latest/admin/view-server-settings/ - - /docs/grafana/latest/administration/view-server/view-server-settings/ - - /docs/grafana/latest/admin/view-server-stats/ - - /docs/grafana/latest/administration/view-server/view-server-stats/ - - /docs/grafana/latest/administration/stats-and-license/ + - ../admin/view-server-settings/ + - ../admin/view-server-stats/ + - view-server/ + - view-server/view-server-settings/ + - view-server/view-server-stats/ description: How to view server settings in the Grafana UI keywords: - grafana diff --git a/docs/sources/administration/team-management/index.md b/docs/sources/administration/team-management/index.md index 38c157e622e3..27dc1b10e631 100644 --- a/docs/sources/administration/team-management/index.md +++ b/docs/sources/administration/team-management/index.md @@ -1,10 +1,9 @@ --- aliases: - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-teams/ - - /docs/grafana/latest/manage-users/add-or-remove-user-from-team/ - - /docs/grafana/latest/manage-users/create-or-remove-team/ - - /docs/grafana/latest/manage-users/manage-teams/ - - /docs/grafana/latest/administration/team-management/ + - ../manage-users/add-or-remove-user-from-team/ + - ../manage-users/create-or-remove-team/ + - ../manage-users/manage-teams/ + - manage-users-and-permissions/manage-teams/ title: Team management weight: 400 --- @@ -62,8 +61,6 @@ To add a team member: 1. Choose if you want to add the user as a team Member or an Admin. 1. Click **Add to team**. -![Add team member](/static/img/docs/manage-users/add-team-member-7-3.png) - ## Grant team member permissions Complete this task when you want to add or modify team member permissions. @@ -76,8 +73,6 @@ To grant team member permissions: 1. In the team member list, find and click the user that you want to change. You can use the search field to filter the list if necessary. 1. Click the **Permission** list, and then click the new user permission level. -![Change team member permissions](/static/img/docs/manage-users/change-team-permissions-7-3.png) - ## Remove a team member You can remove a team member when you no longer want to apply team permissions to the user diff --git a/docs/sources/administration/user-management/_index.md b/docs/sources/administration/user-management/_index.md index 628e5c1e61c1..4bbe87515457 100644 --- a/docs/sources/administration/user-management/_index.md +++ b/docs/sources/administration/user-management/_index.md @@ -1,6 +1,6 @@ --- aliases: - - /docs/grafana/latest/administration/manage-users-and-permissions/ + - manage-users-and-permissions/ title: User management weight: 200 --- diff --git a/docs/sources/administration/user-management/manage-dashboard-permissions/index.md b/docs/sources/administration/user-management/manage-dashboard-permissions/index.md index 6e9a258844a7..18d16b9cb5dc 100644 --- a/docs/sources/administration/user-management/manage-dashboard-permissions/index.md +++ b/docs/sources/administration/user-management/manage-dashboard-permissions/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-dashboard-permissions/ - - /docs/grafana/latest/permissions/dashboard_folder_permissions/ - - /docs/grafana/latest/administration/user-management/manage-dashboard-permissions/ + - ../../permissions/dashboard_folder_permissions/ + - ../manage-users-and-permissions/manage-dashboard-permissions/ title: Manage dashboard permissions weight: 500 --- diff --git a/docs/sources/administration/user-management/manage-org-users/index.md b/docs/sources/administration/user-management/manage-org-users/index.md index 349cbbb8b2e0..35326b564999 100644 --- a/docs/sources/administration/user-management/manage-org-users/index.md +++ b/docs/sources/administration/user-management/manage-org-users/index.md @@ -1,13 +1,12 @@ --- aliases: - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/ - - /docs/grafana/latest/manage-users/org-admin/ - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/view-list-org-users/ - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/change-user-org-permissions/ - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/invite-user-join-org/ - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/manage-pending-invites/ - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-org-users/remove-user-from-org/ - - /docs/grafana/latest/administration/user-management/manage-org-users/ + - ../../manage-users/org-admin/ + - ../manage-users-and-permissions/manage-org-users/ + - ../manage-users-and-permissions/manage-org-users/change-user-org-permissions/ + - ../manage-users-and-permissions/manage-org-users/invite-user-join-org/ + - ../manage-users-and-permissions/manage-org-users/manage-pending-invites/ + - ../manage-users-and-permissions/manage-org-users/remove-user-from-org/ + - ../manage-users-and-permissions/manage-org-users/view-list-org-users/ title: Manage users in an organization weight: 400 --- @@ -33,8 +32,6 @@ You can see a list of users with accounts in your Grafana organization. If neces 1. Sign in to Grafana as an organization administrator. 1. Hover your cursor over the **Configuration** (gear) icon in the side menu and click **Users**. -![Org Admin user list](/static/img/docs/manage-users/org-user-list-7-3.png) - > **Note:** If you have [server administrator]({{< relref "../../roles-and-permissions/#grafana-server-administrators" >}}) permissions, you can also [view a global list of users]({{< relref "../server-user-management#view-a-list-of-users" >}}) in the Server Admin section of Grafana. ## Change a user's organization permissions @@ -96,8 +93,6 @@ When you invite users to join an organization, you assign the **Admin**, **Edito If the invitee is not already a user, the system adds them. -![Invite User](/static/img/docs/manage-users/org-invite-user-7-3.png). - ## Manage a pending invitation Periodically review invitations you have sent so that you can see a list of users that have not yet accepted the invitation or cancel a pending invitation. @@ -116,14 +111,10 @@ Periodically review invitations you have sent so that you can see a list of user The **Pending Invites** button appears only when there are unaccepted invitations. - ![Pending Invites button](/static/img/docs/manage-users/pending-invites-button-7-3.png) - To cancel an invitation, click the red **X** next to the invitation. To copy an invitation link and send it directly to a user, click Copy Invite. You can then paste the invite link into a message. -![Pending Invites list](/static/img/docs/manage-users/pending-invites-list-7-3.png) - ## Remove a user from an organization You can remove a user from an organization when they no longer require access to the dashboard or data sources owned by the organization. No longer requiring access to an organization might occur when the user has left your company or has internally moved to another organization. diff --git a/docs/sources/administration/user-management/server-user-management/_index.md b/docs/sources/administration/user-management/server-user-management/_index.md index c75da586f05a..5138e933b81f 100644 --- a/docs/sources/administration/user-management/server-user-management/_index.md +++ b/docs/sources/administration/user-management/server-user-management/_index.md @@ -1,14 +1,13 @@ --- aliases: - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/ - - /docs/grafana/latest/manage-users/server-admin/ - - /docs/grafana/latest/manage-users/server-admin/server-admin-manage-users/ - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-list-users/ - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-edit-user-account/ - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/view-user-account-details/ - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user/ - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/force-user-logout/ - - /docs/grafana/latest/administration/user-management/server-user-management/ + - ../../manage-users/server-admin/ + - ../../manage-users/server-admin/server-admin-manage-users/ + - ../manage-users-and-permissions/manage-server-users/ + - ../manage-users-and-permissions/manage-server-users/add-user/ + - ../manage-users-and-permissions/manage-server-users/force-user-logout/ + - ../manage-users-and-permissions/manage-server-users/view-edit-user-account/ + - ../manage-users-and-permissions/manage-server-users/view-list-users/ + - ../manage-users-and-permissions/manage-server-users/view-user-account-details/ title: Server user management weight: 100 --- @@ -38,8 +37,6 @@ You can see a list of users with accounts on your Grafana server. This action mi 1. Sign in to Grafana as a server administrator. 1. Hover your cursor over the **Server Admin** (shield) icon until a menu appears, and click **Users**. -![Server Admin user list](/static/img/docs/manage-users/server-user-list-7-3.png) - > **Note:** If you have [organization administrator]({{< relref "../../roles-and-permissions/#organization-roles" >}}) permissions and _not_ [server administrator]({{< relref "../../roles-and-permissions/#grafana-server-administrators" >}}) permissions, you can still [view of list of users in a given organization]({{< relref "../manage-org-users/#view-a-list-of-organization-users" >}}). ## View user details @@ -62,26 +59,18 @@ A user account contains the following sections. This section contains basic user information, which users can update. -![Server Admin user information section](/static/img/docs/manage-users/server-admin-user-information-7-3.png) - #### Permissions This indicates whether the user account has the Grafana administrator flag applied. If the flag is set to **Yes**, then the user is a Grafana server administrator. -![Server Admin Permissions section](/static/img/docs/manage-users/server-admin-permissions-7-3.png) - #### Organizations This section lists the organizations the user belongs to and their assigned role. -![Server Admin Organizations section](/static/img/docs/manage-users/server-admin-organisations-7-3.png) - #### Sessions This section includes recent user sessions and information about the time the user logged in and they system they used. You can force logouts, if necessary. -![Server Admin Sessions section](/static/img/docs/manage-users/server-admin-sessions-7-3.png) - ## Edit a user account Edit a user account when you want to modify user login credentials, or delete, disable, or enable a user. diff --git a/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md b/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md index 094c11195220..b4ec8375e1cd 100644 --- a/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md +++ b/docs/sources/administration/user-management/server-user-management/add-remove-user-to-org/index.md @@ -1,10 +1,10 @@ --- aliases: - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-remove-user-to-org/ - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/add-user-to-org/ - - /docs/grafana/latest/administration/user-management/server-user-management/add-remove-user-to-org/ + - ../../manage-users-and-permissions/manage-server-users/add-remove-user-to-org/ + - ../../manage-users-and-permissions/manage-server-users/add-user-to-org/ +description: Describes how a Grafana server administrator can add or remove users + in an organization title: Add or remove a user in an organization -description: Describes how a Grafana server administrator can add or remove users in an organization weight: 30 --- diff --git a/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md b/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md index 575e4a61ddd8..5ca30a9ede32 100644 --- a/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md +++ b/docs/sources/administration/user-management/server-user-management/assign-remove-server-admin-privileges/index.md @@ -1,9 +1,9 @@ --- aliases: - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/ - - /docs/grafana/latest/administration/user-management/server-user-management/assign-remove-server-admin-privileges/ + - ../../manage-users-and-permissions/manage-server-users/assign-remove-server-admin-privileges/ +description: Describes how to assign and remove Grafana administrator privileges from + a server user. title: Assign or remove Grafana server administrator privileges -description: Describes how to assign and remove Grafana administrator privileges from a server user. weight: 20 --- diff --git a/docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md b/docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md index 9f2bb23ee3f7..7c0ffc411b68 100644 --- a/docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md +++ b/docs/sources/administration/user-management/server-user-management/change-user-org-permissions/index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/change-user-org-permissions/ - - /docs/grafana/latest/administration/user-management/server-user-management/change-user-org-permissions/ + - ../../manage-users-and-permissions/manage-server-users/change-user-org-permissions/ title: Change a user's organization permissions weight: 50 --- diff --git a/docs/sources/administration/user-management/server-user-management/grant-editor-admin-permissions/index.md b/docs/sources/administration/user-management/server-user-management/grant-editor-admin-permissions/index.md index 6abe237dcacc..492a044871f4 100644 --- a/docs/sources/administration/user-management/server-user-management/grant-editor-admin-permissions/index.md +++ b/docs/sources/administration/user-management/server-user-management/grant-editor-admin-permissions/index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/administration/manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/ - - /docs/grafana/latest/administration/user-management/server-user-management/grant-editor-admin-permissions/ + - ../../manage-users-and-permissions/manage-server-users/grant-editor-admin-permissions/ title: Grant editors administrator permissions weight: 60 --- diff --git a/docs/sources/administration/user-management/user-preferences/index.md b/docs/sources/administration/user-management/user-preferences/index.md index 3f4cc1e01890..6efc59cec923 100644 --- a/docs/sources/administration/user-management/user-preferences/index.md +++ b/docs/sources/administration/user-management/user-preferences/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/administration/change-your-password/ - - /docs/grafana/latest/administration/manage-user-preferences/ - - /docs/grafana/latest/administration/user-management/user-preferences/ + - ../change-your-password/ + - ../manage-user-preferences/ description: Learn how to update your user preferences and switch organizations keywords: - password diff --git a/docs/sources/alerting/_index.md b/docs/sources/alerting/_index.md index aa15239d75b4..72d40dfbb4fc 100644 --- a/docs/sources/alerting/_index.md +++ b/docs/sources/alerting/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/ - - /docs/grafana/latest/alerting/unified-alerting/alerting/ - - /docs/grafana/latest/about-alerting + - about-alerting/ + - unified-alerting/alerting/ title: Alerting weight: 114 --- diff --git a/docs/sources/alerting/alert-groups/_index.md b/docs/sources/alerting/alert-groups/_index.md index a0de79245a3a..60eb721b6c12 100644 --- a/docs/sources/alerting/alert-groups/_index.md +++ b/docs/sources/alerting/alert-groups/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/alert-groups/ - - /docs/grafana/latest/alerting/unified-alerting/alert-groups/ + - unified-alerting/alert-groups/ description: Alert groups keywords: - grafana diff --git a/docs/sources/alerting/alert-groups/filter-alerts.md b/docs/sources/alerting/alert-groups/filter-alerts.md index b946db6c4791..4dc242e099b5 100644 --- a/docs/sources/alerting/alert-groups/filter-alerts.md +++ b/docs/sources/alerting/alert-groups/filter-alerts.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/alert-groups/filter-alerts/ - - /docs/grafana/latest/alerting/unified-alerting/alert-groups/ + - ../unified-alerting/alert-groups/ description: Alert groups keywords: - grafana diff --git a/docs/sources/alerting/alert-groups/view-alert-grouping.md b/docs/sources/alerting/alert-groups/view-alert-grouping.md index 6a770bdfd293..7089e42afa1a 100644 --- a/docs/sources/alerting/alert-groups/view-alert-grouping.md +++ b/docs/sources/alerting/alert-groups/view-alert-grouping.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/alert-groups/ - - /docs/grafana/latest/alerting/alert-groups/view-alert-grouping/ - - /docs/grafana/latest/alerting/unified-alerting/alert-groups/ + - ../unified-alerting/alert-groups/ + - ./ description: Alert groups keywords: - grafana diff --git a/docs/sources/alerting/alerting-limitations.md b/docs/sources/alerting/alerting-limitations.md index b0f36ea5548a..b7b2aac03e4e 100644 --- a/docs/sources/alerting/alerting-limitations.md +++ b/docs/sources/alerting/alerting-limitations.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/alerting/alerting-limitations/ title: Limitations weight: 552 --- diff --git a/docs/sources/alerting/alerting-rules/_index.md b/docs/sources/alerting/alerting-rules/_index.md index 83388849b3f3..43e3e76345bd 100644 --- a/docs/sources/alerting/alerting-rules/_index.md +++ b/docs/sources/alerting/alerting-rules/_index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/alerting-rules/ - - /docs/grafana/latest/alerting/old-alerting/create-alerts/ - - /docs/grafana/latest/alerting/rules/ - - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/ + - old-alerting/create-alerts/ + - rules/ + - unified-alerting/alerting-rules/ title: Create and manage rules weight: 130 --- diff --git a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md index edb8869515ae..71d2747ff6d0 100644 --- a/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md +++ b/docs/sources/alerting/alerting-rules/create-grafana-managed-rule.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/alerting-rules/create-grafana-managed-rule/ - - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-grafana-managed-rule/ + - ../unified-alerting/alerting-rules/create-grafana-managed-rule/ description: Create Grafana managed alert rule keywords: - grafana diff --git a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md index dc7096e2dfcd..c3c63a0f6d46 100644 --- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md +++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-recording-rule.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-recording-rule/ - - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/ - - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/ + - ../unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/ + - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/ description: Create Grafana Mimir or Loki managed recording rule keywords: - grafana diff --git a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md index e96a9dbf64d3..b9d54cf1669e 100644 --- a/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md +++ b/docs/sources/alerting/alerting-rules/create-mimir-loki-managed-rule.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/alerting-rules/create-mimir-loki-managed-rule/ - - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/ - - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/ - - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/create-mimir-loki-managed-rule/ + - ../unified-alerting/alerting-rules/create-cortex-loki-managed-recording-rule/ + - ../unified-alerting/alerting-rules/create-mimir-loki-managed-recording-rule/ + - ../unified-alerting/alerting-rules/create-mimir-loki-managed-rule/ description: Create Grafana Mimir or Loki managed alerting rule keywords: - grafana diff --git a/docs/sources/alerting/alerting-rules/edit-mimir-loki-namespace-group.md b/docs/sources/alerting/alerting-rules/edit-mimir-loki-namespace-group.md index 696ca97e9a3d..e539852b1884 100644 --- a/docs/sources/alerting/alerting-rules/edit-mimir-loki-namespace-group.md +++ b/docs/sources/alerting/alerting-rules/edit-mimir-loki-namespace-group.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/alerting-rules/edit-mimir-loki-namespace-group/ - - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/ - - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/ + - ../unified-alerting/alerting-rules/edit-cortex-loki-namespace-group/ + - ../unified-alerting/alerting-rules/edit-mimir-loki-namespace-group/ description: Edit Grafana Mimir or Loki rule groups and namespaces keywords: - grafana diff --git a/docs/sources/alerting/alerting-rules/rule-list.md b/docs/sources/alerting/alerting-rules/rule-list.md index ed23448bc1be..9daefd77e332 100644 --- a/docs/sources/alerting/alerting-rules/rule-list.md +++ b/docs/sources/alerting/alerting-rules/rule-list.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/alerting-rules/rule-list/ - - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/rule-list/ + - ../unified-alerting/alerting-rules/rule-list/ description: Manage alerting rules keywords: - grafana diff --git a/docs/sources/alerting/contact-points/_index.md b/docs/sources/alerting/contact-points/_index.md index 28da4e33c662..5e7caad9831e 100644 --- a/docs/sources/alerting/contact-points/_index.md +++ b/docs/sources/alerting/contact-points/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/ - - /docs/grafana/latest/alerting/unified-alerting/contact-points/ + - unified-alerting/contact-points/ description: Create or edit contact point keywords: - grafana diff --git a/docs/sources/alerting/contact-points/create-contact-point.md b/docs/sources/alerting/contact-points/create-contact-point.md index 5c72362af571..699552eb7147 100644 --- a/docs/sources/alerting/contact-points/create-contact-point.md +++ b/docs/sources/alerting/contact-points/create-contact-point.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/create-contact-point/ - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../message-templating/ + - ../unified-alerting/message-templating/ + - message-templating/ keywords: - grafana - alerting diff --git a/docs/sources/alerting/contact-points/delete-contact-point.md b/docs/sources/alerting/contact-points/delete-contact-point.md index ef428bfe19c1..659a2a8ffc59 100644 --- a/docs/sources/alerting/contact-points/delete-contact-point.md +++ b/docs/sources/alerting/contact-points/delete-contact-point.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/delete-contact-point/ - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../message-templating/ + - ../unified-alerting/message-templating/ + - message-templating/ keywords: - grafana - alerting diff --git a/docs/sources/alerting/contact-points/edit-alertmanager-config.md b/docs/sources/alerting/contact-points/edit-alertmanager-config.md index 5b7ebd975c15..e7bc385324b9 100644 --- a/docs/sources/alerting/contact-points/edit-alertmanager-config.md +++ b/docs/sources/alerting/contact-points/edit-alertmanager-config.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/edit-alertmanager-config/ - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../message-templating/ + - ../unified-alerting/message-templating/ + - message-templating/ keywords: - grafana - alerting diff --git a/docs/sources/alerting/contact-points/edit-contact-point.md b/docs/sources/alerting/contact-points/edit-contact-point.md index 6af63def98cb..756b1919df00 100644 --- a/docs/sources/alerting/contact-points/edit-contact-point.md +++ b/docs/sources/alerting/contact-points/edit-contact-point.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/edit-contact-point/ - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../message-templating/ + - ../unified-alerting/message-templating/ + - message-templating/ keywords: - grafana - alerting diff --git a/docs/sources/alerting/contact-points/message-templating/_index.md b/docs/sources/alerting/contact-points/message-templating/_index.md index d65d3ae5e0cb..fd24b4555476 100644 --- a/docs/sources/alerting/contact-points/message-templating/_index.md +++ b/docs/sources/alerting/contact-points/message-templating/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../message-templating/ + - ../unified-alerting/message-templating/ description: Message templating keywords: - grafana diff --git a/docs/sources/alerting/contact-points/message-templating/create-message-template.md b/docs/sources/alerting/contact-points/message-templating/create-message-template.md index 35722596f5c1..ab229e2b8ed6 100644 --- a/docs/sources/alerting/contact-points/message-templating/create-message-template.md +++ b/docs/sources/alerting/contact-points/message-templating/create-message-template.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/contact-points/message-templating/create-message-template/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../../message-templating/ + - ../../unified-alerting/message-templating/ + - ./ keywords: - grafana - alerting diff --git a/docs/sources/alerting/contact-points/message-templating/delete-message-template.md b/docs/sources/alerting/contact-points/message-templating/delete-message-template.md index 710acd4692c2..70e3ba6ef6ef 100644 --- a/docs/sources/alerting/contact-points/message-templating/delete-message-template.md +++ b/docs/sources/alerting/contact-points/message-templating/delete-message-template.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/contact-points/message-templating/delete-message-template/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../../message-templating/ + - ../../unified-alerting/message-templating/ + - ./ keywords: - grafana - alerting diff --git a/docs/sources/alerting/contact-points/message-templating/edit-message-template.md b/docs/sources/alerting/contact-points/message-templating/edit-message-template.md index 59fea5b03bb9..05d766784f0a 100644 --- a/docs/sources/alerting/contact-points/message-templating/edit-message-template.md +++ b/docs/sources/alerting/contact-points/message-templating/edit-message-template.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/contact-points/message-templating/edit-message-template/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../../message-templating/ + - ../../unified-alerting/message-templating/ + - ./ keywords: - grafana - alerting diff --git a/docs/sources/alerting/contact-points/message-templating/example-template.md b/docs/sources/alerting/contact-points/message-templating/example-template.md index 1b90d154b381..148e93c4440e 100644 --- a/docs/sources/alerting/contact-points/message-templating/example-template.md +++ b/docs/sources/alerting/contact-points/message-templating/example-template.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/contact-points/message-templating/example-template/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../../message-templating/ + - ../../unified-alerting/message-templating/ + - ./ keywords: - grafana - alerting diff --git a/docs/sources/alerting/contact-points/message-templating/template-data.md b/docs/sources/alerting/contact-points/message-templating/template-data.md index ef8d73af0e1a..55ea3e19e2e7 100644 --- a/docs/sources/alerting/contact-points/message-templating/template-data.md +++ b/docs/sources/alerting/contact-points/message-templating/template-data.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/message-templating/template-data/ - - /docs/grafana/latest/alerting/message-templating/template-data/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-data/ + - ../../message-templating/template-data/ + - ../../unified-alerting/message-templating/template-data/ keywords: - grafana - alerting diff --git a/docs/sources/alerting/contact-points/notifiers/_index.md b/docs/sources/alerting/contact-points/notifiers/_index.md index 571465984af9..5544ebe98ad3 100644 --- a/docs/sources/alerting/contact-points/notifiers/_index.md +++ b/docs/sources/alerting/contact-points/notifiers/_index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/contact-points/notifiers/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../message-templating/ + - ../unified-alerting/message-templating/ + - message-templating/ keywords: - grafana - alerting diff --git a/docs/sources/alerting/contact-points/notifiers/webhook-notifier.md b/docs/sources/alerting/contact-points/notifiers/webhook-notifier.md index 2495ca578883..3675f24d15f1 100644 --- a/docs/sources/alerting/contact-points/notifiers/webhook-notifier.md +++ b/docs/sources/alerting/contact-points/notifiers/webhook-notifier.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/contact-points/notifiers/webhook-notifier/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../../message-templating/ + - ../../unified-alerting/message-templating/ + - ../message-templating/ keywords: - grafana - alerting diff --git a/docs/sources/alerting/contact-points/test-contact-point.md b/docs/sources/alerting/contact-points/test-contact-point.md index 1bc52163c9a7..d01c331dc869 100644 --- a/docs/sources/alerting/contact-points/test-contact-point.md +++ b/docs/sources/alerting/contact-points/test-contact-point.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/message-templating/ - - /docs/grafana/latest/alerting/contact-points/test-contact-point/ - - /docs/grafana/latest/alerting/message-templating/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/ + - ../message-templating/ + - ../unified-alerting/message-templating/ + - message-templating/ keywords: - grafana - alerting diff --git a/docs/sources/alerting/difference-old-new.md b/docs/sources/alerting/difference-old-new.md index e6274a97e3b9..141839bd9306 100644 --- a/docs/sources/alerting/difference-old-new.md +++ b/docs/sources/alerting/difference-old-new.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/difference-old-new/ - - /docs/grafana/latest/alerting/unified-alerting/difference-old-new/ + - unified-alerting/difference-old-new/ description: What's New with Grafana alerts draft: true keywords: diff --git a/docs/sources/alerting/fundamentals/_index.md b/docs/sources/alerting/fundamentals/_index.md index 77ae41cb259f..a35e6673d9b2 100644 --- a/docs/sources/alerting/fundamentals/_index.md +++ b/docs/sources/alerting/fundamentals/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/fundamentals/ - - /docs/grafana/latest/alerting/metrics/ - - /docs/grafana/latest/alerting/unified-alerting/fundamentals/ + - metrics/ + - unified-alerting/fundamentals/ title: Explore Grafana Alerting weight: 105 --- diff --git a/docs/sources/alerting/fundamentals/alert-rules/_index.md b/docs/sources/alerting/fundamentals/alert-rules/_index.md index 8d200af82656..79271341ddfd 100644 --- a/docs/sources/alerting/fundamentals/alert-rules/_index.md +++ b/docs/sources/alerting/fundamentals/alert-rules/_index.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/alerting/fundamentals/alert-rules/ description: About Grafana alert rules keywords: - grafana diff --git a/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md b/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md index 86049cd6c697..70854972b47c 100644 --- a/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md +++ b/docs/sources/alerting/fundamentals/alert-rules/alert-instances.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/alerting/fundamentals/alert-rules/alert-instances/ description: Learn about Grafana alert instances keywords: - grafana diff --git a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md index 18e2c596f914..ad5bfd9731d5 100644 --- a/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md +++ b/docs/sources/alerting/fundamentals/alert-rules/alert-rule-types.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/alerting/fundamentals/alert-rules/alert-rule-types/ description: Learn about the different alert rule types keywords: - grafana diff --git a/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md b/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md index 4674c876f5e7..37d53335bd73 100644 --- a/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md +++ b/docs/sources/alerting/fundamentals/alert-rules/organising-alerts.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/alerting/fundamentals/alert-rules/organising-alerts/ description: Learn how to organize alert rules keywords: - grafana diff --git a/docs/sources/alerting/fundamentals/alertmanager.md b/docs/sources/alerting/fundamentals/alertmanager.md index 816ef05c921d..aaf0063a213a 100644 --- a/docs/sources/alerting/fundamentals/alertmanager.md +++ b/docs/sources/alerting/fundamentals/alertmanager.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/fundamentals/alertmanager/ - - /docs/grafana/latest/alerting/metrics/ - - /docs/grafana/latest/alerting/unified-alerting/fundamentals/alertmanager/ + - ../metrics/ + - ../unified-alerting/fundamentals/alertmanager/ title: Alertmanager weight: 116 --- diff --git a/docs/sources/alerting/fundamentals/annotation-label/_index.md b/docs/sources/alerting/fundamentals/annotation-label/_index.md index 0f59b4ba016a..777ab7d678ca 100644 --- a/docs/sources/alerting/fundamentals/annotation-label/_index.md +++ b/docs/sources/alerting/fundamentals/annotation-label/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/alerting-rules/alert-annotation-label/ - - /docs/grafana/latest/alerting/fundamentals/annotation-label/ - - /docs/grafana/latest/alerting/unified-alerting/alerting-rules/alert-annotation-label/ + - ../alerting-rules/alert-annotation-label/ + - ../unified-alerting/alerting-rules/alert-annotation-label/ description: Annotations and labels for alerting keywords: - grafana diff --git a/docs/sources/alerting/fundamentals/annotation-label/example-template-functions.md b/docs/sources/alerting/fundamentals/annotation-label/example-template-functions.md index b6f134644768..1183f31bc48f 100644 --- a/docs/sources/alerting/fundamentals/annotation-label/example-template-functions.md +++ b/docs/sources/alerting/fundamentals/annotation-label/example-template-functions.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/message-templating/example-template-functions/ - - /docs/grafana/latest/alerting/fundamentals/annotation-label/example-template-functions/ + - ../../contact-points/message-templating/example-template-functions/ keywords: - grafana - alerting diff --git a/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md b/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md index fd0e9e51efea..028575a51579 100644 --- a/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md +++ b/docs/sources/alerting/fundamentals/annotation-label/how-to-use-labels.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/alerting/fundamentals/annotation-label/how-to-use-labels/ description: Learn about labels and label matchers in alerting keywords: - grafana diff --git a/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md b/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md index 4376537d0b00..64d4ea0a183e 100644 --- a/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md +++ b/docs/sources/alerting/fundamentals/annotation-label/labels-and-label-matchers.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/alerting/fundamentals/annotation-label/labels-and-label-matchers/ description: Learn about labels and label matchers in alerting keywords: - grafana diff --git a/docs/sources/alerting/fundamentals/annotation-label/template-functions.md b/docs/sources/alerting/fundamentals/annotation-label/template-functions.md index c7c3635c525d..d00e293725e5 100644 --- a/docs/sources/alerting/fundamentals/annotation-label/template-functions.md +++ b/docs/sources/alerting/fundamentals/annotation-label/template-functions.md @@ -1,10 +1,9 @@ --- aliases: - - /docs/grafana/latest/alerting/contact-points/message-templating/template-functions/ - - /docs/grafana/latest/alerting/message-templating/template-functions/ - - /docs/grafana/latest/alerting/unified-alerting/message-templating/template-functions/ - - /docs/grafana/latest/alerting/fundamentals/annotation-label/template-functions/ - - /docs/grafana/latest/alerting/unified-alerting/fundamentals/annotation-label/template-functions/ + - ../../contact-points/message-templating/template-functions/ + - ../../message-templating/template-functions/ + - ../../unified-alerting/fundamentals/annotation-label/template-functions/ + - ../../unified-alerting/message-templating/template-functions/ keywords: - grafana - alerting diff --git a/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md b/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md index f4bff768cdb7..59a6e61ff110 100644 --- a/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md +++ b/docs/sources/alerting/fundamentals/annotation-label/variables-label-annotation.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/alerting/fundamentals/annotation-label/variables-label-annotation/ description: Learn about labels and label matchers in alerting keywords: - grafana @@ -99,3 +97,17 @@ The following template variables are available when expanding annotations and la | $labels | The labels from the query or condition. For example, `{{ $labels.instance }}` and `{{ $labels.job }}`. This is unavailable when the rule uses a [classic condition]({{< relref "../../alerting-rules/create-grafana-managed-rule/#single-and-multi-dimensional-rule" >}}). | | $values | The values of all reduce and math expressions that were evaluated for this alert rule. For example, `{{ $values.A }}`, `{{ $values.A.Labels }}` and `{{ $values.A.Value }}` where `A` is the `refID` of the reduce or math expression. If the rule uses a classic condition instead of a reduce and math expression, then `$values` contains the combination of the `refID` and position of the condition. | | $value | The value string of the alert instance. For example, `[ var='A' labels={instance=foo} value=10 ]`. | + +### Labels with dots + +If a label contains a dot (full stop or period) in its name then the following will not work: + +``` +Instance {{ $labels.instance.name }} has been down for more than 5 minutes +``` + +This is because we are printing a non-existing field `name` in `$labels.instance` rather than `instance.name` in `$labels`. Instead we can use the `index` function to print `instance.name`: + +``` +Instance {{ index $labels "instance.name" }} has been down for more than 5 minutes +``` diff --git a/docs/sources/alerting/fundamentals/data-source-alerting.md b/docs/sources/alerting/fundamentals/data-source-alerting.md index 7426f767f0b4..2b3db4821cc8 100644 --- a/docs/sources/alerting/fundamentals/data-source-alerting.md +++ b/docs/sources/alerting/fundamentals/data-source-alerting.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/alerting/fundamentals/data-source-alerting/ description: Data sources in Grafana Alerting title: Data sources weight: 100 diff --git a/docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md b/docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md index d687261b00e3..0715a1665108 100644 --- a/docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md +++ b/docs/sources/alerting/fundamentals/evaluate-grafana-alerts.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/fundamentals/evaluate-grafana-alerts/ - - /docs/grafana/latest/alerting/metrics/ - - /docs/grafana/latest/alerting/unified-alerting/fundamentals/evaluate-grafana-alerts/ + - ../metrics/ + - ../unified-alerting/fundamentals/evaluate-grafana-alerts/ title: Alerting on numeric data weight: 116 --- diff --git a/docs/sources/alerting/fundamentals/state-and-health.md b/docs/sources/alerting/fundamentals/state-and-health.md index 7376c3b13c50..e1ff6efa8937 100644 --- a/docs/sources/alerting/fundamentals/state-and-health.md +++ b/docs/sources/alerting/fundamentals/state-and-health.md @@ -1,6 +1,5 @@ --- aliases: - - /docs/grafana/latest/alerting/fundamentals/state-and-health/ - /docs/grafana/llatest/alerting/unified-alerting/alerting-rules/state-and-health/ description: State and Health of alerting rules keywords: diff --git a/docs/sources/alerting/high-availability/_index.md b/docs/sources/alerting/high-availability/_index.md index 4d0eba3ded06..09d7c7b6610b 100644 --- a/docs/sources/alerting/high-availability/_index.md +++ b/docs/sources/alerting/high-availability/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/high-availability/ - - /docs/grafana/latest/alerting/unified-alerting/high-availability/ + - unified-alerting/high-availability/ description: High availability keywords: - grafana diff --git a/docs/sources/alerting/high-availability/enable-alerting-ha.md b/docs/sources/alerting/high-availability/enable-alerting-ha.md index c040be3cf00a..de866840280e 100644 --- a/docs/sources/alerting/high-availability/enable-alerting-ha.md +++ b/docs/sources/alerting/high-availability/enable-alerting-ha.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/high-availability/enable-alerting-ha/ - - /docs/grafana/latest/alerting/unified-alerting/high-availability/ + - ../unified-alerting/high-availability/ description: Enable alerting high availability keywords: - grafana diff --git a/docs/sources/alerting/images-in-notifications.md b/docs/sources/alerting/images-in-notifications.md index 1e773f0acd43..156d70e57cb3 100644 --- a/docs/sources/alerting/images-in-notifications.md +++ b/docs/sources/alerting/images-in-notifications.md @@ -1,44 +1,68 @@ --- -aliases: description: keywords: - grafana - alerting - images - notifications -title: Images in notifications +title: Use images in notifications +weight: 460 --- -# Images in notifications +# Use images in notifications -Images in notifications helps recipients of alert notifications better understand why an alert has fired or resolved by including an image of the panel associated with the Grafana managed alert rule. +Images in notifications helps recipients of alert notifications better understand why an alert has fired or resolved by including a screenshot of the panel associated with the alert. -> **Note**: Images in notifications are not available for Grafana Mimir and Loki managed alert rules, or when Grafana is set up to send alert notifications to an external Alertmanager. +> **Note**: This feature is not supported for Mimir or Loki rules, or when Grafana sends alert notifications to an external Alertmanager. -If Grafana is set up to send images in notifications, it takes a screenshot of the panel for the Grafana managed alert rule when either of the following happen: +When an alert is fired or resolved Grafana takes a screenshot of the panel associated with the alert. This is determined via the Dashboard UID and Panel ID annotations of the rule. Grafana cannot take a screenshot for alerts that are not associated with a panel. -1. The alert rule transitions from pending to firing -2. The alert rule transitions from firing to OK +Because a number of contact points, such as email, do not support uploading screenshots at the time of sending a notification; Grafana can also upload the screenshot to a cloud storage service such as Amazon S3, Azure Blob Storage and Google Cloud Storage, where a link to the uploaded screenshot can be added to the notification. However, if using a cloud storage service is not an option then Grafana can be its own cloud storage service such that the screenshot is available under the same domain as Grafana. -Grafana does not support images for alert rules that are not associated with a panel. An alert rule is associated with a panel when it has both Dashboard UID and Panel ID annotations. +Should either the cloud storage service, or Grafana if acting as its own cloud storage service, be protected by a firewall, gateway service or VPN, then screenshots might not be shown in notifications. -Images are stored in the [data]({{< relref "../setup-grafana/configure-grafana/#paths" >}}) path and so Grafana must have write-access to this path. If Grafana cannot write to this path then screenshots cannot be saved to disk and an error will be logged for each failed screenshot attempt. In addition to storing images on disk, Grafana can also store the image in an external image store such as Amazon S3, Azure Blob Storage, Google Cloud Storage and even Grafana where screenshots are stored in `public/img/attachments`. Screenshots older than `temp_data_lifetime` are deleted from disk but not the external image store. If Grafana is the external image store then screenshots are deleted from `data` but not from `public/img/attachments`. +How to choose between uploading screenshots at the time of sending the notification, using a cloud storage service, or using Grafana as its own cloud storage service, depends on which contact points you plan to use and whether you use a firewall, gateway service or VPN. -> **Note**: It is recommended that you use an external image store, as not all contact points support uploading images from disk. It is also possible that the image on disk is deleted before an alert notification is sent if `temp_data_lifetime` is less than the `group_wait` and `group_interval` options used in Alertmanager. +For example, if a contact point supports uploading images at the time of notification is it not required to use cloud storage. Cloud storage is required when a contact point does not support uploading images at the time of sending a notification, such as email. We don't recommend using cloud storage if the cloud storage service is behind a firewall, gateway service, or VPN, as screenshots might not be shown in notifications. + +Please refer to the table at the end of this page for a list of contact points and their support for images in notifications. ## Requirements -To use images in notifications, Grafana must be set up to use [image rendering]({{< relref "../setup-grafana/image-rendering/" >}}). It is also recommended that Grafana is set up to upload images to an [external image store]({{< relref "../setup-grafana/configure-grafana/#external_image_storage" >}}) such as Amazon S3, Azure Blob Storage, Google Cloud Storage or even Grafana. +To use images in notifications, Grafana must be set up to use [image rendering](https://grafana.com/docs/grafana/next/setup-grafana/image-rendering/). You can either install the image rendering plugin or run it as a remote rendering service. + +When a screenshot is taken it is saved to the [data]({{< relref "../../setup-grafana/configure-grafana/#paths" >}}) path. This is where screenshots are stored before being sent in a notification or uploaded to a cloud storage service. Grafana must have write-access to this path. If Grafana cannot write to this path then screenshots cannot be saved to disk and an error will be logged for each failed screenshot attempt. + +If using a [cloud storage service](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#external_image_storage) such as Amazon S3, Azure Blob Storage or Google Cloud Storage, uploaded images need to be accessible outside of a firewall, gateway service or VPN for screenshots to be shown in notifications. Grafana will not delete screenshots from cloud storage. We recommend configuring a retention policy on the bucket to delete screenshots older than 1 month. + +If using Grafana as its own cloud storage service then screenshots will be saved to `static_root_path/img/attachments`. `static_root_path` is a configuration option for Grafana and can be found in `defaults.ini`. However, like when using a cloud storage service, images need to be accessible outside of a firewall, gateway service or VPN for screenshots to be shown in notifications. + +When using Grafana as its own cloud storage service screenshots are copied from [data]({{< relref "../../setup-grafana/configure-grafana/#paths" >}}) to `static_root_path/img/attachments`. Screenshots older than `temp_data_lifetime` are deleted from [data]({{< relref "../../setup-grafana/configure-grafana/#paths" >}}) but not from `static_root_path/images/attachments`. To delete screenshots from `static_root_path` after a certain amount of time we recommend setting up a CRON job. ## Configuration -If Grafana has been set up to use [image rendering]({{< relref "../setup-grafana/image-rendering/" >}}) images in notifications can be turned on via the `capture` option in `[unified_alerting.screenshots]`: +Having installed either the image rendering plugin, or set up Grafana to use a remote rendering service, set `capture` in `[unified_alerting.screenshots]` to `true`: # Enable screenshots in notifications. This option requires the Grafana Image Renderer plugin. # For more information on configuration options, refer to [rendering]. - capture = true + capture = false + +If screenshots should be uploaded to cloud storage then `upload_external_image_storage` should also be set to `true`: + + # Uploads screenshots to the local Grafana server or remote storage such as Azure, S3 and GCS. Please + # see [external_image_storage] for further configuration options. If this option is false, screenshots + # will be persisted to disk for up to temp_data_lifetime. + upload_external_image_storage = false + +Please see [`[external_image_storage]`](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#external_image_storage) for instructions on how to configure cloud storage. Grafana will not start if `upload_external_image_storage` is `true` and `[external_image_storage]` contains missing or invalid configuration. + +If Grafana is acting as its own cloud storage then `[upload_external_image_storage]` should be set to `true` and the `local` provider should be set in [`[external_image_storage]`](https://grafana.com/docs/grafana/latest/setup-grafana/configure-grafana/#external_image_storage). -It is recommended that `max_concurrent_screenshots` is set to a value that is less than or equal to `concurrent_render_request_limit`. The default value for both `max_concurrent_screenshots` and `concurrent_render_request_limit` is `5`: +Restart Grafana for the changes to take effect. + +## Advanced configuration + +We recommended that `max_concurrent_screenshots` is less than or equal to `concurrent_render_request_limit`. The default value for both `max_concurrent_screenshots` and `concurrent_render_request_limit` is `5`: # The maximum number of screenshots that can be taken at the same time. This option is different from # concurrent_render_request_limit as max_concurrent_screenshots sets the number of concurrent screenshots @@ -46,56 +70,60 @@ It is recommended that `max_concurrent_screenshots` is set to a value that is le # the total number of concurrent screenshots across all Grafana services. max_concurrent_screenshots = 5 -If Grafana has been set up to use an external image store, `upload_external_image_storage` should be set to `true`: +## Support for images in contact points + +Grafana supports a wide range of contact points with varied support for images in notifications. The table below shows the list of all contact points supported in Grafana and their support for uploading images at the time of sending the notification and images uploaded to cloud storage, including when Grafana is acting as its own cloud storage service. + +| Name | Upload image at time of notification | Cloud storage | +| ----------------------- | ------------------------------------ | ------------- | +| DingDing | No | No | +| Discord | Yes | Yes | +| Email | Yes | Yes | +| Google Hangouts Chat | No | Yes | +| Kafka | No | No | +| Line | No | No | +| Microsoft Teams | No | Yes | +| Opsgenie | No | Yes | +| Pagerduty | No | Yes | +| Prometheus Alertmanager | No | No | +| Pushover | Yes | No | +| Sensu Go | No | No | +| Slack | No (will be available in 9.4) | Yes | +| Telegram | Yes | No | +| Threema | No | No | +| VictorOps | No | No | +| Webhook | No | Yes | +| Cisco Webex Teams | No | Yes | - # Uploads screenshots to the local Grafana server or remote storage such as Azure, S3 and GCS. Please - # see [external_image_storage] for further configuration options. If this option is false, screenshots - # will be persisted to disk for up to temp_data_lifetime. - upload_external_image_storage = false +## Limitations -Restart Grafana for the changes to take affect. - -## Supported notifiers - -Images in notifications are supported in the following notifiers and additional support will be added in the future: - -| Name | Upload images from disk | Include images from URL | -| ----------------------- | ----------------------- | ----------------------- | -| DingDing | No | No | -| Discord | Yes | Yes | -| Email | Yes | Yes | -| Google Hangouts Chat | No | Yes | -| Kafka | No | No | -| Line | No | No | -| Microsoft Teams | No | Yes | -| Opsgenie | No | Yes | -| Pagerduty | No | Yes | -| Prometheus Alertmanager | No | No | -| Pushover | Yes | No | -| Sensu Go | No | No | -| Slack | No | Yes | -| Telegram | No | No | -| Threema | No | No | -| VictorOps | No | No | -| Webhook | No | Yes | - -Include images from URL refers to using the external image store. +- This feature is not supported for Mimir or Loki rules, or when Grafana sends alert notifications to an external Alertmanager. +- When multiple alerts are sent in a single notification a screenshot might be included for each alert. The order the images are shown in random. +- Some contact points support at most one image per notification. In this case, the first image associated with an alert will be attached. +- We don't recommend using cloud storage if the cloud storage service is behind a firewall, gateway service, or VPN, as screenshots might not be shown in notifications. + +## Troubleshooting + +If Grafana has been set up to send images in notifications, however notifications are still being received without them, follow the troubleshooting steps below: + +1. Check that images in notifications has been set up as per the instructions. +2. Enable debug logging in Grafana and look for logs with the logger `ngalert.image`. +3. If the alert is not associated with a dashboard there will be logs for `Cannot take screenshot for alert rule as it is not associated with a dashboard`. +4. If the alert is associated with a dashboard, but no panel in the dashboard, there will be logs for `Cannot take screenshot for alert rule as it is not associated with a panel`. +5. If images cannot be taken because of mis-configuration or an issue with image rendering there will be logs for `Failed to take an image` including the Dashboard UID, Panel ID, and the error message. +6. Check that the contact point supports images in notifications, and the present configuration, as per the table. +7. If the image was uploaded to cloud storage make sure it is public. +8. If images are made available via Grafana's built in web server make sure it is accessible via the Internet. ## Metrics Grafana provides the following metrics to observe the performance and failure rate of images in notifications. For example, if a screenshot could not be taken within the expected time (10 seconds) then the counter `grafana_screenshot_failures_total` is updated. -- `grafana_screenshot_cache_hits_total` -- `grafana_screenshot_cache_misses_total` +- `grafana_alerting_image_cache_hits_total` +- `grafana_alerting_image_cache_misses_total` - `grafana_screenshot_duration_seconds` - `grafana_screenshot_failures_total` - `grafana_screenshot_successes_total` - `grafana_screenshot_upload_failures_total` - `grafana_screenshot_upload_successes_total` - -## Limitations - -- Images in notifications are not available for Grafana Mimir and Loki managed alert rules, or when Grafana is set up to send alert notifications to an external Alertmanager. -- When alerts generated by different alert rules are sent in a single notification, there may be screenshots for each alert rule. This happens if an alert group contains multiple alerting rules. The order the images are attached is random. If you need to guarantee the ordering of images, make sure that your alert groups contain a single alerting rule. -- Some contact points only handle a single image. In this case, the first image associated with an alert will be attached. Because the ordering is random, this may not always be an image for the same alert rule. If you need to guarantee you receive a screenshot for a particular rule, make sure that your alert groups contain a single alerting rule. diff --git a/docs/sources/alerting/migrating-alerts/_index.md b/docs/sources/alerting/migrating-alerts/_index.md index d8d104d997f3..916a8c340121 100644 --- a/docs/sources/alerting/migrating-alerts/_index.md +++ b/docs/sources/alerting/migrating-alerts/_index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/migrating-alerts/ - - /docs/grafana/latest/alerting/unified-alerting/ - - /docs/grafana/latest/alerting/unified-alerting/difference-old-new/ - - /docs/grafana/latest/alerting/difference-old-new/ + - difference-old-new/ + - unified-alerting/ + - unified-alerting/difference-old-new/ description: Upgrade Grafana alerts title: Upgrade to Grafana Alerting weight: 110 diff --git a/docs/sources/alerting/migrating-alerts/disable-alerting.md b/docs/sources/alerting/migrating-alerts/disable-alerting.md index 0f7595044174..1d36744020aa 100644 --- a/docs/sources/alerting/migrating-alerts/disable-alerting.md +++ b/docs/sources/alerting/migrating-alerts/disable-alerting.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/migrating-alerts/disable-alerting/ - - /docs/grafana/latest/alerting/disable-alerting/ - - /docs/grafana/latest/alerting/unified-alerting/disable-alerting/ + - ../disable-alerting/ + - ../unified-alerting/disable-alerting/ description: Disable alerting in Grafana title: Disable alerting in Grafana weight: 105 diff --git a/docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md b/docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md index 19df966b282d..0996359b782d 100644 --- a/docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md +++ b/docs/sources/alerting/migrating-alerts/migrating-legacy-alerts.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/alerting/migrating-alerts/differences-and-limitations/ - - /docs/grafana/latest/alerting/migrating-alerts/migrating-legacy-alerts/ - - /docs/grafana/latest/alerting/migrating-legacy-alerts/ - - /docs/grafana/latest/alerting/unified-alerting/opt-in/ + - ../migrating-legacy-alerts/ + - ../unified-alerting/opt-in/ + - differences-and-limitations/ description: Migrate legacy dashboard alerts title: Differences and limitations weight: 106 diff --git a/docs/sources/alerting/migrating-alerts/opt-in.md b/docs/sources/alerting/migrating-alerts/opt-in.md index 00a62c2385bf..f1ac6a787e95 100644 --- a/docs/sources/alerting/migrating-alerts/opt-in.md +++ b/docs/sources/alerting/migrating-alerts/opt-in.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/migrating-alerts/opt-in/ - - /docs/grafana/latest/alerting/opt-in/ - - /docs/grafana/latest/alerting/unified-alerting/opt-in/ + - ../opt-in/ + - ../unified-alerting/opt-in/ description: Opt in to Grafana Alerting title: Opt in to Grafana Alerting weight: 104 diff --git a/docs/sources/alerting/migrating-alerts/opt-out.md b/docs/sources/alerting/migrating-alerts/opt-out.md index 685464bf7666..d0bee324f1ce 100644 --- a/docs/sources/alerting/migrating-alerts/opt-out.md +++ b/docs/sources/alerting/migrating-alerts/opt-out.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/migrating-alerts/opt-out/ - - /docs/grafana/latest/alerting/opt-in/ - - /docs/grafana/latest/alerting/unified-alerting/opt-in/ + - ../opt-in/ + - ../unified-alerting/opt-in/ description: Opt out of Grafana Alerting title: Opt out of Grafana Alerting weight: 102 diff --git a/docs/sources/alerting/migrating-alerts/roll-back.md b/docs/sources/alerting/migrating-alerts/roll-back.md index 319db9b39219..f77269aae0cb 100644 --- a/docs/sources/alerting/migrating-alerts/roll-back.md +++ b/docs/sources/alerting/migrating-alerts/roll-back.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/migrating-alerts/roll-back/ - - /docs/grafana/latest/alerting/opt-in/ - - /docs/grafana/latest/alerting/unified-alerting/roll-back/ + - ../opt-in/ + - ../unified-alerting/roll-back/ description: Roll back to legacy alerting title: Roll back to legacy alerting weight: 103 diff --git a/docs/sources/alerting/notifications/_index.md b/docs/sources/alerting/notifications/_index.md index bcafc9661083..d55318466551 100644 --- a/docs/sources/alerting/notifications/_index.md +++ b/docs/sources/alerting/notifications/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/alerting/notifications/ - - /docs/grafana/latest/alerting/old-alerting/notifications/ - - /docs/grafana/latest/alerting/unified-alerting/notifications/ + - old-alerting/notifications/ + - unified-alerting/notifications/ description: Notification policies keywords: - grafana diff --git a/docs/sources/alerting/notifications/mute-timings.md b/docs/sources/alerting/notifications/mute-timings.md index d8d7dc8db327..b38a9e2c99ce 100644 --- a/docs/sources/alerting/notifications/mute-timings.md +++ b/docs/sources/alerting/notifications/mute-timings.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/notifications/mute-timings/ - - /docs/grafana/latest/alerting/unified-alerting/notifications/mute-timings/ + - ../unified-alerting/notifications/mute-timings/ description: Mute timings keywords: - grafana diff --git a/docs/sources/alerting/performance.md b/docs/sources/alerting/performance.md index 3c1f4279034b..f55080454854 100644 --- a/docs/sources/alerting/performance.md +++ b/docs/sources/alerting/performance.md @@ -1,9 +1,13 @@ -+++ -title = "Performance considerations" -description = "Understanding alerting performance" -keywords = ["grafana", "alerting", "performance"] -weight = 555 -+++ +--- +aliases: [] +description: Understanding alerting performance +keywords: + - grafana + - alerting + - performance +title: Performance considerations +weight: 555 +--- # Alerting performance considerations diff --git a/docs/sources/alerting/set-up/_index.md b/docs/sources/alerting/set-up/_index.md index 039b10409e1c..742589ff12a3 100644 --- a/docs/sources/alerting/set-up/_index.md +++ b/docs/sources/alerting/set-up/_index.md @@ -1,8 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/set-up/ - - /docs/grafana/latest/alerting/set-up/ - - /docs/grafana/latest/alerting/unified-alerting/set-up/ + - unified-alerting/set-up/ title: Set up Grafana Alerting weight: 107 --- diff --git a/docs/sources/alerting/set-up/configure-alertmanager/index.md b/docs/sources/alerting/set-up/configure-alertmanager/index.md index 4d6155be0893..166fd3013d92 100644 --- a/docs/sources/alerting/set-up/configure-alertmanager/index.md +++ b/docs/sources/alerting/set-up/configure-alertmanager/index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/configure-alertmanager - - /docs/grafana/latest/alerting/configure-alertmanager + - ../configure-alertmanager/ description: Configure Alertmanager keywords: - grafana diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/_index.md b/docs/sources/alerting/set-up/provision-alerting-resources/_index.md index 151e93f4ef47..62607174801d 100644 --- a/docs/sources/alerting/set-up/provision-alerting-resources/_index.md +++ b/docs/sources/alerting/set-up/provision-alerting-resources/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/provision-alerting-resources - - /docs/grafana/latest/alerting/provision-alerting-resources + - ../provision-alerting-resources/ description: Provision alerting resources keywords: - grafana diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md b/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md index 8c05b9123a97..701c462d0937 100644 --- a/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md +++ b/docs/sources/alerting/set-up/provision-alerting-resources/file-provisioning/index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/provision-alerting-resources/file-provisioning - - /docs/grafana/latest/alerting/provision-alerting-resources/file-provisioning + - ../../provision-alerting-resources/file-provisioning/ description: Create and manage resources using file provisioning keywords: - grafana @@ -70,7 +69,7 @@ groups: # evaluation - should be obtained trough the API data: - refId: A - datasourceUid: '-100' + datasourceUid: '__expr__' model: conditions: - evaluator: @@ -87,7 +86,7 @@ groups: type: query datasource: type: __expr__ - uid: '-100' + uid: '__expr__' expression: 1==0 intervalMs: 1000 maxDataPoints: 43200 diff --git a/docs/sources/alerting/set-up/provision-alerting-resources/terraform-provisioning/index.md b/docs/sources/alerting/set-up/provision-alerting-resources/terraform-provisioning/index.md index 60aecf5341e5..752f3c593ad4 100644 --- a/docs/sources/alerting/set-up/provision-alerting-resources/terraform-provisioning/index.md +++ b/docs/sources/alerting/set-up/provision-alerting-resources/terraform-provisioning/index.md @@ -1,6 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/provision-alerting-resources/terraform-provisioning + - ../../provision-alerting-resources/terraform-provisioning/ description: Create and manage alerting resources using Terraform keywords: - grafana @@ -275,7 +275,7 @@ resource "grafana_rule_group" "my_rule_group" { // The query was configured to obtain data from the last 60 seconds. Let's alert on the average value of that series using a Reduce stage. data { - datasource_uid = "-100" + datasource_uid = "__expr__" // You can also create a rule in the UI, then GET that rule to obtain the JSON. // This can be helpful when using more complex reduce expressions. model = < **Note:** Available in [Grafana Enterprise]({{< relref "../../introduction/grafana-enterprise/" >}}) version 7.5 and later behind the `reportVariables` feature flag, Grafana Enterprise version 8.0 and later without a feature flag, and [Grafana Cloud Pro and Advanced](/docs/grafana-cloud/). -You can configure report-specific template variables for the dashboard on the report page. The variables that you select will override the variables from the dashboard, and they are used when rendering a PDF file of the report. For detailed information about using template variables, refer to the [Templates and variables]({{< relref "../../variables/" >}}) section. +You can configure report-specific template variables for the dashboard on the report page. The variables that you select will override the variables from the dashboard, and they are used when rendering a PDF file of the report. For detailed information about using template variables, refer to the [Templates and variables]({{< relref "../variables/" >}}) section. > **Note:** The query variables saved with a report might become of date if the results of that query change. For example, if your template variable queries for a list of hostnames and a new hostname is added, then it will not be included in the report. If that occurs, the selected variables must be manually updated in the report. If you select the `All` value for the template variable or if you keep the dashboard's original variable selection, then the report stays up-to-date as new values are added. diff --git a/docs/sources/dashboards/dashboard-public/index.md b/docs/sources/dashboards/dashboard-public/index.md index d23f206b1a55..862e9d0a9d0a 100644 --- a/docs/sources/dashboards/dashboard-public/index.md +++ b/docs/sources/dashboards/dashboard-public/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/dashboards/dashboard-manage/ - - /docs/grafana/latest/features/dashboard/dashboards/ - - /docs/grafana/latest/dashboards/dashboard-public/ + - ../features/dashboard/dashboards/ + - dashboard-manage/ title: Public dashboards weight: 8 --- diff --git a/docs/sources/dashboards/manage-dashboards/index.md b/docs/sources/dashboards/manage-dashboards/index.md index c8b61bfc1146..bd225ce3166b 100644 --- a/docs/sources/dashboards/manage-dashboards/index.md +++ b/docs/sources/dashboards/manage-dashboards/index.md @@ -1,19 +1,15 @@ --- aliases: - - /docs/grafana/latest/dashboards/dashboard-manage/ - - /docs/grafana/latest/features/dashboard/dashboards/ - - /docs/grafana/latest/dashboards/dashboard-folders/ - - /docs/grafana/latest/reference/dashboard_folders/ - - /docs/grafana/latest/dashboards/export-import/ - - /docs/grafana/latest/reference/export_import/ - - /docs/grafana/latest/troubleshooting/troubleshoot-dashboards/ - - /docs/grafana/latest/dashboards/time-range-controls/ - - /docs/grafana/latest/reference/timerange/ - - /docs/grafana/latest/panels/working-with-panels/organize-dashboard/ - - /docs/grafana/latest/dashboards/manage-dashboards/ -title: Manage dashboards -menuTitle: Manage dashboards -weight: 8 + - ../features/dashboard/dashboards/ + - ../panels/working-with-panels/organize-dashboard/ + - ../reference/dashboard_folders/ + - ../reference/export_import/ + - ../reference/timerange/ + - ../troubleshooting/troubleshoot-dashboards/ + - dashboard-folders/ + - dashboard-manage/ + - export-import/ + - time-range-controls/ keywords: - grafana - dashboard @@ -25,6 +21,9 @@ keywords: - troubleshoot - time range - scripting +menuTitle: Manage dashboards +title: Manage dashboards +weight: 8 --- # Manage dashboards @@ -37,7 +36,6 @@ This topic includes techniques you can use to manage your Grafana dashboards, in - [Creating and managing dashboard folders](#create-and-manage-dashboard-folders) - [Exporting and importing dashboards](#export-and-import-dashboards) -- [Configuring dashboard time range controls](#configure-dashboard-time-range-controls) - [Organizing dashboards](#organize-a-dashboard) - [Troubleshooting dashboards](#troubleshoot-dashboards) diff --git a/docs/sources/dashboards/share-dashboards-panels/index.md b/docs/sources/dashboards/share-dashboards-panels/index.md index 764e73391364..cd5837e76a10 100644 --- a/docs/sources/dashboards/share-dashboards-panels/index.md +++ b/docs/sources/dashboards/share-dashboards-panels/index.md @@ -1,23 +1,18 @@ --- aliases: - - /docs/grafana/latest/sharing/ - - /docs/grafana/latest/dashboards/share-dashboard/ - - /docs/grafana/latest/reference/share_dashboard/ - - /docs/grafana/latest/sharing/share-dashboard/ - - /docs/grafana/latest/dashboards/share-dashboard/ - - /docs/grafana/latest/reference/share_panel/ - - /docs/grafana/latest/sharing/share-panel/ - - /docs/grafana/latest/sharing/playlists/ - - /docs/grafana/latest/administration/reports/ - - /docs/grafana/latest/enterprise/reporting/ - - /docs/grafana/latest/administration/reports/ - - /docs/grafana/latest/dashboards/reporting/ - - /docs/grafana/latest/enterprise/export-pdf/ - - docs/grafana/latest/dashboards/share-dashboards-panels/ - - /docs/grafana/latest/share-dashboards-panels/ -title: Share dashboards and panels -menuTitle: Sharing -weight: 85 + - ../administration/reports/ + - ../enterprise/export-pdf/ + - ../enterprise/reporting/ + - ../reference/share_dashboard/ + - ../reference/share_panel/ + - ../share-dashboards-panels/ + - ../sharing/ + - ../sharing/playlists/ + - ../sharing/share-dashboard/ + - ../sharing/share-panel/ + - ./ + - reporting/ + - share-dashboard/ keywords: - grafana - dashboard @@ -29,6 +24,9 @@ keywords: - reporting - export - pdf +menuTitle: Sharing +title: Share dashboards and panels +weight: 85 --- # Share dashboards and panels diff --git a/docs/sources/dashboards/use-dashboards/index.md b/docs/sources/dashboards/use-dashboards/index.md index 3d77ff19d99d..b24e50dc1f1a 100644 --- a/docs/sources/dashboards/use-dashboards/index.md +++ b/docs/sources/dashboards/use-dashboards/index.md @@ -1,21 +1,19 @@ --- aliases: - - /docs/grafana/latest/dashboards/dashboard-ui/ - - /docs/grafana/latest/dashboards/dashboard-ui/dashboard-header/ - - /docs/grafana/latest/features/dashboard/dashboards/ - - /docs/grafana/latest/dashboards/dashboard-ui/dashboard-row/ - - /docs/grafana/latest/features/dashboard/dashboards/ - - /docs/grafana/latest/dashboards/shortcuts/ - - /docs/grafana/latest/dashboards/search/ - - /docs/grafana/latest/reference/search/ - - /docs/grafana/latest/dashboards/use-dashboards/ -title: Use dashboards -menuTitle: Use dashboards -weight: 1 + - ../features/dashboard/dashboards/ + - ../reference/search/ + - dashboard-ui/ + - dashboard-ui/dashboard-header/ + - dashboard-ui/dashboard-row/ + - search/ + - shortcuts/ keywords: - dashboard - search - shortcuts +menuTitle: Use dashboards +title: Use dashboards +weight: 1 --- # Use dashboards diff --git a/docs/sources/dashboards/variables/_index.md b/docs/sources/dashboards/variables/_index.md index 466cb99cc1ef..aa9fbdd7d4e0 100644 --- a/docs/sources/dashboards/variables/_index.md +++ b/docs/sources/dashboards/variables/_index.md @@ -1,8 +1,8 @@ --- aliases: - - /docs/grafana/latest/variables/ - - /docs/grafana/latest/variables/variable-examples/ - - docs/grafana/latest/dashboards/variables/ + - ../variables/ + - ../variables/variable-examples/ + - ./ title: Variables weight: 130 --- @@ -47,7 +47,7 @@ Variables can be used in titles, descriptions, text panels, and queries. Queries The following dashboards in Grafana Play provide examples of template variables. -- [Elasticsearch Metrics](https://play.grafana.org/d/000000014/elasticsearch-metrics?orgId=1) - Uses ad hoc filters, global variables, and a custom variable. +- [Elasticsearch Metrics](https://play.grafana.org/d/z8OZC66nk/elasticsearch-8-2-0-sample-flight-data?orgId=1) - Uses ad hoc filters, global variables, and a custom variable. - [Graphite Templated Nested](https://play.grafana.org/d/000000056/graphite-templated-nested?orgId=1) - Uses query variables, chained query variables, an interval variable, and a repeated panel. - [Influx DB Group By Variable](https://play.grafana.org/d/000000137/influxdb-group-by-variable?orgId=1) - Query variable, panel uses the variable results to group the metric data. - [InfluxDB Raw Query Template Var](https://play.grafana.org/d/000000083/influxdb-raw-query-template-var?orgId=1) - Uses query variables, chained query variables, and an interval variable. diff --git a/docs/sources/dashboards/variables/add-template-variables/index.md b/docs/sources/dashboards/variables/add-template-variables/index.md index 3a4109796bfa..e56147fae604 100644 --- a/docs/sources/dashboards/variables/add-template-variables/index.md +++ b/docs/sources/dashboards/variables/add-template-variables/index.md @@ -1,34 +1,30 @@ --- aliases: - - /docs/grafana/latest/variables/variable-types/ - - /docs/grafana/latest/variables/add-query-variable/ - - /docs/grafana/latest/variables/variable-types/add-query-variable/ - - /docs/grafana/latest/variables/add-custom-variable/ - - /docs/grafana/latest/variables/variable-types/add-custom-variable/ - - /docs/grafana/latest/variables/add-text-box-variable/ - - /docs/grafana/latest/variables/variable-types/add-text-box-variable/ - - /docs/grafana/latest/variables/add-constant-variable/ - - /docs/grafana/latest/variables/variable-types/add-constant-variable/ - - /docs/grafana/latest/variables/add-data-source-variable/ - - /docs/grafana/latest/variables/variable-types/add-data-source-variable/ - - /docs/grafana/latest/variables/add-interval-variable/ - - /docs/grafana/latest/variables/variable-types/add-interval-variable/ - - /docs/grafana/latest/variables/add-ad-hoc-filters/ - - /docs/grafana/latest/variables/variable-types/add-ad-hoc-filters/ - - /docs/grafana/latest/variables/global-variables/ - - /docs/grafana/latest/variables/variable-types/global-variables/ - - /docs/grafana/latest/variables/chained-variables/ - - /docs/grafana/latest/variables/variable-types/chained-variables/ - - /docs/grafana/latest/variables/add-template-variables/ - - /docs/grafana/latest/variables/variable-selection-options/ - - /docs/grafana/latest/variables/filter-variables-with-regex/ - - /docs/grafana/latest/variables/formatting-multi-value-variables/ - - /docs/grafana/latest/reference/templating/ - - /docs/grafana/latest/variables/manage-variable/ - - /docs/grafana/latest/dashboards/variables/add-template-variables/ -title: Add and manage variables -menuTitle: Manage variables -weight: 100 + - ../../reference/templating/ + - ../../variables/add-ad-hoc-filters/ + - ../../variables/add-constant-variable/ + - ../../variables/add-custom-variable/ + - ../../variables/add-data-source-variable/ + - ../../variables/add-interval-variable/ + - ../../variables/add-query-variable/ + - ../../variables/add-template-variables/ + - ../../variables/add-text-box-variable/ + - ../../variables/chained-variables/ + - ../../variables/filter-variables-with-regex/ + - ../../variables/formatting-multi-value-variables/ + - ../../variables/global-variables/ + - ../../variables/manage-variable/ + - ../../variables/variable-selection-options/ + - ../../variables/variable-types/ + - ../../variables/variable-types/add-ad-hoc-filters/ + - ../../variables/variable-types/add-constant-variable/ + - ../../variables/variable-types/add-custom-variable/ + - ../../variables/variable-types/add-data-source-variable/ + - ../../variables/variable-types/add-interval-variable/ + - ../../variables/variable-types/add-query-variable/ + - ../../variables/variable-types/add-text-box-variable/ + - ../../variables/variable-types/chained-variables/ + - ../../variables/variable-types/global-variables/ keywords: - grafana - documentation @@ -39,6 +35,9 @@ keywords: - nested - chained - linked +menuTitle: Manage variables +title: Add and manage variables +weight: 100 --- # Add and manage variables diff --git a/docs/sources/dashboards/variables/inspect-variable/index.md b/docs/sources/dashboards/variables/inspect-variable/index.md index 8e3d0deda3e8..ca2174767bca 100644 --- a/docs/sources/dashboards/variables/inspect-variable/index.md +++ b/docs/sources/dashboards/variables/inspect-variable/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/reference/templating/ - - /docs/grafana/latest/variables/inspect-variable/ - - /docs/grafana/latest/dashboards/variables/inspect-variable/ + - ../../reference/templating/ + - ../../variables/inspect-variable/ keywords: - grafana - templating diff --git a/docs/sources/dashboards/variables/variable-syntax/index.md b/docs/sources/dashboards/variables/variable-syntax/index.md index 317b5bf3fb1f..24717a00f028 100644 --- a/docs/sources/dashboards/variables/variable-syntax/index.md +++ b/docs/sources/dashboards/variables/variable-syntax/index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/variables/advanced-variable-format-options/ - - /docs/grafana/latest/reference/templating/ - - /docs/grafana/latest/variables/syntax/ - - /docs/grafana/latest/dashboards/variables/variable-syntax/ + - ../../reference/templating/ + - ../../variables/advanced-variable-format-options/ + - ../../variables/syntax/ keywords: - grafana - templating diff --git a/docs/sources/datasources/_index.md b/docs/sources/datasources/_index.md index 5d61658713a9..372475e78431 100644 --- a/docs/sources/datasources/_index.md +++ b/docs/sources/datasources/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/ - - /docs/grafana/latest/datasources/overview/ + - overview/ title: Data sources weight: 60 --- diff --git a/docs/sources/datasources/add-a-data-source.md b/docs/sources/datasources/add-a-data-source.md index 997ee5e07d4c..2ae639404bb0 100644 --- a/docs/sources/datasources/add-a-data-source.md +++ b/docs/sources/datasources/add-a-data-source.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/add-a-data-source/ - - /docs/grafana/latest/features/datasources/add-a-data-source/ + - ../features/datasources/add-a-data-source/ title: Add data source weight: 100 --- diff --git a/docs/sources/datasources/alertmanager.md b/docs/sources/datasources/alertmanager.md index 9c8d279b3eeb..bcd7bd0e02a7 100644 --- a/docs/sources/datasources/alertmanager.md +++ b/docs/sources/datasources/alertmanager.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/alertmanager/ - - /docs/grafana/latest/features/datasources/alertmanager/ + - ../features/datasources/alertmanager/ description: Guide for using Alertmanager in Grafana keywords: - grafana diff --git a/docs/sources/datasources/aws-cloudwatch/_index.md b/docs/sources/datasources/aws-cloudwatch/_index.md index 6a93ca4598c1..e74866b514d3 100644 --- a/docs/sources/datasources/aws-cloudwatch/_index.md +++ b/docs/sources/datasources/aws-cloudwatch/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/aws-cloudwatch/ - - /docs/grafana/latest/datasources/cloudwatch/ + - cloudwatch/ description: Guide for using CloudWatch in Grafana keywords: - grafana diff --git a/docs/sources/datasources/aws-cloudwatch/aws-authentication.md b/docs/sources/datasources/aws-cloudwatch/aws-authentication.md index 91a6ee6ad676..199dea45749f 100644 --- a/docs/sources/datasources/aws-cloudwatch/aws-authentication.md +++ b/docs/sources/datasources/aws-cloudwatch/aws-authentication.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/aws-cloudwatch/aws-authentication/ - - /docs/grafana/latest/datasources/cloudwatch/ + - ../cloudwatch/ description: AWS authentication keywords: - grafana diff --git a/docs/sources/datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards.md b/docs/sources/datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards.md index a9c33f898221..a5beab63d16f 100644 --- a/docs/sources/datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards.md +++ b/docs/sources/datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/aws-cloudwatch/preconfig-cloudwatch-dashboards/ - - /docs/grafana/latest/datasources/cloudwatch/ + - ../cloudwatch/ description: Guide for using AWS CloudWatch in Grafana keywords: - grafana diff --git a/docs/sources/datasources/aws-cloudwatch/provision-cloudwatch.md b/docs/sources/datasources/aws-cloudwatch/provision-cloudwatch.md index a8736a852235..0eceb78052ee 100644 --- a/docs/sources/datasources/aws-cloudwatch/provision-cloudwatch.md +++ b/docs/sources/datasources/aws-cloudwatch/provision-cloudwatch.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/aws-cloudwatch/provision-cloudwatch/ - - /docs/grafana/latest/datasources/cloudwatch/ + - ../cloudwatch/ description: Guide for provisioning CloudWatch title: Provision CloudWatch weight: 400 diff --git a/docs/sources/datasources/aws-cloudwatch/template-queries-cloudwatch.md b/docs/sources/datasources/aws-cloudwatch/template-queries-cloudwatch.md index 2201754e2e57..63931be63f7e 100644 --- a/docs/sources/datasources/aws-cloudwatch/template-queries-cloudwatch.md +++ b/docs/sources/datasources/aws-cloudwatch/template-queries-cloudwatch.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/aws-cloudwatch/template-queries-cloudwatch/ - - /docs/grafana/latest/datasources/cloudwatch/ + - ../cloudwatch/ description: Template variables in CloudWatch queryh title: Template variables in CloudWatch query weight: 10 diff --git a/docs/sources/datasources/azuremonitor/_index.md b/docs/sources/datasources/azuremonitor/_index.md index 359676aa7597..0aee373a83c0 100644 --- a/docs/sources/datasources/azuremonitor/_index.md +++ b/docs/sources/datasources/azuremonitor/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/azuremonitor/ - - /docs/grafana/latest/features/datasources/azuremonitor/ + - ../features/datasources/azuremonitor/ description: Guide for using Azure Monitor in Grafana keywords: - grafana diff --git a/docs/sources/datasources/azuremonitor/deprecated-application-insights.md b/docs/sources/datasources/azuremonitor/deprecated-application-insights.md index f81ee4f8d89d..3acfe0736215 100644 --- a/docs/sources/datasources/azuremonitor/deprecated-application-insights.md +++ b/docs/sources/datasources/azuremonitor/deprecated-application-insights.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/datasources/azuremonitor/deprecated-application-insights/ description: Template to provision the Azure Monitor data source keywords: - grafana diff --git a/docs/sources/datasources/azuremonitor/provisioning.md b/docs/sources/datasources/azuremonitor/provisioning.md index 8ee6790b8ce2..4477590ab599 100644 --- a/docs/sources/datasources/azuremonitor/provisioning.md +++ b/docs/sources/datasources/azuremonitor/provisioning.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/datasources/azuremonitor/provisioning/ description: Template to provision the Azure Monitor data source keywords: - grafana diff --git a/docs/sources/datasources/azuremonitor/template-variables.md b/docs/sources/datasources/azuremonitor/template-variables.md index 7f1f1d8c9a8f..b6d16d19fb6d 100644 --- a/docs/sources/datasources/azuremonitor/template-variables.md +++ b/docs/sources/datasources/azuremonitor/template-variables.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/datasources/azuremonitor/template-variables/ description: Using template variables with Azure Monitor in Grafana keywords: - grafana diff --git a/docs/sources/datasources/datasource_permissions.md b/docs/sources/datasources/datasource_permissions.md index 38d135168a3a..c2f178472678 100644 --- a/docs/sources/datasources/datasource_permissions.md +++ b/docs/sources/datasources/datasource_permissions.md @@ -1,6 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/datasource_permissions/ + - ../enterprise/datasource_permissions/ - /docs/sources/permissions/datasource_permissions/ description: Grafana Datasource Permissions Guide keywords: diff --git a/docs/sources/datasources/elasticsearch.md b/docs/sources/datasources/elasticsearch.md index 883b100787e0..c64e41d7cbbd 100644 --- a/docs/sources/datasources/elasticsearch.md +++ b/docs/sources/datasources/elasticsearch.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/elasticsearch/ - - /docs/grafana/latest/features/datasources/elasticsearch/ + - ../features/datasources/elasticsearch/ description: Guide for using Elasticsearch in Grafana keywords: - grafana diff --git a/docs/sources/datasources/google-cloud-monitoring/_index.md b/docs/sources/datasources/google-cloud-monitoring/_index.md index 22f94ed56466..682364309f1d 100644 --- a/docs/sources/datasources/google-cloud-monitoring/_index.md +++ b/docs/sources/datasources/google-cloud-monitoring/_index.md @@ -1,8 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/google-cloud-monitoring/ - - /docs/grafana/latest/features/datasources/stackdriver/ - - /docs/grafana/next/datasources/cloudmonitoring/ + - ../features/datasources/stackdriver/ - /docs/grafana/next/features/datasources/cloudmonitoring/ description: Guide for using Google Cloud Monitoring in Grafana keywords: diff --git a/docs/sources/datasources/google-cloud-monitoring/google-authentication.md b/docs/sources/datasources/google-cloud-monitoring/google-authentication.md index 7829f8d0d32c..532407244bc2 100644 --- a/docs/sources/datasources/google-cloud-monitoring/google-authentication.md +++ b/docs/sources/datasources/google-cloud-monitoring/google-authentication.md @@ -1,7 +1,4 @@ --- -aliases: - - /docs/grafana/latest/datasources/google-cloud-monitoring/google-authentication/ - - /docs/grafana/next/datasources/cloudmonitoring/ description: Google authentication keywords: - grafana diff --git a/docs/sources/datasources/google-cloud-monitoring/preconfig-cloud-monitoring-dashboards.md b/docs/sources/datasources/google-cloud-monitoring/preconfig-cloud-monitoring-dashboards.md index 8222fbae20eb..73d86dbe42d6 100644 --- a/docs/sources/datasources/google-cloud-monitoring/preconfig-cloud-monitoring-dashboards.md +++ b/docs/sources/datasources/google-cloud-monitoring/preconfig-cloud-monitoring-dashboards.md @@ -1,8 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/google-cloud-monitoring/preconfig-cloud-monitoring-dashboards/ - - /docs/grafana/latest/features/datasources/stackdriver/ - - /docs/grafana/next/features/datasources/cloudmonitoring/ + - ../../features/datasources/stackdriver/ description: Guide for using Google Cloud Monitoring in Grafana keywords: - grafana diff --git a/docs/sources/datasources/graphite.md b/docs/sources/datasources/graphite.md index a3f56495b782..d956d8fe4a13 100644 --- a/docs/sources/datasources/graphite.md +++ b/docs/sources/datasources/graphite.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/graphite/ - - /docs/grafana/latest/features/datasources/graphite/ + - ../features/datasources/graphite/ description: Guide for using graphite in Grafana keywords: - grafana diff --git a/docs/sources/datasources/influxdb/_index.md b/docs/sources/datasources/influxdb/_index.md index 48764ade680e..4f8576a88bf3 100644 --- a/docs/sources/datasources/influxdb/_index.md +++ b/docs/sources/datasources/influxdb/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/influxdb/ - - /docs/grafana/latest/features/datasources/influxdb/ + - ../features/datasources/influxdb/ description: Guide for using InfluxDB in Grafana keywords: - grafana diff --git a/docs/sources/datasources/influxdb/influxdb-flux.md b/docs/sources/datasources/influxdb/influxdb-flux.md index 52ebc8711d87..a8556244c1be 100644 --- a/docs/sources/datasources/influxdb/influxdb-flux.md +++ b/docs/sources/datasources/influxdb/influxdb-flux.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/datasources/influxdb/influxdb-flux/ description: Guide for Flux in Grafana title: Flux support in Grafana weight: 200 diff --git a/docs/sources/datasources/influxdb/influxdb-templates.md b/docs/sources/datasources/influxdb/influxdb-templates.md index 646a05fd951f..79ce56c36132 100644 --- a/docs/sources/datasources/influxdb/influxdb-templates.md +++ b/docs/sources/datasources/influxdb/influxdb-templates.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/datasources/influxdb/influxdb-templates/ description: Guide for templates in InfluxDB title: InfluxDB templates weight: 300 diff --git a/docs/sources/datasources/influxdb/provision-influxdb.md b/docs/sources/datasources/influxdb/provision-influxdb.md index 6caece5f25c0..e4fac52db0cc 100644 --- a/docs/sources/datasources/influxdb/provision-influxdb.md +++ b/docs/sources/datasources/influxdb/provision-influxdb.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/datasources/influxdb/provision-influxdb/ description: Guide for provisioning InfluxDB title: Provision InfluxDB weight: 400 diff --git a/docs/sources/datasources/jaeger.md b/docs/sources/datasources/jaeger.md index 8c67c20fc4dd..680675aca6c8 100644 --- a/docs/sources/datasources/jaeger.md +++ b/docs/sources/datasources/jaeger.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/jaeger/ - - /docs/grafana/latest/features/datasources/jaeger/ + - ../features/datasources/jaeger/ description: Guide for using Jaeger in Grafana keywords: - grafana diff --git a/docs/sources/datasources/loki.md b/docs/sources/datasources/loki.md index 6b9c3c92c896..22cb28cca229 100644 --- a/docs/sources/datasources/loki.md +++ b/docs/sources/datasources/loki.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/loki/ - - /docs/grafana/latest/features/datasources/loki/ + - ../features/datasources/loki/ description: Guide for using Loki in Grafana keywords: - grafana diff --git a/docs/sources/datasources/mssql.md b/docs/sources/datasources/mssql.md index 952c83411c85..46228a499d74 100644 --- a/docs/sources/datasources/mssql.md +++ b/docs/sources/datasources/mssql.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/mssql/ - - /docs/grafana/latest/features/datasources/mssql/ + - ../features/datasources/mssql/ description: Guide for using Microsoft SQL Server in Grafana keywords: - grafana diff --git a/docs/sources/datasources/mysql.md b/docs/sources/datasources/mysql.md index 3cc731701422..f066ca3df321 100644 --- a/docs/sources/datasources/mysql.md +++ b/docs/sources/datasources/mysql.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/mysql/ - - /docs/grafana/latest/features/datasources/mysql/ + - ../features/datasources/mysql/ description: Guide for using MySQL in Grafana keywords: - grafana diff --git a/docs/sources/datasources/opentsdb.md b/docs/sources/datasources/opentsdb.md index a3b1b84ae3a9..82eae928bb14 100644 --- a/docs/sources/datasources/opentsdb.md +++ b/docs/sources/datasources/opentsdb.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/datasources/opentsdb/ - - /docs/grafana/latest/features/datasources/opentsdb/ - - /docs/grafana/latest/features/opentsdb/ + - ../features/datasources/opentsdb/ + - ../features/opentsdb/ description: Guide for using OpenTSDB in Grafana keywords: - grafana diff --git a/docs/sources/datasources/postgres.md b/docs/sources/datasources/postgres.md index 71c381761349..93e545efb379 100644 --- a/docs/sources/datasources/postgres.md +++ b/docs/sources/datasources/postgres.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/postgres/ - - /docs/grafana/latest/features/datasources/postgres/ + - ../features/datasources/postgres/ description: Guide for using PostgreSQL in Grafana keywords: - grafana diff --git a/docs/sources/datasources/prometheus.md b/docs/sources/datasources/prometheus.md index bc2a4295c048..50b7857b013d 100644 --- a/docs/sources/datasources/prometheus.md +++ b/docs/sources/datasources/prometheus.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/prometheus/ - - /docs/grafana/latest/features/datasources/prometheus/ + - ../features/datasources/prometheus/ description: Guide for using Prometheus in Grafana keywords: - grafana diff --git a/docs/sources/datasources/tempo.md b/docs/sources/datasources/tempo.md index 0960b24d5f63..143436b13d08 100644 --- a/docs/sources/datasources/tempo.md +++ b/docs/sources/datasources/tempo.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/tempo/ - - /docs/grafana/latest/features/datasources/tempo/ + - ../features/datasources/tempo/ description: High volume, minimal dependency trace storage. OSS tracing solution from Grafana Labs. keywords: diff --git a/docs/sources/datasources/testdata.md b/docs/sources/datasources/testdata.md index 75d8a7292d75..531b48458baf 100644 --- a/docs/sources/datasources/testdata.md +++ b/docs/sources/datasources/testdata.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/datasources/testdata/ - - /docs/grafana/latest/features/datasources/testdata/ + - ../features/datasources/testdata/ keywords: - grafana - dashboard diff --git a/docs/sources/datasources/zipkin.md b/docs/sources/datasources/zipkin.md index 48a543cf8cef..21572118d19b 100644 --- a/docs/sources/datasources/zipkin.md +++ b/docs/sources/datasources/zipkin.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/datasources/zipkin/ description: Guide for using Zipkin in Grafana keywords: - grafana diff --git a/docs/sources/developers/_index.md b/docs/sources/developers/_index.md index ef00f162ab53..30e0b30844cf 100644 --- a/docs/sources/developers/_index.md +++ b/docs/sources/developers/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/ - - /docs/grafana/latest/plugins/developing/ + - plugins/developing/ title: Developers weight: 190 --- diff --git a/docs/sources/developers/angular_deprecation.md b/docs/sources/developers/angular_deprecation.md index 1631198066de..8051888a8baf 100644 --- a/docs/sources/developers/angular_deprecation.md +++ b/docs/sources/developers/angular_deprecation.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/angular_deprecation/ keywords: - grafana - documentation diff --git a/docs/sources/developers/cla.md b/docs/sources/developers/cla.md index 74e309be858f..784ba0be3eaa 100644 --- a/docs/sources/developers/cla.md +++ b/docs/sources/developers/cla.md @@ -1,8 +1,7 @@ --- aliases: + - ../project/cla/ - /docs/contributing/cla.html/ - - /docs/grafana/latest/developers/cla/ - - /docs/grafana/latest/project/cla/ description: Contributor License Agreement (CLA) title: Contributor License Agreement (CLA) weight: 400 diff --git a/docs/sources/developers/contribute.md b/docs/sources/developers/contribute.md index 30463714a932..ec5e4ccbc60e 100644 --- a/docs/sources/developers/contribute.md +++ b/docs/sources/developers/contribute.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/contribute/ keywords: - grafana - documentation diff --git a/docs/sources/developers/http_api/_index.md b/docs/sources/developers/http_api/_index.md index ab0a79f5de4e..dbd021572c48 100644 --- a/docs/sources/developers/http_api/_index.md +++ b/docs/sources/developers/http_api/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/ - - /docs/grafana/latest/http_api/ - - /docs/grafana/latest/overview/ + - ../http_api/ + - ../overview/ description: Grafana HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/access_control.md b/docs/sources/developers/http_api/access_control.md index 20d9b6bec549..d7b50a955825 100644 --- a/docs/sources/developers/http_api/access_control.md +++ b/docs/sources/developers/http_api/access_control.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/access_control/ - - /docs/grafana/latest/http_api/access_control/ - - /docs/grafana/latest/http_api/accesscontrol/ + - ../../http_api/access_control/ + - ../../http_api/accesscontrol/ description: '' keywords: - grafana diff --git a/docs/sources/developers/http_api/admin.md b/docs/sources/developers/http_api/admin.md index f4e5d87b419a..7ab22fa00934 100644 --- a/docs/sources/developers/http_api/admin.md +++ b/docs/sources/developers/http_api/admin.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/admin/ - - /docs/grafana/latest/http_api/admin/ + - ../../http_api/admin/ description: Grafana Admin HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/alerting.md b/docs/sources/developers/http_api/alerting.md index 3022d35fd90c..47639d910289 100644 --- a/docs/sources/developers/http_api/alerting.md +++ b/docs/sources/developers/http_api/alerting.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/alerting/ - - /docs/grafana/latest/http_api/alerting/ + - ../../http_api/alerting/ description: Grafana Alerts HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/alerting_notification_channels.md b/docs/sources/developers/http_api/alerting_notification_channels.md index 8923309fefbc..f47266484894 100644 --- a/docs/sources/developers/http_api/alerting_notification_channels.md +++ b/docs/sources/developers/http_api/alerting_notification_channels.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/alerting_notification_channels/ - - /docs/grafana/latest/http_api/alerting_notification_channels/ + - ../../http_api/alerting_notification_channels/ description: Grafana Alerting Notification Channel HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/alerting_provisioning.md b/docs/sources/developers/http_api/alerting_provisioning.md index 1abcb73107f0..20ad641fab21 100644 --- a/docs/sources/developers/http_api/alerting_provisioning.md +++ b/docs/sources/developers/http_api/alerting_provisioning.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/alerting_provisioning/ - - /docs/grafana/latest/http_api/alerting_provisioning/ + - ../../http_api/alerting_provisioning/ description: Grafana Alerts HTTP API keywords: - grafana @@ -822,36 +821,36 @@ Status: Bad Request **Properties** -| Name | Type | Go type | Required | Default | Description | Example | -| --------------------------------------------------------- | ----------------------------------------- | ------------------- | :------: | ------- | -------------------------------------------------------------------------------------------------- | ------- | -| DatasourceUID | string | `string` | | | Grafana data source unique identifier; it should be '-100' for a Server Side Expression operation. | | -| Model | object | `interface{}` | | | JSON is the raw JSON query and includes the above properties as well as custom properties. | | -| QueryType | string | `string` | | | QueryType is an optional identifier for the type of query. | +| Name | Type | Go type | Required | Default | Description | Example | +| --------------------------------------------------------- | ----------------------------------------- | ------------------- | :------: | ------- | ------------------------------------------------------------------------------------------------------ | ------- | +| DatasourceUID | string | `string` | | | Grafana data source unique identifier; it should be '**expr**' for a Server Side Expression operation. | | +| Model | object | `interface{}` | | | JSON is the raw JSON query and includes the above properties as well as custom properties. | | +| QueryType | string | `string` | | | QueryType is an optional identifier for the type of query. | | It can be used to distinguish different types of queries. | | -| RefID | string | `string` | | | RefID is the unique identifier of the query, set by the frontend call. | | -| relativeTimeRange | [RelativeTimeRange](#relative-time-range) | `RelativeTimeRange` | | | | | +| RefID | string | `string` | | | RefID is the unique identifier of the query, set by the frontend call. | | +| relativeTimeRange | [RelativeTimeRange](#relative-time-range) | `RelativeTimeRange` | | | | | ### AlertRule **Properties** -| Name | Type | Go type | Required | Default | Description | Example | -| ------------ | ---------------------------- | ------------------- | :------: | ------- | ----------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| Annotations | map of string | `map[string]string` | | | | `{"runbook_url":"https://supercoolrunbook.com/page/13"}` | -| Condition | string | `string` | ✓ | | | `A` | -| Data | [][alertquery](#alert-query) | `[]*AlertQuery` | ✓ | | | `[{"datasourceUid":"-100","model":{"conditions":[{"evaluator":{"params":[0,0],"type":"gt"},"operator":{"type":"and"},"query":{"params":[]},"reducer":{"params":[],"type":"avg"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1 == 1","hide":false,"intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"},"queryType":"","refId":"A","relativeTimeRange":{"from":0,"to":0}}]` | -| ExecErrState | string | `string` | ✓ | | Allowed values: "OK", "Alerting", "Error" | | -| FolderUID | string | `string` | ✓ | | | `project_x` | -| ID | int64 (formatted integer) | `int64` | | | | | -| Labels | map of string | `map[string]string` | | | | `{"team":"sre-team-1"}` | -| NoDataState | string | `string` | ✓ | | Allowed values: "OK", "NoData", "Error" | | -| OrgID | int64 (formatted integer) | `int64` | ✓ | | | | -| RuleGroup | string | `string` | ✓ | | | `eval_group_1` | -| Title | string | `string` | ✓ | | | `Always firing` | -| UID | string | `string` | | | | | -| Updated | date-time (formatted string) | `strfmt.DateTime` | | | | | -| for | [Duration](#duration) | `Duration` | ✓ | | | | -| provenance | string | `Provenance` | | | | | +| Name | Type | Go type | Required | Default | Description | Example | +| ------------ | ---------------------------- | ------------------- | :------: | ------- | ----------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Annotations | map of string | `map[string]string` | | | | `{"runbook_url":"https://supercoolrunbook.com/page/13"}` | +| Condition | string | `string` | ✓ | | | `A` | +| Data | [][alertquery](#alert-query) | `[]*AlertQuery` | ✓ | | | `[{"datasourceUid":"__expr__","model":{"conditions":[{"evaluator":{"params":[0,0],"type":"gt"},"operator":{"type":"and"},"query":{"params":[]},"reducer":{"params":[],"type":"avg"},"type":"query"}],"datasource":{"type":"__expr__","uid":"__expr__"},"expression":"1 == 1","hide":false,"intervalMs":1000,"maxDataPoints":43200,"refId":"A","type":"math"},"queryType":"","refId":"A","relativeTimeRange":{"from":0,"to":0}}]` | +| ExecErrState | string | `string` | ✓ | | Allowed values: "OK", "Alerting", "Error" | | +| FolderUID | string | `string` | ✓ | | | `project_x` | +| ID | int64 (formatted integer) | `int64` | | | | | +| Labels | map of string | `map[string]string` | | | | `{"team":"sre-team-1"}` | +| NoDataState | string | `string` | ✓ | | Allowed values: "OK", "NoData", "Error" | | +| OrgID | int64 (formatted integer) | `int64` | ✓ | | | | +| RuleGroup | string | `string` | ✓ | | | `eval_group_1` | +| Title | string | `string` | ✓ | | | `Always firing` | +| UID | string | `string` | | | | | +| Updated | date-time (formatted string) | `strfmt.DateTime` | | | | | +| for | [Duration](#duration) | `Duration` | ✓ | | | | +| provenance | string | `Provenance` | | | | | ### AlertRuleGroup diff --git a/docs/sources/developers/http_api/annotations.md b/docs/sources/developers/http_api/annotations.md index a7314df79057..8c01d34ad051 100644 --- a/docs/sources/developers/http_api/annotations.md +++ b/docs/sources/developers/http_api/annotations.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/annotations/ - - /docs/grafana/latest/http_api/annotations/ + - ../../http_api/annotations/ description: Grafana Annotations HTTP API keywords: - grafana @@ -11,7 +10,7 @@ keywords: - annotation - annotations - comment -title: 'Annotations HTTP API' +title: Annotations HTTP API --- # Annotations API diff --git a/docs/sources/developers/http_api/auth.md b/docs/sources/developers/http_api/auth.md index 7576437375a6..6b60591ffc3a 100644 --- a/docs/sources/developers/http_api/auth.md +++ b/docs/sources/developers/http_api/auth.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/auth/ - - /docs/grafana/latest/http_api/auth/ - - /docs/grafana/latest/http_api/authentication/ + - ../../http_api/auth/ + - ../../http_api/authentication/ description: Grafana Authentication HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/correlations.md b/docs/sources/developers/http_api/correlations.md index 9d536b35916e..d751aff64808 100644 --- a/docs/sources/developers/http_api/correlations.md +++ b/docs/sources/developers/http_api/correlations.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/correlations/ - - /docs/grafana/latest/http_api/correlations/ + - ../../http_api/correlations/ description: Grafana Correlations HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/create-api-tokens-for-org.md b/docs/sources/developers/http_api/create-api-tokens-for-org.md index 1d35d51beb84..bc0849240026 100644 --- a/docs/sources/developers/http_api/create-api-tokens-for-org.md +++ b/docs/sources/developers/http_api/create-api-tokens-for-org.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/create-api-tokens-for-org/ - - /docs/grafana/latest/http_api/create-api-tokens-for-org/ - - /docs/grafana/latest/tutorials/api_org_token_howto/ + - ../../http_api/create-api-tokens-for-org/ + - ../../tutorials/api_org_token_howto/ keywords: - grafana - tutorials diff --git a/docs/sources/developers/http_api/curl-examples.md b/docs/sources/developers/http_api/curl-examples.md index effc8e683de2..c2312d4d9c6e 100644 --- a/docs/sources/developers/http_api/curl-examples.md +++ b/docs/sources/developers/http_api/curl-examples.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/curl-examples/ - - /docs/grafana/latest/http_api/curl-examples/ + - ../../http_api/curl-examples/ description: cURL examples keywords: - grafana diff --git a/docs/sources/developers/http_api/dashboard.md b/docs/sources/developers/http_api/dashboard.md index 9378202a15d5..d358bc05bc21 100644 --- a/docs/sources/developers/http_api/dashboard.md +++ b/docs/sources/developers/http_api/dashboard.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/dashboard/ - - /docs/grafana/latest/http_api/dashboard/ + - ../../http_api/dashboard/ description: Grafana Dashboard HTTP API keywords: - grafana @@ -9,7 +8,7 @@ keywords: - documentation - api - dashboard -title: 'Dashboard HTTP API' +title: Dashboard HTTP API --- # Dashboard API diff --git a/docs/sources/developers/http_api/dashboard_permissions.md b/docs/sources/developers/http_api/dashboard_permissions.md index 10ee24371fc9..16d3bee3bc55 100644 --- a/docs/sources/developers/http_api/dashboard_permissions.md +++ b/docs/sources/developers/http_api/dashboard_permissions.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/dashboard_permissions/ - - /docs/grafana/latest/http_api/dashboard_permissions/ - - /docs/grafana/latest/http_api/dashboardpermissions/ + - ../../http_api/dashboard_permissions/ + - ../../http_api/dashboardpermissions/ description: Grafana Dashboard Permissions HTTP API keywords: - grafana @@ -13,7 +12,7 @@ keywords: - permission - permissions - acl -title: 'Dashboard Permissions HTTP API' +title: Dashboard Permissions HTTP API --- # Dashboard Permissions API diff --git a/docs/sources/developers/http_api/dashboard_versions.md b/docs/sources/developers/http_api/dashboard_versions.md index cce543b1c59f..839adb7ad8e1 100644 --- a/docs/sources/developers/http_api/dashboard_versions.md +++ b/docs/sources/developers/http_api/dashboard_versions.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/dashboard_versions/ - - /docs/grafana/latest/http_api/dashboard_versions/ - - /docs/grafana/latest/http_api/dashboardversions/ + - ../../http_api/dashboard_versions/ + - ../../http_api/dashboardversions/ description: Grafana Dashboard Versions HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/data_source.md b/docs/sources/developers/http_api/data_source.md index ccc4fd05dd50..0fc17057145e 100644 --- a/docs/sources/developers/http_api/data_source.md +++ b/docs/sources/developers/http_api/data_source.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/data_source/ - - /docs/grafana/latest/http_api/data_source/ - - /docs/grafana/latest/http_api/datasource/ + - ../../http_api/data_source/ + - ../../http_api/datasource/ description: Grafana Data source HTTP API keywords: - grafana @@ -10,7 +9,7 @@ keywords: - documentation - api - data source -title: 'Data source HTTP API' +title: Data source HTTP API --- # Data source API diff --git a/docs/sources/developers/http_api/datasource_permissions.md b/docs/sources/developers/http_api/datasource_permissions.md index 1c6f72c01c24..e7714683d36b 100644 --- a/docs/sources/developers/http_api/datasource_permissions.md +++ b/docs/sources/developers/http_api/datasource_permissions.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/datasource_permissions/ - - /docs/grafana/latest/http_api/datasource_permissions/ - - /docs/grafana/latest/http_api/datasourcepermissions/ + - ../../http_api/datasource_permissions/ + - ../../http_api/datasourcepermissions/ description: Data Source Permissions API keywords: - grafana @@ -14,7 +13,7 @@ keywords: - permissions - acl - enterprise -title: 'Datasource Permissions HTTP API' +title: Datasource Permissions HTTP API --- # Data Source Permissions API diff --git a/docs/sources/developers/http_api/external_group_sync.md b/docs/sources/developers/http_api/external_group_sync.md index af0ef2f936f7..1506204d686d 100644 --- a/docs/sources/developers/http_api/external_group_sync.md +++ b/docs/sources/developers/http_api/external_group_sync.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/external_group_sync/ - - /docs/grafana/latest/http_api/external_group_sync/ + - ../../http_api/external_group_sync/ description: Grafana External Group Sync HTTP API keywords: - grafana @@ -13,7 +12,7 @@ keywords: - group - member - enterprise -title: 'External Group Sync HTTP API' +title: External Group Sync HTTP API --- # External Group Synchronization API diff --git a/docs/sources/developers/http_api/folder.md b/docs/sources/developers/http_api/folder.md index 9ad4d3701a73..1a2e245f06d9 100644 --- a/docs/sources/developers/http_api/folder.md +++ b/docs/sources/developers/http_api/folder.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/folder/ - - /docs/grafana/latest/http_api/folder/ + - ../../http_api/folder/ description: Grafana Folder HTTP API keywords: - grafana @@ -9,7 +8,7 @@ keywords: - documentation - api - folder -title: 'Folder HTTP API' +title: Folder HTTP API --- # Folder API diff --git a/docs/sources/developers/http_api/folder_dashboard_search.md b/docs/sources/developers/http_api/folder_dashboard_search.md index 935b99aa5879..774acd9b69d3 100644 --- a/docs/sources/developers/http_api/folder_dashboard_search.md +++ b/docs/sources/developers/http_api/folder_dashboard_search.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/folder_dashboard_search/ - - /docs/grafana/latest/http_api/folder_dashboard_search/ + - ../../http_api/folder_dashboard_search/ description: Grafana Folder/Dashboard Search HTTP API keywords: - grafana @@ -11,7 +10,7 @@ keywords: - search - folder - dashboard -title: 'Folder/Dashboard Search HTTP API' +title: Folder/Dashboard Search HTTP API --- # Folder/Dashboard Search API diff --git a/docs/sources/developers/http_api/folder_permissions.md b/docs/sources/developers/http_api/folder_permissions.md index 2657c27e56d7..725156f85be6 100644 --- a/docs/sources/developers/http_api/folder_permissions.md +++ b/docs/sources/developers/http_api/folder_permissions.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/folder_permissions/ - - /docs/grafana/latest/http_api/dashboardpermissions/ - - /docs/grafana/latest/http_api/folder_permissions/ + - ../../http_api/dashboardpermissions/ + - ../../http_api/folder_permissions/ description: Grafana Folder Permissions HTTP API keywords: - grafana @@ -13,7 +12,7 @@ keywords: - permission - permissions - acl -title: 'Folder Permissions HTTP API' +title: Folder Permissions HTTP API --- # Folder Permissions API diff --git a/docs/sources/developers/http_api/library_element.md b/docs/sources/developers/http_api/library_element.md index 71eae01aa296..e6ca9b01f3ac 100644 --- a/docs/sources/developers/http_api/library_element.md +++ b/docs/sources/developers/http_api/library_element.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/library_element/ - - /docs/grafana/latest/http_api/library_element/ + - ../../http_api/library_element/ description: Grafana Library Element HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/licensing.md b/docs/sources/developers/http_api/licensing.md index c0ae698b30dc..9fc05728e793 100644 --- a/docs/sources/developers/http_api/licensing.md +++ b/docs/sources/developers/http_api/licensing.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/licensing/ - - /docs/grafana/latest/http_api/licensing/ + - ../../http_api/licensing/ description: Enterprise Licensing HTTP API keywords: - grafana @@ -10,7 +9,7 @@ keywords: - api - licensing - enterprise -title: 'Licensing HTTP API' +title: Licensing HTTP API --- # Enterprise License API diff --git a/docs/sources/developers/http_api/org.md b/docs/sources/developers/http_api/org.md index f0e4e98cb8d9..267d200ed1f5 100644 --- a/docs/sources/developers/http_api/org.md +++ b/docs/sources/developers/http_api/org.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/org/ - - /docs/grafana/latest/http_api/org/ - - /docs/grafana/latest/http_api/organization/ + - ../../http_api/org/ + - ../../http_api/organization/ description: Grafana Organization HTTP API keywords: - grafana @@ -10,7 +9,7 @@ keywords: - documentation - api - organization -title: 'Organization HTTP API' +title: Organization HTTP API --- # Organization API diff --git a/docs/sources/developers/http_api/other.md b/docs/sources/developers/http_api/other.md index 7b7cda4c8ac6..bf6e9737e667 100644 --- a/docs/sources/developers/http_api/other.md +++ b/docs/sources/developers/http_api/other.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/other/ - - /docs/grafana/latest/http_api/other/ + - ../../http_api/other/ description: Grafana Other HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/playlist.md b/docs/sources/developers/http_api/playlist.md index 36ab50f672c9..1330f48211d6 100644 --- a/docs/sources/developers/http_api/playlist.md +++ b/docs/sources/developers/http_api/playlist.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/playlist/ - - /docs/grafana/latest/http_api/playlist/ + - ../../http_api/playlist/ description: Playlist Admin HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/preferences.md b/docs/sources/developers/http_api/preferences.md index ffc13320203c..9dfec19f582b 100644 --- a/docs/sources/developers/http_api/preferences.md +++ b/docs/sources/developers/http_api/preferences.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/preferences/ - - /docs/grafana/latest/http_api/preferences/ + - ../../http_api/preferences/ description: Grafana HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/query_history.md b/docs/sources/developers/http_api/query_history.md index 2f1dd8cb71fa..d15b965de191 100644 --- a/docs/sources/developers/http_api/query_history.md +++ b/docs/sources/developers/http_api/query_history.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/query_history/ - - /docs/grafana/latest/http_api/query_history/ + - ../../http_api/query_history/ description: Grafana Query History HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/reporting.md b/docs/sources/developers/http_api/reporting.md index ed67ad4ffb7d..e6e427d84684 100644 --- a/docs/sources/developers/http_api/reporting.md +++ b/docs/sources/developers/http_api/reporting.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/reporting/ - - /docs/grafana/latest/http_api/reporting/ + - ../../http_api/reporting/ description: Grafana Enterprise APIs keywords: - grafana diff --git a/docs/sources/developers/http_api/serviceaccount.md b/docs/sources/developers/http_api/serviceaccount.md index cad63bd8cc8e..395b744255aa 100644 --- a/docs/sources/developers/http_api/serviceaccount.md +++ b/docs/sources/developers/http_api/serviceaccount.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/serviceaccount/ - - /docs/grafana/latest/http_api/serviceaccount/ + - ../../http_api/serviceaccount/ description: Grafana service account HTTP API keywords: - grafana @@ -9,7 +8,7 @@ keywords: - documentation - api - serviceaccount -title: 'Service account HTTP API' +title: Service account HTTP API --- # Service account API diff --git a/docs/sources/developers/http_api/short_url.md b/docs/sources/developers/http_api/short_url.md index 72d680336150..5a096e04d442 100644 --- a/docs/sources/developers/http_api/short_url.md +++ b/docs/sources/developers/http_api/short_url.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/short_url/ - - /docs/grafana/latest/http_api/short_url/ + - ../../http_api/short_url/ description: Grafana Short URL HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/snapshot.md b/docs/sources/developers/http_api/snapshot.md index e8d479f89a18..82d9a85ca8b8 100644 --- a/docs/sources/developers/http_api/snapshot.md +++ b/docs/sources/developers/http_api/snapshot.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/snapshot/ - - /docs/grafana/latest/http_api/snapshot/ + - ../../http_api/snapshot/ description: Grafana HTTP API keywords: - grafana diff --git a/docs/sources/developers/http_api/team.md b/docs/sources/developers/http_api/team.md index e6418c426808..010f42a57308 100644 --- a/docs/sources/developers/http_api/team.md +++ b/docs/sources/developers/http_api/team.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/team/ - - /docs/grafana/latest/http_api/team/ + - ../../http_api/team/ description: Grafana Team HTTP API keywords: - grafana @@ -11,7 +10,7 @@ keywords: - team - teams - group -title: 'Team HTTP API' +title: Team HTTP API --- # Team API diff --git a/docs/sources/developers/http_api/user.md b/docs/sources/developers/http_api/user.md index 462ecfd3f9e1..6f0634648158 100644 --- a/docs/sources/developers/http_api/user.md +++ b/docs/sources/developers/http_api/user.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/http_api/user/ - - /docs/grafana/latest/http_api/user/ + - ../../http_api/user/ description: Grafana User HTTP API keywords: - grafana @@ -9,7 +8,7 @@ keywords: - documentation - api - user -title: 'User HTTP API' +title: User HTTP API --- # User API diff --git a/docs/sources/developers/plugins/_index.md b/docs/sources/developers/plugins/_index.md index 73133d7f11ff..5f64193cd42a 100644 --- a/docs/sources/developers/plugins/_index.md +++ b/docs/sources/developers/plugins/_index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/ - - /docs/grafana/latest/plugins/developing/ -title: Build a plugin + - ../plugins/developing/ description: Resources for creating Grafana plugins +title: Build a plugin weight: 200 --- diff --git a/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md b/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md index 66f9e7bc7bcc..e85629438592 100644 --- a/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md +++ b/docs/sources/developers/plugins/add-authentication-for-data-source-plugins.md @@ -1,8 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/add-authentication-for-data-source-plugins/ - - /docs/grafana/latest/plugins/developing/auth-for-datasources/ - - /docs/grafana/next/developers/plugins/authentication/ + - ../../plugins/developing/auth-for-datasources/ title: Add authentication for data source plugins --- diff --git a/docs/sources/developers/plugins/add-query-editor-help.md b/docs/sources/developers/plugins/add-query-editor-help.md index ea377ec46bb6..a86bbe3da829 100644 --- a/docs/sources/developers/plugins/add-query-editor-help.md +++ b/docs/sources/developers/plugins/add-query-editor-help.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/add-query-editor-help/ title: Add query editor help --- diff --git a/docs/sources/developers/plugins/add-support-for-annotations.md b/docs/sources/developers/plugins/add-support-for-annotations.md index 3753c3463ef7..154bd3a3d5c2 100644 --- a/docs/sources/developers/plugins/add-support-for-annotations.md +++ b/docs/sources/developers/plugins/add-support-for-annotations.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/add-support-for-annotations/ title: Add support for annotations --- diff --git a/docs/sources/developers/plugins/add-support-for-explore-queries.md b/docs/sources/developers/plugins/add-support-for-explore-queries.md index 26faad99fd29..d3d59ba54cd1 100644 --- a/docs/sources/developers/plugins/add-support-for-explore-queries.md +++ b/docs/sources/developers/plugins/add-support-for-explore-queries.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/add-support-for-explore-queries/ title: Add support for Explore queries --- diff --git a/docs/sources/developers/plugins/add-support-for-variables.md b/docs/sources/developers/plugins/add-support-for-variables.md index 1aa22e907b21..c8bc2a85358c 100644 --- a/docs/sources/developers/plugins/add-support-for-variables.md +++ b/docs/sources/developers/plugins/add-support-for-variables.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/add-support-for-variables/ title: Add support for variables in plugins --- diff --git a/docs/sources/developers/plugins/backend/_index.md b/docs/sources/developers/plugins/backend/_index.md index bbd197cb21c0..2b26497096dc 100644 --- a/docs/sources/developers/plugins/backend/_index.md +++ b/docs/sources/developers/plugins/backend/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/backend/ - - /docs/grafana/latest/plugins/developing/backend-plugins-guide/ + - ../../plugins/developing/backend-plugins-guide/ keywords: - grafana - plugins diff --git a/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md b/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md index 40c4b9aedac1..e5f8e043c77a 100644 --- a/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md +++ b/docs/sources/developers/plugins/backend/grafana-plugin-sdk-for-go.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/backend/grafana-plugin-sdk-for-go/ keywords: - grafana - plugins diff --git a/docs/sources/developers/plugins/backend/plugin-protocol.md b/docs/sources/developers/plugins/backend/plugin-protocol.md index ba22b3325314..24c2df85fa47 100644 --- a/docs/sources/developers/plugins/backend/plugin-protocol.md +++ b/docs/sources/developers/plugins/backend/plugin-protocol.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/backend/plugin-protocol/ keywords: - grafana - plugins diff --git a/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md b/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md index 76a2f97779b1..5c779425ebf3 100644 --- a/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md +++ b/docs/sources/developers/plugins/build-a-logs-data-source-plugin.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/build-a-logs-data-source-plugin/ title: Build a logs data source plugin --- diff --git a/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md b/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md index 6d805746ed3d..c49f936a5d54 100644 --- a/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md +++ b/docs/sources/developers/plugins/build-a-streaming-data-source-plugin.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/build-a-streaming-data-source-plugin/ title: Build a streaming data source plugin --- diff --git a/docs/sources/developers/plugins/custom-panel-option-editors.md b/docs/sources/developers/plugins/custom-panel-option-editors.md index d9cbcf20a5fe..d943c6deb70a 100644 --- a/docs/sources/developers/plugins/custom-panel-option-editors.md +++ b/docs/sources/developers/plugins/custom-panel-option-editors.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/custom-panel-option-editors/ title: Custom panel option editors --- diff --git a/docs/sources/developers/plugins/data-frames.md b/docs/sources/developers/plugins/data-frames.md index ceaed7b90c4b..62cd731793a8 100644 --- a/docs/sources/developers/plugins/data-frames.md +++ b/docs/sources/developers/plugins/data-frames.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/data-frames/ title: Data frames --- diff --git a/docs/sources/developers/plugins/development-with-local-grafana.md b/docs/sources/developers/plugins/development-with-local-grafana.md index 1d15d3333171..a222ca091f3f 100644 --- a/docs/sources/developers/plugins/development-with-local-grafana.md +++ b/docs/sources/developers/plugins/development-with-local-grafana.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/development-with-local-grafana/ title: Development with local Grafana --- diff --git a/docs/sources/developers/plugins/error-handling.md b/docs/sources/developers/plugins/error-handling.md index bfc1b8e1331d..a7535cdc74dd 100644 --- a/docs/sources/developers/plugins/error-handling.md +++ b/docs/sources/developers/plugins/error-handling.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/error-handling/ title: Error handling --- diff --git a/docs/sources/developers/plugins/legacy/_index.md b/docs/sources/developers/plugins/legacy/_index.md index 549d96311939..94214272ce6e 100644 --- a/docs/sources/developers/plugins/legacy/_index.md +++ b/docs/sources/developers/plugins/legacy/_index.md @@ -1,8 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/legacy/ - - /docs/grafana/latest/plugins/development/ - - /docs/grafana/next/plugins/apps/ + - ../../plugins/development/ - /docs/grafana/next/plugins/datasources/ - /docs/grafana/next/plugins/developing/development/ - /docs/grafana/next/plugins/panels/ diff --git a/docs/sources/developers/plugins/legacy/apps.md b/docs/sources/developers/plugins/legacy/apps.md index 9a43032325bd..369003129126 100644 --- a/docs/sources/developers/plugins/legacy/apps.md +++ b/docs/sources/developers/plugins/legacy/apps.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/legacy/apps/ - - /docs/grafana/latest/plugins/developing/apps/ + - ../../../plugins/developing/apps/ keywords: - grafana - plugins diff --git a/docs/sources/developers/plugins/legacy/data-sources.md b/docs/sources/developers/plugins/legacy/data-sources.md index a3116f4ee0e7..c4e27ef7f0a5 100644 --- a/docs/sources/developers/plugins/legacy/data-sources.md +++ b/docs/sources/developers/plugins/legacy/data-sources.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/legacy/data-sources/ - - /docs/grafana/latest/plugins/developing/datasources/ + - ../../../plugins/developing/datasources/ keywords: - grafana - plugins diff --git a/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md b/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md index c686938978da..b1634470b37f 100644 --- a/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md +++ b/docs/sources/developers/plugins/legacy/defaults-and-editor-mode.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/legacy/defaults-and-editor-mode/ - - /docs/grafana/latest/plugins/developing/defaults-and-editor-mode/ + - ../../../plugins/developing/defaults-and-editor-mode/ title: Legacy defaults and editor mode --- diff --git a/docs/sources/developers/plugins/legacy/panels.md b/docs/sources/developers/plugins/legacy/panels.md index 9ffd453586ed..4149bb2fe257 100644 --- a/docs/sources/developers/plugins/legacy/panels.md +++ b/docs/sources/developers/plugins/legacy/panels.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/legacy/panels/ - - /docs/grafana/latest/plugins/developing/panels/ + - ../../../plugins/developing/panels/ keywords: - grafana - plugins diff --git a/docs/sources/developers/plugins/legacy/review-guidelines.md b/docs/sources/developers/plugins/legacy/review-guidelines.md index cc01f1934345..dedc5793ea33 100644 --- a/docs/sources/developers/plugins/legacy/review-guidelines.md +++ b/docs/sources/developers/plugins/legacy/review-guidelines.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/legacy/review-guidelines/ - - /docs/grafana/latest/plugins/developing/plugin-review-guidelines/ + - ../../../plugins/developing/plugin-review-guidelines/ title: Legacy review guidelines --- diff --git a/docs/sources/developers/plugins/legacy/snapshot-mode.md b/docs/sources/developers/plugins/legacy/snapshot-mode.md index f8a894bda009..510b9bc4c03e 100644 --- a/docs/sources/developers/plugins/legacy/snapshot-mode.md +++ b/docs/sources/developers/plugins/legacy/snapshot-mode.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/legacy/snapshot-mode/ - - /docs/grafana/latest/plugins/developing/snapshot-mode/ + - ../../../plugins/developing/snapshot-mode/ title: Legacy snapshot mode --- diff --git a/docs/sources/developers/plugins/legacy/style-guide.md b/docs/sources/developers/plugins/legacy/style-guide.md index 2c41880a0c58..590f54871537 100644 --- a/docs/sources/developers/plugins/legacy/style-guide.md +++ b/docs/sources/developers/plugins/legacy/style-guide.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/legacy/style-guide/ - - /docs/grafana/latest/plugins/developing/code-styleguide/ + - ../../../plugins/developing/code-styleguide/ title: Legacy code style guide --- diff --git a/docs/sources/developers/plugins/metadata.md b/docs/sources/developers/plugins/metadata.md index 9de5660286d7..787ebfc168f7 100644 --- a/docs/sources/developers/plugins/metadata.md +++ b/docs/sources/developers/plugins/metadata.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/metadata/ - - /docs/grafana/latest/plugins/developing/plugin.json/ + - ../../plugins/developing/plugin.json/ keywords: - grafana - plugins diff --git a/docs/sources/developers/plugins/migration-guide.md b/docs/sources/developers/plugins/migration-guide.md index 4de4d7128819..e657e366d315 100644 --- a/docs/sources/developers/plugins/migration-guide.md +++ b/docs/sources/developers/plugins/migration-guide.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/migration-guide/ title: Plugin migration guide --- diff --git a/docs/sources/developers/plugins/package-a-plugin.md b/docs/sources/developers/plugins/package-a-plugin.md index 7569040074f0..40b13c6d280a 100644 --- a/docs/sources/developers/plugins/package-a-plugin.md +++ b/docs/sources/developers/plugins/package-a-plugin.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/developers/plugins/package-a-plugin/ - - /docs/grafana/latest/developers/plugins/share-a-plugin/ + - share-a-plugin/ title: Package a plugin type: docs --- @@ -99,9 +98,29 @@ To speed up the time it takes to review your plugin: - We're not able to give an estimate at this time, though we're constantly working on improving the time it takes to review a plugin. +**Can I see metrics of my plugin installs, downloads or usage?** + +- No. We don't offer this information at the moment to plugin authors. + +**How can I update my plugin's catalog page?** + +- The plugin's catalog page content is extracted from the plugin README file. To update the plugin's catalog page, it is necessary to submit an updated plugin with the new content included in the README file. + +**Can I unlist my plugin from the Grafana Plugin's Catalog in case of a bug?** + +- In the event of a bug, unlisting the plugin from the Grafana Plugin's Catalog may be possible in exceptional cases, such as security concerns. However, we do not have control over the specific instances where the plugin is installed. + +**Can I distribute my plugin somewhere else than the Grafana Catalog?** + +- The official method for distributing Grafana plugins is through the Grafana Catalog. Alternative methods, such as installing private or development plugins on local Grafana instances, are available as per the guidelines provided in [this guide](https://grafana.com/docs/grafana/latest/administration/plugin-management/#install-plugin-on-local-grafana). + ## Publishing your plugin for the first time -{{< figure src="/static/img/docs/plugins/plugins-submission-create.png" class="docs-image--no-shadow" max-width="850px" >}} +**Do plugin signatures expire?** + +- Plugin signatures do not currently expire. + +{{< figure src="/static/img/docs/plugins/plugins-submission-create2.png" class="docs-image--no-shadow" max-width="650px" >}} 1. [Sign in](https://grafana.com/auth/sign-in) to your Grafana Cloud account. 1. In the left menu, under **Org settings**, click **My Plugins**. @@ -111,6 +130,7 @@ To speed up the time it takes to review your plugin: - Select **Single** if your plugin archive contains binaries for multiple architectures. - Select **Multiple** if you'd like to submit separate plugin archives for each architecture. This can lead to faster downloads since users can select the specific architecture on which they want to install the plugin. - **URL:** A URL that points to a ZIP archive of your packaged plugin. + - **Source Code URL:** A URL that points to a public git repository or ZIP archive of your complete plugin source code. - **MD5:** The MD5 hash of the plugin specified by the **URL**. - The remaining questions help us determine the [signature level](https://grafana.com/docs/grafana/latest/plugins/plugin-signatures/#plugin-signature-levels) for your plugin. 1. Click **Submit**. @@ -133,5 +153,6 @@ To submit an **update** for an already published plugin: - Select **Single** if your plugin archive contains binaries for multiple architectures. - Select **Multiple** if you'd like to submit separate plugin archives for each architecture. This can lead to faster downloads since users can select the specific architecture they want to install the plugin on. - **URL:** A URL that points to a ZIP archive of your packaged plugin. + - **Source Code URL:** A URL that points to a public git repository or ZIP archive of your complete plugin source code. - **MD5:** The MD5 hash of the plugin specified by the **URL**. 1. Click **Submit**. diff --git a/docs/sources/developers/plugins/publishing-and-signing-criteria.md b/docs/sources/developers/plugins/publishing-and-signing-criteria.md index 8e85d43abc2d..948ce45d10f9 100644 --- a/docs/sources/developers/plugins/publishing-and-signing-criteria.md +++ b/docs/sources/developers/plugins/publishing-and-signing-criteria.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/publishing-and-signing-criteria/ title: Plugin publishing and signing criteria --- diff --git a/docs/sources/developers/plugins/sign-a-plugin.md b/docs/sources/developers/plugins/sign-a-plugin.md index 89ece6e5c669..99bc0e5f78b2 100644 --- a/docs/sources/developers/plugins/sign-a-plugin.md +++ b/docs/sources/developers/plugins/sign-a-plugin.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/sign-a-plugin/ title: Sign a plugin --- diff --git a/docs/sources/developers/plugins/working-with-data-frames.md b/docs/sources/developers/plugins/working-with-data-frames.md index be7074a17a00..3de739f1abf6 100644 --- a/docs/sources/developers/plugins/working-with-data-frames.md +++ b/docs/sources/developers/plugins/working-with-data-frames.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/developers/plugins/working-with-data-frames/ title: Working with data frames --- diff --git a/docs/sources/enterprise/_index.md b/docs/sources/enterprise/_index.md index 533bb38f0a85..3a2fcfb018b7 100644 --- a/docs/sources/enterprise/_index.md +++ b/docs/sources/enterprise/_index.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/enterprise/ description: Grafana Enterprise overview keywords: - grafana diff --git a/docs/sources/explore/_index.md b/docs/sources/explore/_index.md index 013e01db4c20..eea1d1fd5a1d 100644 --- a/docs/sources/explore/_index.md +++ b/docs/sources/explore/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/explore/ - - /docs/grafana/latest/features/explore/ + - features/explore/ keywords: - explore - loki diff --git a/docs/sources/explore/explore-inspector.md b/docs/sources/explore/explore-inspector.md index 2a19daab3e60..c0d57bc5e4f5 100644 --- a/docs/sources/explore/explore-inspector.md +++ b/docs/sources/explore/explore-inspector.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/explore/explore-inspector/ title: Inspector in Explore weight: 400 --- diff --git a/docs/sources/explore/logs-integration.md b/docs/sources/explore/logs-integration.md index 59d8b6bda81a..5e5b90d8656d 100644 --- a/docs/sources/explore/logs-integration.md +++ b/docs/sources/explore/logs-integration.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/explore/logs-integration/ description: Logs in Explore keywords: - explore diff --git a/docs/sources/explore/query-management.md b/docs/sources/explore/query-management.md index 6834511cf51d..5a482667cea7 100644 --- a/docs/sources/explore/query-management.md +++ b/docs/sources/explore/query-management.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/explore/query-management/ keywords: - explore - loki diff --git a/docs/sources/explore/trace-integration.md b/docs/sources/explore/trace-integration.md index b20106944cab..e5e624bf3e90 100644 --- a/docs/sources/explore/trace-integration.md +++ b/docs/sources/explore/trace-integration.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/explore/trace-integration/ description: Tracing in Explore keywords: - explore diff --git a/docs/sources/fundamentals/_index.md b/docs/sources/fundamentals/_index.md index 6637aa7cbd7a..82adaa25c942 100644 --- a/docs/sources/fundamentals/_index.md +++ b/docs/sources/fundamentals/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/basics/ - - /docs/grafana/latest/fundamentals/ + - basics/ title: Fundamentals weight: 8 --- diff --git a/docs/sources/fundamentals/exemplars/index.md b/docs/sources/fundamentals/exemplars/index.md index 55615d346652..4e4d89ece5e4 100644 --- a/docs/sources/fundamentals/exemplars/index.md +++ b/docs/sources/fundamentals/exemplars/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/basics/exemplars/ - - /docs/grafana/latest/basics/exemplars/view-exemplars/ - - /docs/grafana/latest/fundamentals/exemplars/ + - ../basics/exemplars/ + - ../basics/exemplars/view-exemplars/ description: Exemplars keywords: - grafana diff --git a/docs/sources/fundamentals/glossary/index.md b/docs/sources/fundamentals/glossary/index.md index f7192b86aea9..4e9abbe60e03 100644 --- a/docs/sources/fundamentals/glossary/index.md +++ b/docs/sources/fundamentals/glossary/index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/basics/glossary/ - - /docs/grafana/latest/getting-started/glossary/ - - /docs/grafana/latest/guides/glossary/ - - /docs/grafana/latest/fundamentals/glossary/ + - ../basics/glossary/ + - ../getting-started/glossary/ + - ../guides/glossary/ description: Grafana glossary keywords: - grafana diff --git a/docs/sources/fundamentals/intro-histograms/index.md b/docs/sources/fundamentals/intro-histograms/index.md index 0164a439bb51..45702355f7bd 100644 --- a/docs/sources/fundamentals/intro-histograms/index.md +++ b/docs/sources/fundamentals/intro-histograms/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/basics/intro-histograms/ - - /docs/grafana/latest/getting-started/intro-histograms/ - - /docs/grafana/latest/fundamentals/intro-histograms/ + - ../basics/intro-histograms/ + - ../getting-started/intro-histograms/ description: An introduction to histograms and heatmaps keywords: - grafana diff --git a/docs/sources/fundamentals/timeseries-dimensions/index.md b/docs/sources/fundamentals/timeseries-dimensions/index.md index 2eb878687e37..88c1281688bf 100644 --- a/docs/sources/fundamentals/timeseries-dimensions/index.md +++ b/docs/sources/fundamentals/timeseries-dimensions/index.md @@ -1,8 +1,8 @@ --- aliases: - - /docs/grafana/latest/basics/timeseries-dimensions/ - - /docs/grafana/latest/getting-started/timeseries-dimensions/ - - /docs/grafana/latest/guides/timeseries-dimensions/ + - ../basics/timeseries-dimensions/ + - ../getting-started/timeseries-dimensions/ + - ../guides/timeseries-dimensions/ - /docs/rafana/latest/fundamentals/timeseries-dimensions/ description: time series dimensions keywords: diff --git a/docs/sources/fundamentals/timeseries/index.md b/docs/sources/fundamentals/timeseries/index.md index 56cedfd48a4a..6e8bca9a6cdd 100644 --- a/docs/sources/fundamentals/timeseries/index.md +++ b/docs/sources/fundamentals/timeseries/index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/basics/timeseries/ - - /docs/grafana/latest/fundamentals/timeseries/ + - ../basics/timeseries/ description: Introduction to time series keywords: - grafana diff --git a/docs/sources/getting-started/_index.md b/docs/sources/getting-started/_index.md index 9b887f3adea6..49a09177d3da 100644 --- a/docs/sources/getting-started/_index.md +++ b/docs/sources/getting-started/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/getting-started/ - - /docs/grafana/latest/guides/what-is-grafana/ + - guides/what-is-grafana/ title: Get started weight: 9 --- diff --git a/docs/sources/getting-started/build-first-dashboard.md b/docs/sources/getting-started/build-first-dashboard.md index 3fdfc22592f2..bbce05a83663 100644 --- a/docs/sources/getting-started/build-first-dashboard.md +++ b/docs/sources/getting-started/build-first-dashboard.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/getting-started/build-first-dashboard/ - - /docs/grafana/latest/getting-started/getting-started/ - - /docs/grafana/latest/guides/getting_started/ - - /docs/grafana/latest/guides/gettingstarted/ + - ../guides/getting_started/ + - ../guides/gettingstarted/ + - getting-started/ description: Learn how to get started with Grafana by adding a preconfigured dashboard. title: Build your first dashboard weight: 200 diff --git a/docs/sources/getting-started/get-started-grafana-influxdb.md b/docs/sources/getting-started/get-started-grafana-influxdb.md index 2e127a3da76e..f5627e02d665 100644 --- a/docs/sources/getting-started/get-started-grafana-influxdb.md +++ b/docs/sources/getting-started/get-started-grafana-influxdb.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/getting-started/get-started-grafana-influxdb/ - - /docs/grafana/latest/getting-started/getting-started-influxdb/ + - getting-started-influxdb/ description: Learn how to build your first InfluxDB dashboard in Grafana. title: Get started with Grafana and InfluxDB weight: 400 diff --git a/docs/sources/getting-started/get-started-grafana-ms-sql-server.md b/docs/sources/getting-started/get-started-grafana-ms-sql-server.md index 928b6588016c..a0f70abc4478 100644 --- a/docs/sources/getting-started/get-started-grafana-ms-sql-server.md +++ b/docs/sources/getting-started/get-started-grafana-ms-sql-server.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/getting-started/get-started-grafana-ms-sql-server/ - - /docs/grafana/latest/getting-started/getting-started-sql/ - - /docs/grafana/latest/guides/getting_started/ - - /docs/grafana/latest/guides/gettingstarted/ + - ../guides/getting_started/ + - ../guides/gettingstarted/ + - getting-started-sql/ description: Learn how to build your first MS SQL Server dashboard in Grafana. title: Get started with Grafana and MS SQL Server weight: 500 diff --git a/docs/sources/getting-started/get-started-grafana-prometheus.md b/docs/sources/getting-started/get-started-grafana-prometheus.md index 15b7849f9471..88a3960c03e9 100644 --- a/docs/sources/getting-started/get-started-grafana-prometheus.md +++ b/docs/sources/getting-started/get-started-grafana-prometheus.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/getting-started/get-started-grafana-prometheus/ - - /docs/grafana/latest/getting-started/getting-started-prometheus/ - - /docs/grafana/latest/guides/getting_started/ - - /docs/grafana/latest/guides/gettingstarted/ + - ../guides/getting_started/ + - ../guides/gettingstarted/ + - getting-started-prometheus/ description: Learn how to build your first Prometheus dashboard in Grafana. title: Get started with Grafana and Prometheus weight: 300 diff --git a/docs/sources/introduction/_index.md b/docs/sources/introduction/_index.md index d920997a9e94..351d24840fa1 100644 --- a/docs/sources/introduction/_index.md +++ b/docs/sources/introduction/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/guides/what-is-grafana/ - - /docs/grafana/latest/introduction/ - - /docs/grafana/latest/introduction/oss-details/ + - guides/what-is-grafana/ + - oss-details/ title: Introduction to Grafana weight: 5 --- diff --git a/docs/sources/introduction/grafana-cloud.md b/docs/sources/introduction/grafana-cloud.md index fae75e88c138..89248339e7fb 100644 --- a/docs/sources/introduction/grafana-cloud.md +++ b/docs/sources/introduction/grafana-cloud.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/introduction/grafana-cloud/ title: Grafana Cloud weight: 300 --- diff --git a/docs/sources/introduction/grafana-enterprise.md b/docs/sources/introduction/grafana-enterprise.md index a78c163c59af..2b5ab3642614 100644 --- a/docs/sources/introduction/grafana-enterprise.md +++ b/docs/sources/introduction/grafana-enterprise.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/ - - /docs/grafana/latest/introduction/grafana-enterprise/ + - ../enterprise/ description: Grafana Enterprise overview title: Grafana Enterprise weight: 200 @@ -61,7 +60,7 @@ Grafana Enterprise adds the following features: - [Custom branding]({{< relref "../setup-grafana/configure-grafana/configure-custom-branding/" >}}) to customize Grafana from the brand and logo to the footer links. - [Usage insights]({{< relref "../dashboards/assess-dashboard-usage/" >}}) to understand how your Grafana instance is used. - [Recorded queries]({{< relref "../administration/recorded-queries" >}}) to see trends over time for your data sources. -- [Vault integration]({{< relref "../setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/" >}}) to manage your configuration or provisioning secrets with Vault. +- [Vault integration]({{< relref "../setup-grafana/configure-security/configure-database-encryption/#encrypting-your-database-with-a-key-from-a-key-management-service-kms" >}}) to manage your configuration or provisioning secrets with Vault. - [Auditing]({{< relref "../setup-grafana/configure-security/audit-grafana/" >}}) tracks important changes to your Grafana instance to help you manage and mitigate suspicious activity and meet compliance requirements. - [Request security]({{< relref "../setup-grafana/configure-security/configure-request-security/" >}}) makes it possible to restrict outgoing requests from the Grafana server. - [Settings updates at runtime]({{< relref "../setup-grafana/configure-grafana/settings-updates-at-runtime" >}}) allows you to update Grafana settings at runtime without requiring a restart. diff --git a/docs/sources/old-alerting/_index.md b/docs/sources/old-alerting/_index.md index a4183e9c8848..3b7ef1d714fc 100644 --- a/docs/sources/old-alerting/_index.md +++ b/docs/sources/old-alerting/_index.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/old-alerting/ draft: true title: Legacy Grafana Alerts weight: 114 diff --git a/docs/sources/old-alerting/add-notification-template.md b/docs/sources/old-alerting/add-notification-template.md index fdbf5369096c..a10d95a2013f 100644 --- a/docs/sources/old-alerting/add-notification-template.md +++ b/docs/sources/old-alerting/add-notification-template.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/add-notification-template/ - - /docs/grafana/latest/old-alerting/add-notification-template/ + - ../alerting/add-notification-template/ draft: true keywords: - grafana diff --git a/docs/sources/old-alerting/create-alerts.md b/docs/sources/old-alerting/create-alerts.md index 2ad8eb027a72..5467adb652c2 100644 --- a/docs/sources/old-alerting/create-alerts.md +++ b/docs/sources/old-alerting/create-alerts.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/create-alerts/ - - /docs/grafana/latest/old-alerting/create-alerts/ + - ../alerting/create-alerts/ description: Configure alert rules draft: true keywords: diff --git a/docs/sources/old-alerting/notifications.md b/docs/sources/old-alerting/notifications.md index d50111659907..2162eb26a864 100644 --- a/docs/sources/old-alerting/notifications.md +++ b/docs/sources/old-alerting/notifications.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/notifications/ - - /docs/grafana/latest/old-alerting/notifications/ + - ../alerting/notifications/ description: Alerting notifications guide draft: true keywords: diff --git a/docs/sources/old-alerting/pause-an-alert-rule.md b/docs/sources/old-alerting/pause-an-alert-rule.md index db049f98ba50..8827a5268c7b 100644 --- a/docs/sources/old-alerting/pause-an-alert-rule.md +++ b/docs/sources/old-alerting/pause-an-alert-rule.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/pause-an-alert-rule/ - - /docs/grafana/latest/old-alerting/pause-an-alert-rule/ + - ../alerting/pause-an-alert-rule/ description: Pause an existing alert rule draft: true keywords: diff --git a/docs/sources/old-alerting/troubleshoot-alerts.md b/docs/sources/old-alerting/troubleshoot-alerts.md index 719f6aac8813..7c8a260be9e0 100644 --- a/docs/sources/old-alerting/troubleshoot-alerts.md +++ b/docs/sources/old-alerting/troubleshoot-alerts.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/troubleshoot-alerts/ - - /docs/grafana/latest/old-alerting/troubleshoot-alerts/ + - ../alerting/troubleshoot-alerts/ description: Troubleshoot alert rules draft: true keywords: diff --git a/docs/sources/old-alerting/view-alerts.md b/docs/sources/old-alerting/view-alerts.md index f5e678d45d8e..2ec85c7bdee9 100644 --- a/docs/sources/old-alerting/view-alerts.md +++ b/docs/sources/old-alerting/view-alerts.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/alerting/view-alerts/ - - /docs/grafana/latest/old-alerting/view-alerts/ + - ../alerting/view-alerts/ description: View existing alert rules draft: true keywords: diff --git a/docs/sources/panels-visualizations/_index.md b/docs/sources/panels-visualizations/_index.md index a0796a1fe3df..adbea21bdea1 100644 --- a/docs/sources/panels-visualizations/_index.md +++ b/docs/sources/panels-visualizations/_index.md @@ -1,17 +1,16 @@ --- aliases: - - /docs/grafana/latest/dashboards/configure-panels-visualizations/ - - /docs/grafana/latest/panels-visualizations/ - - /docs/grafana/latest/features/panels/panels/ - - /docs/grafana/latest/panels/ -title: Panels and visualizations -menuTitle: Panels and visualizations -weight: 80 + - dashboards/configure-panels-visualizations/ + - features/panels/panels/ + - panels/ keywords: - grafana - configure - panels - visualizations +menuTitle: Panels and visualizations +title: Panels and visualizations +weight: 80 --- # Panels and visualizations diff --git a/docs/sources/panels-visualizations/calculation-types/index.md b/docs/sources/panels-visualizations/calculation-types/index.md index 4478c7aa9e10..2ae471469bf9 100644 --- a/docs/sources/panels-visualizations/calculation-types/index.md +++ b/docs/sources/panels-visualizations/calculation-types/index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/panels/calculation-types/ - - /docs/grafana/latest/panels/calculations-list/ - - /docs/grafana/latest/panels/reference-calculation-types/ - - /docs/grafana/latest/panels-visualizations/calculation-types/ + - ../panels/calculation-types/ + - ../panels/calculations-list/ + - ../panels/reference-calculation-types/ title: Calculation types weight: 1100 --- diff --git a/docs/sources/panels-visualizations/configure-data-links/index.md b/docs/sources/panels-visualizations/configure-data-links/index.md index 270e06802559..f2ca546bd7ce 100644 --- a/docs/sources/panels-visualizations/configure-data-links/index.md +++ b/docs/sources/panels-visualizations/configure-data-links/index.md @@ -1,12 +1,11 @@ --- aliases: - - /docs/grafana/latest/linking/data-link-variables/ - - /docs/grafana/latest/variables/url-variables/ - - /docs/grafana/latest/variables/variable-types/url-variables/ - - /docs/grafana/latest/linking/data-links/ - - /docs/grafana/latest/reference/datalinks/ - - /docs/grafana/latest/panels/configure-data-links/ - - /docs/grafana/latest/panels-visualizations/configure-data-links/ + - ../linking/data-link-variables/ + - ../linking/data-links/ + - ../panels/configure-data-links/ + - ../reference/datalinks/ + - ../variables/url-variables/ + - ../variables/variable-types/url-variables/ keywords: - grafana - url variables @@ -14,8 +13,8 @@ keywords: - data link - documentation - playlist -title: Configure data links menuTitle: Configure data links +title: Configure data links weight: 400 --- diff --git a/docs/sources/panels-visualizations/configure-overrides/index.md b/docs/sources/panels-visualizations/configure-overrides/index.md index 6b1cec9ff1dd..cebc810755d6 100644 --- a/docs/sources/panels-visualizations/configure-overrides/index.md +++ b/docs/sources/panels-visualizations/configure-overrides/index.md @@ -1,14 +1,15 @@ --- aliases: - - /docs/grafana/latest/panels/field-overrides/ - - /docs/grafana/latest/panels/override-field-values/ - - /docs/grafana/latest/panels/override-field-values/about-field-overrides/ - - /docs/grafana/latest/panels/override-field-values/add-a-field-override/ - - /docs/grafana/latest/panels/override-field-values/delete-a-field-override/ - - /docs/grafana/latest/panels/override-field-values/edit-field-override/ - - /docs/grafana/latest/panels/override-field-values/view-field-override/ -title: Configure field overrides + - ../panels/configure-overrides/ + - ../panels/field-overrides/ + - ../panels/override-field-values/ + - ../panels/override-field-values/about-field-overrides/ + - ../panels/override-field-values/add-a-field-override/ + - ../panels/override-field-values/delete-a-field-override/ + - ../panels/override-field-values/edit-field-override/ + - ../panels/override-field-values/view-field-override/ menuTitle: Configure field overrides +title: Configure field overrides weight: 400 --- diff --git a/docs/sources/panels-visualizations/configure-panel-options/index.md b/docs/sources/panels-visualizations/configure-panel-options/index.md index 1586fc0f998c..1037efca73af 100644 --- a/docs/sources/panels-visualizations/configure-panel-options/index.md +++ b/docs/sources/panels-visualizations/configure-panel-options/index.md @@ -1,14 +1,10 @@ --- aliases: - - /docs/grafana/latest/panels/add-panels-dynamically/ - - /docs/grafana/latest/panels/repeat-panels-or-rows/ - - /docs/grafana/latest/panels/working-with-panels/add-title-and-description/ - - /docs/grafana/latest/panels/working-with-panels/view-json-model/ - - /docs/grafana/latest/panels/configure-panel-options/ - - /docs/grafana/latest/panels-visualizations/configure-panel-options/ -title: Configure panel options -menuTitle: Configure panel options -weight: 2 + - ../panels/add-panels-dynamically/ + - ../panels/configure-panel-options/ + - ../panels/repeat-panels-or-rows/ + - ../panels/working-with-panels/add-title-and-description/ + - ../panels/working-with-panels/view-json-model/ keywords: - panel - dynamic @@ -16,6 +12,9 @@ keywords: - title - description - JSON model +menuTitle: Configure panel options +title: Configure panel options +weight: 2 --- # Configure panel options diff --git a/docs/sources/panels-visualizations/configure-standard-options/index.md b/docs/sources/panels-visualizations/configure-standard-options/index.md index 0116f669d6b7..90b480a7b81b 100644 --- a/docs/sources/panels-visualizations/configure-standard-options/index.md +++ b/docs/sources/panels-visualizations/configure-standard-options/index.md @@ -1,21 +1,20 @@ --- aliases: - - /docs/grafana/latest/panels/field-options/ - - /docs/grafana/latest/panels/field-options/standard-field-options/ - - /docs/grafana/latest/panels/working-with-panels/format-standard-fields/ - - /docs/grafana/latest/panels/reference-standard-field-definitions/ - - /docs/grafana/latest/panels/standard-field-definitions/ - - /docs/grafana/latest/panels/configure-standard-options/ - - /docs/grafana/latest/panels/apply-color-to-series/ - - /docs/grafana/latest/panels-visualizations/configure-standard-options/ -title: Configure standard options -menuTitle: Configure standard options -weight: 2 + - ../panels/apply-color-to-series/ + - ../panels/configure-standard-options/ + - ../panels/field-options/ + - ../panels/field-options/standard-field-options/ + - ../panels/reference-standard-field-definitions/ + - ../panels/standard-field-definitions/ + - ../panels/working-with-panels/format-standard-fields/ keywords: - panel - dasboard - standard - option +menuTitle: Configure standard options +title: Configure standard options +weight: 2 --- # Configure standard options diff --git a/docs/sources/panels-visualizations/configure-thresholds/index.md b/docs/sources/panels-visualizations/configure-thresholds/index.md index 045544d2264c..b7f2927262e0 100644 --- a/docs/sources/panels-visualizations/configure-thresholds/index.md +++ b/docs/sources/panels-visualizations/configure-thresholds/index.md @@ -1,13 +1,12 @@ --- aliases: - - /docs/grafana/latest/panels/ - - /docs/grafana/latest/panels/configure-thresholds/ - - /docs/grafana/latest/panels/specify-thresholds/about-thresholds/ - - /docs/grafana/latest/panels/specify-thresholds/add-a-threshold/ - - /docs/grafana/latest/panels/specify-thresholds/add-threshold-to-graph/ - - /docs/grafana/latest/panels/specify-thresholds/delete-a-threshold/ - - /docs/grafana/latest/panels/thresholds/ - - /docs/grafana/latest/panels-visualizations/configure-thresholds/ + - ../panels/ + - ../panels/configure-thresholds/ + - ../panels/specify-thresholds/about-thresholds/ + - ../panels/specify-thresholds/add-a-threshold/ + - ../panels/specify-thresholds/add-threshold-to-graph/ + - ../panels/specify-thresholds/delete-a-threshold/ + - ../panels/thresholds/ description: This section includes information about using thresholds in your visualizations. menuTitle: Configure thresholds title: Configure thresholds diff --git a/docs/sources/panels-visualizations/configure-value-mappings/index.md b/docs/sources/panels-visualizations/configure-value-mappings/index.md index aa4f1f9e1fff..beb2e450de31 100644 --- a/docs/sources/panels-visualizations/configure-value-mappings/index.md +++ b/docs/sources/panels-visualizations/configure-value-mappings/index.md @@ -1,16 +1,16 @@ --- aliases: - - /docs/grafana/latest/panels/configure-value-mappings/ - - /docs/grafana/latest/panels/format-data/ - - /docs/grafana/latest/panels/value-mappings/ - - /docs/grafana/latest/panels/format-data/about-value-mapping/ - - /docs/grafana/latest/panels/format-data/edit-value-mapping/ - - /docs/grafana/latest/panels/format-data/map-a-range/ - - /docs/grafana/latest/panels/format-data/map-a-regular-expression/ - - /docs/grafana/latest/panels/format-data/map-a-special-value/ - - /docs/grafana/latest/panels/format-data/map-a-value/ -title: Configure value mappings + - ../panels/configure-value-mappings/ + - ../panels/format-data/ + - ../panels/format-data/about-value-mapping/ + - ../panels/format-data/edit-value-mapping/ + - ../panels/format-data/map-a-range/ + - ../panels/format-data/map-a-regular-expression/ + - ../panels/format-data/map-a-special-value/ + - ../panels/format-data/map-a-value/ + - ../panels/value-mappings/ menuTitle: Configure value mappings +title: Configure value mappings weight: 600 --- diff --git a/docs/sources/panels-visualizations/create-reports/index.md b/docs/sources/panels-visualizations/create-reports/index.md index 2fed7c322745..d8ddd02961b5 100644 --- a/docs/sources/panels-visualizations/create-reports/index.md +++ b/docs/sources/panels-visualizations/create-reports/index.md @@ -1,5 +1,6 @@ --- aliases: +<<<<<<<< HEAD:docs/sources/panels-visualizations/create-reports/index.md - /docs/grafana/latest/administration/reports/ - /docs/grafana/latest/enterprise/reporting/ - /docs/grafana/latest/administration/reports/ @@ -10,11 +11,24 @@ aliases: title: Create and manage reports menuTitle: Reporting weight: 85 +======== + - ../administration/reports/ + - ../enterprise/export-pdf/ + - ../enterprise/reporting/ + - ../panels/create-reports/ + - reporting/ +>>>>>>>> release-9.2.13:docs/sources/dashboards/create-reports/index.md keywords: - grafana - reporting - export - pdf +<<<<<<<< HEAD:docs/sources/panels-visualizations/create-reports/index.md +======== +menuTitle: Reporting +title: Create and manage reports +weight: 85 +>>>>>>>> release-9.2.13:docs/sources/dashboards/create-reports/index.md --- # Create and manage reports diff --git a/docs/sources/panels-visualizations/panel-editor-overview/index.md b/docs/sources/panels-visualizations/panel-editor-overview/index.md index 13ebd6632f99..9e90b70e4199 100644 --- a/docs/sources/panels-visualizations/panel-editor-overview/index.md +++ b/docs/sources/panels-visualizations/panel-editor-overview/index.md @@ -1,25 +1,24 @@ --- aliases: - - /docs/grafana/latest/panels/working-with-panels/navigate-panel-editor/ - - /docs/grafana/latest/panels/working-with-panels/navigate-inspector-panel/ - - /docs/grafana/latest/dashboards/dashboard-create/ - - /docs/grafana/latest/features/dashboard/dashboards/ - - /docs/grafana/latest/panels/working-with-panels/add-panel/ - - /docs/grafana/latest/dashboards/add-organize-panels/ - - /docs/grafana/latest/panels/add-panels-dynamically/about-repeating-panels-rows/ - - /docs/grafana/latest/panels/add-panels-dynamically/configure-repeating-rows/ - - /docs/grafana/latest/panels/add-panels-dynamically/configure-repeating-panels/ - - /docs/grafana/next/dashboards/build-dashboards/add-organize-panels/ - - /docs/grafana/latest/panels-visualizations/add-organize-panels/ -title: Panel editor overview -menuTitle: Panel editor overview -weight: 1 + - ../dashboards/add-organize-panels/ + - ../dashboards/dashboard-create/ + - ../features/dashboard/dashboards/ + - ../panels/add-panels-dynamically/about-repeating-panels-rows/ + - ../panels/add-panels-dynamically/configure-repeating-panels/ + - ../panels/add-panels-dynamically/configure-repeating-rows/ + - ../panels/working-with-panels/add-panel/ + - ../panels/working-with-panels/navigate-inspector-panel/ + - ../panels/working-with-panels/navigate-panel-editor/ + - add-organize-panels/ keywords: - panel - dashboard - dynamic - rows - add +menuTitle: Panel editor overview +title: Panel editor overview +weight: 1 --- # Panel editor overview diff --git a/docs/sources/panels-visualizations/panel-inspector/index.md b/docs/sources/panels-visualizations/panel-inspector/index.md index 50df980e72a4..66012f748e47 100644 --- a/docs/sources/panels-visualizations/panel-inspector/index.md +++ b/docs/sources/panels-visualizations/panel-inspector/index.md @@ -1,10 +1,9 @@ --- aliases: - - /docs/grafana/latest/panels/working-with-panels/navigate-inspector-panel/ - - /docs/grafana/latest/panels-visualizations/panel-inspector/ - - /docs/grafana/latest/panels/query-a-data-source/download-raw-query-results/ - - /docs/grafana/latest/panels/query-a-data-source/inspect-query-performance/ - - /docs/grafana/latest/panels/query-a-data-source/inspect-request-and-response-data/ + - ../panels/query-a-data-source/download-raw-query-results/ + - ../panels/query-a-data-source/inspect-query-performance/ + - ../panels/query-a-data-source/inspect-request-and-response-data/ + - ../panels/working-with-panels/navigate-inspector-panel/ title: The panel inspect view weight: 1200 --- diff --git a/docs/sources/panels-visualizations/query-transform-data/_index.md b/docs/sources/panels-visualizations/query-transform-data/_index.md index 10c2f4670157..331f856b62ed 100644 --- a/docs/sources/panels-visualizations/query-transform-data/_index.md +++ b/docs/sources/panels-visualizations/query-transform-data/_index.md @@ -1,18 +1,18 @@ --- aliases: - - /docs/grafana/latest/panels/expressions/ - - /docs/grafana/latest/panels/inspect-panel/ - - /docs/grafana/latest/panels/queries/ - - /docs/grafana/latest/panels/query-a-data-source/ - - /docs/grafana/latest/panels/share-query-results/ - - /docs/grafana/latest/panels/query-a-data-source/about-queries/ - - /docs/grafana/latest/panels/query-a-data-source/navigate-query-tab/ - - /docs/grafana/latest/panels/query-a-data-source/add-a-query/ - - /docs/grafana/latest/panels/query-a-data-source/manage-queries/ - - /docs/grafana/latest/panels-visualizations/manage-queries/ - - /docs/grafana/latest/panels/query-options/ - - /docs/grafana/latest/panels/reference-query-options/ - - /docs/grafana/latest/panels-visualizations/query-options/ + - ../panels/expressions/ + - ../panels/inspect-panel/ + - ../panels/queries/ + - ../panels/query-a-data-source/ + - ../panels/query-a-data-source/about-queries/ + - ../panels/query-a-data-source/add-a-query/ + - ../panels/query-a-data-source/manage-queries/ + - ../panels/query-a-data-source/navigate-query-tab/ + - ../panels/query-options/ + - ../panels/reference-query-options/ + - ../panels/share-query-results/ + - manage-queries/ + - query-options/ title: Query and transform data weight: 200 --- diff --git a/docs/sources/panels-visualizations/query-transform-data/expression-queries/index.md b/docs/sources/panels-visualizations/query-transform-data/expression-queries/index.md index 0da0dbfc22fa..e0a3b68383a3 100644 --- a/docs/sources/panels-visualizations/query-transform-data/expression-queries/index.md +++ b/docs/sources/panels-visualizations/query-transform-data/expression-queries/index.md @@ -1,11 +1,11 @@ --- aliases: - - /docs/grafana/latest/panels/query-a-data-source/use-expressions-to-manipulate-data/ - - /docs/grafana/latest/panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions/ - - /docs/grafana/latest/panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression/ - - docs/grafana/latest/panels-visualizations/query-transform-data/expression-queries/ -title: Write expression queries + - ../../panels/query-a-data-source/use-expressions-to-manipulate-data/ + - ../../panels/query-a-data-source/use-expressions-to-manipulate-data/about-expressions/ + - ../../panels/query-a-data-source/use-expressions-to-manipulate-data/write-an-expression/ + - ./ menuTitle: Write expression queries +title: Write expression queries weight: 40 --- diff --git a/docs/sources/panels-visualizations/query-transform-data/share-query/index.md b/docs/sources/panels-visualizations/query-transform-data/share-query/index.md index 615df99da57f..2d8b259571bc 100644 --- a/docs/sources/panels-visualizations/query-transform-data/share-query/index.md +++ b/docs/sources/panels-visualizations/query-transform-data/share-query/index.md @@ -1,7 +1,7 @@ --- aliases: - - /docs/grafana/latest/panels/query-a-data-source/share-query/ - - /docs/grafana/latest/panels-visualizations/query-transform-data/share-query/ + - ../../panels/query-a-data-source/share-query/ +menuTitle: Share query results title: Share query results with another panel menuTitle: Share query results weight: 60 diff --git a/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md b/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md index ce8ade1ff5b1..854f2aee9849 100644 --- a/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md +++ b/docs/sources/panels-visualizations/query-transform-data/transform-data/index.md @@ -1,19 +1,18 @@ --- aliases: - - /docs/grafana/latest/panels/transform-data/ - - /docs/grafana/latest/panels/transformations/ - - /docs/grafana/latest/panels/transformations/apply-transformations/ - - /docs/grafana/latest/panels/transformations/config-from-query/ - - /docs/grafana/latest/panels/transformations/rows-to-fields/ - - /docs/grafana/latest/panels/transform-data/about-transformation/ - - /docs/grafana/latest/panels/transform-data/add-transformation-to-data/ - - /docs/grafana/latest/panels/transform-data/apply-transformation-to-data/ - - /docs/grafana/latest/panels/transform-data/debug-transformation/ - - /docs/grafana/latest/panels/transform-data/delete-transformation/ - - /docs/grafana/latest/panels/reference-transformation-functions/ - - /docs/grafana/latest/panels/transform-data/transformation-functions/ - - /docs/grafana/latest/panels/transformations/types-options/ - - /docs/grafana/latest/panels-visualizations/query-transform-data/transform-data/ + - ../../panels/reference-transformation-functions/ + - ../../panels/transform-data/ + - ../../panels/transform-data/about-transformation/ + - ../../panels/transform-data/add-transformation-to-data/ + - ../../panels/transform-data/apply-transformation-to-data/ + - ../../panels/transform-data/debug-transformation/ + - ../../panels/transform-data/delete-transformation/ + - ../../panels/transform-data/transformation-functions/ + - ../../panels/transformations/ + - ../../panels/transformations/apply-transformations/ + - ../../panels/transformations/config-from-query/ + - ../../panels/transformations/rows-to-fields/ + - ../../panels/transformations/types-options/ title: Transform data weight: 100 --- diff --git a/docs/sources/panels-visualizations/query-transform-data/troubleshoot-queries/index.md b/docs/sources/panels-visualizations/query-transform-data/troubleshoot-queries/index.md index 3a93dba06b0e..395afc3da7fc 100644 --- a/docs/sources/panels-visualizations/query-transform-data/troubleshoot-queries/index.md +++ b/docs/sources/panels-visualizations/query-transform-data/troubleshoot-queries/index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/troubleshooting/troubleshoot-queries/ - - /docs/grafana/latest/panels-visualizations/query-transform-data/troubleshoot-queries/ + - ../../troubleshooting/troubleshoot-queries/ description: Guide to troubleshooting Grafana queries keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/_index.md b/docs/sources/panels-visualizations/visualizations/_index.md index 68365387b205..ab4fd29118a2 100644 --- a/docs/sources/panels-visualizations/visualizations/_index.md +++ b/docs/sources/panels-visualizations/visualizations/_index.md @@ -1,12 +1,11 @@ --- aliases: - - /docs/grafana/latest/panels/visualizations/ - - /docs/grafana/latest/visualizations/ - - /docs/grafana/latest/panels-visualizations/visualizations/ - - /docs/grafana/latest/features/panels/graph/ - - /docs/grafana/latest/panels/visualizations/graph-panel/ - - /docs/grafana/latest/reference/graph/ - - /docs/grafana/latest/visualizations/graph-panel/ + - ../features/panels/graph/ + - ../panels/visualizations/ + - ../panels/visualizations/graph-panel/ + - ../reference/graph/ + - ../visualizations/ + - ../visualizations/graph-panel/ title: Visualizations weight: 75 --- diff --git a/docs/sources/panels-visualizations/visualizations/alert-list/index.md b/docs/sources/panels-visualizations/visualizations/alert-list/index.md index fd4e578d9bdd..8e798c65b29f 100644 --- a/docs/sources/panels-visualizations/visualizations/alert-list/index.md +++ b/docs/sources/panels-visualizations/visualizations/alert-list/index.md @@ -1,10 +1,9 @@ --- aliases: - - /docs/grafana/latest/features/panels/alertlist/ - - /docs/grafana/latest/panels/visualizations/alert-list-panel/ - - /docs/grafana/latest/reference/alertlist/ - - /docs/grafana/latest/visualizations/alert-list-panel/ - - /docs/grafana/latest/panels-visualizations/visualizations/alert-list/ + - ../../features/panels/alertlist/ + - ../../panels/visualizations/alert-list-panel/ + - ../../reference/alertlist/ + - ../../visualizations/alert-list-panel/ keywords: - grafana - alert list diff --git a/docs/sources/panels-visualizations/visualizations/annotations/index.md b/docs/sources/panels-visualizations/visualizations/annotations/index.md index 184d01718439..18b57e8ee500 100644 --- a/docs/sources/panels-visualizations/visualizations/annotations/index.md +++ b/docs/sources/panels-visualizations/visualizations/annotations/index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/features/panels/anotations/ - - /docs/grafana/latest/panels/visualizations/annotations/ - - /docs/grafana/latest/visualizations/annotations/ - - /docs/grafana/latest/panels-visualizations/visualizations/annotations/ + - ../../features/panels/anotations/ + - ../../panels/visualizations/annotations/ + - ../../visualizations/annotations/ description: Annotations visualization documentation keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/bar-chart/index.md b/docs/sources/panels-visualizations/visualizations/bar-chart/index.md index a6cd3a4c22a4..fdc7f8937613 100644 --- a/docs/sources/panels-visualizations/visualizations/bar-chart/index.md +++ b/docs/sources/panels-visualizations/visualizations/bar-chart/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/panels/visualizations/bar-chart/ - - /docs/grafana/latest/visualizations/bar-chart/ - - /docs/grafana/latest/panels-visualizations/visualizations/bar-chart/ + - ../../panels/visualizations/bar-chart/ + - ../../visualizations/bar-chart/ description: Bar chart visualization keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/bar-gauge/index.md b/docs/sources/panels-visualizations/visualizations/bar-gauge/index.md index 93f18dd59e6c..8c2dd6cd4e51 100644 --- a/docs/sources/panels-visualizations/visualizations/bar-gauge/index.md +++ b/docs/sources/panels-visualizations/visualizations/bar-gauge/index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/features/panels/bar_gauge/ - - /docs/grafana/latest/panels/visualizations/bar-gauge-panel/ - - /docs/grafana/latest/visualizations/bar-gauge-panel/ - - /docs/grafana/latest/panels-visualizations/visualizations/bar-gauge/ + - ../../features/panels/bar_gauge/ + - ../../panels/visualizations/bar-gauge-panel/ + - ../../visualizations/bar-gauge-panel/ description: Bar gauge panel options keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/candlestick/index.md b/docs/sources/panels-visualizations/visualizations/candlestick/index.md index 94a3cf8a560a..f833bde433dd 100644 --- a/docs/sources/panels-visualizations/visualizations/candlestick/index.md +++ b/docs/sources/panels-visualizations/visualizations/candlestick/index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/features/panels/candlestick/ - - /docs/grafana/latest/panels/visualizations/candlestick/ - - /docs/grafana/latest/visualizations/candlestick/ - - /docs/grafana/latest/panels-visualizations/visualizations/candlestick/ + - ../../features/panels/candlestick/ + - ../../panels/visualizations/candlestick/ + - ../../visualizations/candlestick/ description: Candlestick visualization documentation keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/canvas/index.md b/docs/sources/panels-visualizations/visualizations/canvas/index.md index 7c8e34ac2f88..da33ef7a04b6 100644 --- a/docs/sources/panels-visualizations/visualizations/canvas/index.md +++ b/docs/sources/panels-visualizations/visualizations/canvas/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/features/panels/canvas/ - - /docs/grafana/latest/visualizations/canvas/ - - /docs/grafana/latest/panels-visualizations/visualizations/canvas/ + - ../../features/panels/canvas/ + - ../../visualizations/canvas/ description: Canvas visualization documentation keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/configure-legend/index.md b/docs/sources/panels-visualizations/visualizations/configure-legend/index.md index 059bfb2acda5..19c618c2d03c 100644 --- a/docs/sources/panels-visualizations/visualizations/configure-legend/index.md +++ b/docs/sources/panels-visualizations/visualizations/configure-legend/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/panels/working-with-panels/configure-legend/ - - /docs/grafana/latest/visualizations/configure-legend/ - - /docs/grafana/latest/panels-visualizations/visualizations/configure-legend/ + - ../../panels/working-with-panels/configure-legend/ + - ../../visualizations/configure-legend/ title: Configure a legend weight: 1300 --- diff --git a/docs/sources/panels-visualizations/visualizations/dashboard-list/index.md b/docs/sources/panels-visualizations/visualizations/dashboard-list/index.md index 6b23a1883c2e..662475f6b33c 100644 --- a/docs/sources/panels-visualizations/visualizations/dashboard-list/index.md +++ b/docs/sources/panels-visualizations/visualizations/dashboard-list/index.md @@ -1,10 +1,9 @@ --- aliases: - - /docs/grafana/latest/features/panels/dashlist/ - - /docs/grafana/latest/panels/visualizations/dashboard-list-panel/ - - /docs/grafana/latest/reference/dashlist/ - - /docs/grafana/latest/visualizations/dashboard-list-panel/ - - /docs/grafana/latest/panels-visualizations/visualizations/dashboard-list/ + - ../../features/panels/dashlist/ + - ../../panels/visualizations/dashboard-list-panel/ + - ../../reference/dashlist/ + - ../../visualizations/dashboard-list-panel/ keywords: - grafana - dashboard list diff --git a/docs/sources/panels-visualizations/visualizations/gauge/index.md b/docs/sources/panels-visualizations/visualizations/gauge/index.md index 8248962b5d6d..50c219d27a4c 100644 --- a/docs/sources/panels-visualizations/visualizations/gauge/index.md +++ b/docs/sources/panels-visualizations/visualizations/gauge/index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/features/panels/gauge/ - - /docs/grafana/latest/panels/visualizations/gauge-panel/ - - /docs/grafana/latest/visualizations/gauge-panel/ - - /docs/grafana/latest/panels-visualizations/visualizations/gauge/ + - ../../features/panels/gauge/ + - ../../panels/visualizations/gauge-panel/ + - ../../visualizations/gauge-panel/ description: Gauge panel docs keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/geomap/index.md b/docs/sources/panels-visualizations/visualizations/geomap/index.md index 891311df08f6..9e48e63650ae 100644 --- a/docs/sources/panels-visualizations/visualizations/geomap/index.md +++ b/docs/sources/panels-visualizations/visualizations/geomap/index.md @@ -1,27 +1,26 @@ --- aliases: - - /docs/grafana/latest/features/panels/geomap/ - - /docs/grafana/latest/panels/visualizations/geomap/ - - /docs/grafana/latest/visualizations/geomap/ - - /docs/grafana/latest/features/panels/geomap/arcgis/ - - /docs/grafana/latest/panels/visualizations/geomap/arcgis/ - - /docs/grafana/latest/features/panels/geomap/carto/ - - /docs/grafana/latest/panels/visualizations/geomap/carto/ - - /docs/grafana/latest/features/panels/geomap/controls/ - - /docs/grafana/latest/panels/visualizations/geomap/controls/ - - /docs/grafana/latest/features/panels/geomap/daynight/ - - /docs/grafana/latest/panels/visualizations/geomap/daynight/ - - /docs/grafana/latest/features/panels/geomap/geojson/ - - /docs/grafana/latest/panels/visualizations/geomap/geojson/ - - /docs/grafana/latest/features/panels/geomap/heatmap/ - - /docs/grafana/latest/panels/visualizations/geomap/heatmap/ - - /docs/grafana/latest/features/panels/geomap/markers/ - - /docs/grafana/latest/panels/visualizations/geomap/markers/ - - /docs/grafana/latest/features/panels/geomap/osm/ - - /docs/grafana/latest/panels/visualizations/geomap/osm/ - - /docs/grafana/latest/features/panels/geomap/zyx/ - - /docs/grafana/latest/panels/visualizations/geomap/zyx/ - - /docs/grafana/latest/panels-visualizations/visualizations/geomap/ + - ../../features/panels/geomap/ + - ../../features/panels/geomap/arcgis/ + - ../../features/panels/geomap/carto/ + - ../../features/panels/geomap/controls/ + - ../../features/panels/geomap/daynight/ + - ../../features/panels/geomap/geojson/ + - ../../features/panels/geomap/heatmap/ + - ../../features/panels/geomap/markers/ + - ../../features/panels/geomap/osm/ + - ../../features/panels/geomap/zyx/ + - ../../panels/visualizations/geomap/ + - ../../panels/visualizations/geomap/arcgis/ + - ../../panels/visualizations/geomap/carto/ + - ../../panels/visualizations/geomap/controls/ + - ../../panels/visualizations/geomap/daynight/ + - ../../panels/visualizations/geomap/geojson/ + - ../../panels/visualizations/geomap/heatmap/ + - ../../panels/visualizations/geomap/markers/ + - ../../panels/visualizations/geomap/osm/ + - ../../panels/visualizations/geomap/zyx/ + - ../../visualizations/geomap/ description: Geomap visualization documentation keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/heatmap/index.md b/docs/sources/panels-visualizations/visualizations/heatmap/index.md index 91302a2f8f93..7c2d97c15a99 100644 --- a/docs/sources/panels-visualizations/visualizations/heatmap/index.md +++ b/docs/sources/panels-visualizations/visualizations/heatmap/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/features/panels/heatmap/ - - /docs/grafana/latest/visualizations/heatmap/ - - /docs/grafana/latest/panels-visualizations/visualizations/heatmap/ + - ../../features/panels/heatmap/ + - ../../visualizations/heatmap/ description: Heatmap visualization documentation keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/histogram/index.md b/docs/sources/panels-visualizations/visualizations/histogram/index.md index eebf655571d3..d49d15c7e71b 100644 --- a/docs/sources/panels-visualizations/visualizations/histogram/index.md +++ b/docs/sources/panels-visualizations/visualizations/histogram/index.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/features/panels/histogram/ - - /docs/grafana/latest/panels/visualizations/histogram/ - - /docs/grafana/latest/visualizations/histogram/ - - /docs/grafana/latest/panels-visualizations/visualizations/histogram/ + - ../../features/panels/histogram/ + - ../../panels/visualizations/histogram/ + - ../../visualizations/histogram/ description: Histogram visualization keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/logs/index.md b/docs/sources/panels-visualizations/visualizations/logs/index.md index d5a062de6f6b..6a8a28a2ad36 100644 --- a/docs/sources/panels-visualizations/visualizations/logs/index.md +++ b/docs/sources/panels-visualizations/visualizations/logs/index.md @@ -1,10 +1,9 @@ --- aliases: - - /docs/grafana/latest/features/panels/logs/ - - /docs/grafana/latest/panels/visualizations/logs-panel/ - - /docs/grafana/latest/reference/logs/ - - /docs/grafana/latest/visualizations/logs-panel/ - - /docs/grafana/latest/panels-visualizations/visualizations/logs/ + - ../../features/panels/logs/ + - ../../panels/visualizations/logs-panel/ + - ../../reference/logs/ + - ../../visualizations/logs-panel/ keywords: - grafana - dashboard diff --git a/docs/sources/panels-visualizations/visualizations/news/index.md b/docs/sources/panels-visualizations/visualizations/news/index.md index 763e924fce82..a66fca5c6393 100644 --- a/docs/sources/panels-visualizations/visualizations/news/index.md +++ b/docs/sources/panels-visualizations/visualizations/news/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/panels/visualizations/news-graph/ - - /docs/grafana/latest/visualizations/news-panel/ - - /docs/grafana/latest/panels-visualizations/visualizations/news/ + - ../../panels/visualizations/news-graph/ + - ../../visualizations/news-panel/ keywords: - grafana - news diff --git a/docs/sources/panels-visualizations/visualizations/node-graph/index.md b/docs/sources/panels-visualizations/visualizations/node-graph/index.md index 83bd5ccdc04e..fa8d4d1f88f2 100644 --- a/docs/sources/panels-visualizations/visualizations/node-graph/index.md +++ b/docs/sources/panels-visualizations/visualizations/node-graph/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/panels/visualizations/node-graph/ - - /docs/grafana/latest/visualizations/node-graph/ - - /docs/grafana/latest/panels-visualizations/visualizations/node-graph/ + - ../../panels/visualizations/node-graph/ + - ../../visualizations/node-graph/ keywords: - grafana - dashboard diff --git a/docs/sources/panels-visualizations/visualizations/pie-chart/index.md b/docs/sources/panels-visualizations/visualizations/pie-chart/index.md index 9cc2a748d169..315669874296 100644 --- a/docs/sources/panels-visualizations/visualizations/pie-chart/index.md +++ b/docs/sources/panels-visualizations/visualizations/pie-chart/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/panels/visualizations/pie-chart-pane/ - - /docs/grafana/latest/visualizations/pie-chart-panel/ - - /docs/grafana/latest/panels-visualizations/visualizations/pie-chart/ + - ../../panels/visualizations/pie-chart-pane/ + - ../../visualizations/pie-chart-panel/ keywords: - grafana - pie chart diff --git a/docs/sources/panels-visualizations/visualizations/stat/index.md b/docs/sources/panels-visualizations/visualizations/stat/index.md index 0faddd40ac6a..21fbb1bebbac 100644 --- a/docs/sources/panels-visualizations/visualizations/stat/index.md +++ b/docs/sources/panels-visualizations/visualizations/stat/index.md @@ -1,11 +1,10 @@ --- aliases: - - /docs/grafana/latest/features/panels/singlestat/ - - /docs/grafana/latest/features/panels/stat/ - - /docs/grafana/latest/panels/visualizations/stat-panel/ - - /docs/grafana/latest/reference/singlestat/ - - /docs/grafana/latest/visualizations/stat-panel/ - - /docs/grafana/latest/panels-visualizations/visualizations/stat/ + - ../../features/panels/singlestat/ + - ../../features/panels/stat/ + - ../../panels/visualizations/stat-panel/ + - ../../reference/singlestat/ + - ../../visualizations/stat-panel/ description: Stat panel documentation keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/state-timeline/index.md b/docs/sources/panels-visualizations/visualizations/state-timeline/index.md index e20c1168089b..83f652dc175b 100644 --- a/docs/sources/panels-visualizations/visualizations/state-timeline/index.md +++ b/docs/sources/panels-visualizations/visualizations/state-timeline/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/panels/visualizations/state-timeline/ - - /docs/grafana/latest/visualizations/state-timeline/ - - /docs/grafana/latest/panels-visualizations/visualizations/state-timeline/ + - ../../panels/visualizations/state-timeline/ + - ../../visualizations/state-timeline/ description: State timeline visualization keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/status-history/index.md b/docs/sources/panels-visualizations/visualizations/status-history/index.md index d8746f82a411..e633829657e5 100644 --- a/docs/sources/panels-visualizations/visualizations/status-history/index.md +++ b/docs/sources/panels-visualizations/visualizations/status-history/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/panels/visualizations/status-history/ - - /docs/grafana/latest/visualizations/status-history/ - - /docs/grafana/latest/panels-visualizations/visualizations/status-history/ + - ../../panels/visualizations/status-history/ + - ../../visualizations/status-history/ description: Status history visualization keywords: - grafana diff --git a/docs/sources/panels-visualizations/visualizations/table/index.md b/docs/sources/panels-visualizations/visualizations/table/index.md index f795848e51b1..deb5aa8446d7 100644 --- a/docs/sources/panels-visualizations/visualizations/table/index.md +++ b/docs/sources/panels-visualizations/visualizations/table/index.md @@ -1,15 +1,11 @@ --- aliases: - - /docs/grafana/latest/features/panels/table_panel/ - - /docs/grafana/latest/reference/table/ - - /docs/grafana/latest/visualizations/table/ - - /docs/grafana/next/panels/visualizations/table/table-field-options/ - - /docs/grafana/latest/features/panels/table_panel/ - - /docs/grafana/latest/panels/visualizations/table/filter-table-columns/ - - /docs/grafana/latest/reference/table/ - - /docs/grafana/latest/visualizations/table/filter-table-columns/ - - /docs/grafana/latest/visualizations/table/ - - /docs/grafana/latest/panels-visualizations/visualizations/table/ + - ../../features/panels/table_panel/ + - ../../panels/visualizations/table/filter-table-columns/ + - ../../reference/table/ + - ../../visualizations/table/ + - ../../visualizations/table/filter-table-columns/ +description: Learn about table panel visualization features. keywords: - grafana - dashboard @@ -19,9 +15,8 @@ keywords: - format tables - table filter - filter columns -title: Table menuTitle: Table -description: Learn about table panel visualization features. +title: Table weight: 1000 --- diff --git a/docs/sources/panels-visualizations/visualizations/text/index.md b/docs/sources/panels-visualizations/visualizations/text/index.md index d8f458accc47..403e2d3f0f71 100644 --- a/docs/sources/panels-visualizations/visualizations/text/index.md +++ b/docs/sources/panels-visualizations/visualizations/text/index.md @@ -1,10 +1,9 @@ --- aliases: - - /docs/grafana/latest/features/panels/text/ - - /docs/grafana/latest/panels/visualizations/text-panel/ - - /docs/grafana/latest/reference/alertlist/ - - /docs/grafana/latest/visualizations/text-panel/ - - /docs/grafana/latest/panels-visualizations/visualizations/text/ + - ../../features/panels/text/ + - ../../panels/visualizations/text-panel/ + - ../../reference/alertlist/ + - ../../visualizations/text-panel/ keywords: - grafana - text diff --git a/docs/sources/panels-visualizations/visualizations/time-series/index.md b/docs/sources/panels-visualizations/visualizations/time-series/index.md index 9cf440818701..ab3b2821ff53 100644 --- a/docs/sources/panels-visualizations/visualizations/time-series/index.md +++ b/docs/sources/panels-visualizations/visualizations/time-series/index.md @@ -1,23 +1,22 @@ --- aliases: - - /docs/grafana/latest/panels/visualizations/time-series/ - - /docs/grafana/latest/visualizations/time-series/ - - /docs/grafana/latest/panels/visualizations/time-series/annotate-time-series/ - - /docs/grafana/latest/visualizations/time-series/annotate-time-series/ - - /docs/grafana/latest/panels/visualizations/time-series/change-axis-display/ - - /docs/grafana/latest/visualizations/time-series/change-axis-display/ - - /docs/grafana/latest/panels/visualizations/time-series/graph-color-scheme/ - - /docs/grafana/latest/visualizations/time-series/graph-color-scheme/ - - /docs/grafana/latest/panels/visualizations/time-series/graph-time-series-as-bars/ - - /docs/grafana/latest/visualizations/time-series/graph-time-series-as-bars/ - - /docs/grafana/latest/panels/visualizations/time-series/graph-time-series-as-lines/ - - /docs/grafana/latest/visualizations/time-series/graph-time-series-as-lines/ - - /docs/grafana/latest/panels/visualizations/time-series/graph-time-series-as-points/ - - /docs/grafana/latest/visualizations/time-series/graph-time-series-as-points/ - - /docs/grafana/latest/features/panels/histogram/ - - /docs/grafana/latest/panels/visualizations/time-series/graph-time-series-stacking/ - - /docs/grafana/latest/visualizations/time-series/graph-time-series-stacking/ - - /docs/grafana/latest/panels-visualizations/visualizations/time-series/ + - ../../features/panels/histogram/ + - ../../panels/visualizations/time-series/ + - ../../panels/visualizations/time-series/annotate-time-series/ + - ../../panels/visualizations/time-series/change-axis-display/ + - ../../panels/visualizations/time-series/graph-color-scheme/ + - ../../panels/visualizations/time-series/graph-time-series-as-bars/ + - ../../panels/visualizations/time-series/graph-time-series-as-lines/ + - ../../panels/visualizations/time-series/graph-time-series-as-points/ + - ../../panels/visualizations/time-series/graph-time-series-stacking/ + - ../../visualizations/time-series/ + - ../../visualizations/time-series/annotate-time-series/ + - ../../visualizations/time-series/change-axis-display/ + - ../../visualizations/time-series/graph-color-scheme/ + - ../../visualizations/time-series/graph-time-series-as-bars/ + - ../../visualizations/time-series/graph-time-series-as-lines/ + - ../../visualizations/time-series/graph-time-series-as-points/ + - ../../visualizations/time-series/graph-time-series-stacking/ keywords: - grafana - graph panel diff --git a/docs/sources/panels-visualizations/visualizations/traces/index.md b/docs/sources/panels-visualizations/visualizations/traces/index.md index 79111c1bfc13..488c1f677f75 100644 --- a/docs/sources/panels-visualizations/visualizations/traces/index.md +++ b/docs/sources/panels-visualizations/visualizations/traces/index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/visualizations/traces/ - - /docs/grafana/latest/panels-visualizations/visualizations/traces/ + - ../../visualizations/traces/ keywords: - grafana - dashboard diff --git a/docs/sources/release-notes/_index.md b/docs/sources/release-notes/_index.md index 3fe99c274752..1b6b009f1dec 100644 --- a/docs/sources/release-notes/_index.md +++ b/docs/sources/release-notes/_index.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/ title: Release notes weight: 10000 --- diff --git a/docs/sources/release-notes/release-notes-7-3-0.md b/docs/sources/release-notes/release-notes-7-3-0.md index ec42dcc87fde..98929807a37e 100644 --- a/docs/sources/release-notes/release-notes-7-3-0.md +++ b/docs/sources/release-notes/release-notes-7-3-0.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-3-0/ title: Release notes for Grafana 7.3.0 --- diff --git a/docs/sources/release-notes/release-notes-7-3-1.md b/docs/sources/release-notes/release-notes-7-3-1.md index 34f059fd314c..dbe07540b19f 100644 --- a/docs/sources/release-notes/release-notes-7-3-1.md +++ b/docs/sources/release-notes/release-notes-7-3-1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-3-1/ title: Release notes for Grafana 7.3.1 --- diff --git a/docs/sources/release-notes/release-notes-7-3-10.md b/docs/sources/release-notes/release-notes-7-3-10.md index 2911b5c07115..a5425da057e7 100644 --- a/docs/sources/release-notes/release-notes-7-3-10.md +++ b/docs/sources/release-notes/release-notes-7-3-10.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-3-10/ title: Release notes for Grafana 7.3.10 --- diff --git a/docs/sources/release-notes/release-notes-7-3-2.md b/docs/sources/release-notes/release-notes-7-3-2.md index deac211b8b7a..5e184d436511 100644 --- a/docs/sources/release-notes/release-notes-7-3-2.md +++ b/docs/sources/release-notes/release-notes-7-3-2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-3-2/ title: Release notes for Grafana 7.3.2 --- diff --git a/docs/sources/release-notes/release-notes-7-3-3.md b/docs/sources/release-notes/release-notes-7-3-3.md index 319c5cce5d94..d5b71bfd432b 100644 --- a/docs/sources/release-notes/release-notes-7-3-3.md +++ b/docs/sources/release-notes/release-notes-7-3-3.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-3-3/ title: Release notes for Grafana 7.3.3 --- diff --git a/docs/sources/release-notes/release-notes-7-3-4.md b/docs/sources/release-notes/release-notes-7-3-4.md index 9201b92898ae..0cc5c76fb50a 100644 --- a/docs/sources/release-notes/release-notes-7-3-4.md +++ b/docs/sources/release-notes/release-notes-7-3-4.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-3-4/ title: Release notes for Grafana 7.3.4 --- diff --git a/docs/sources/release-notes/release-notes-7-3-5.md b/docs/sources/release-notes/release-notes-7-3-5.md index 916404750de9..1a2a0484e5bf 100644 --- a/docs/sources/release-notes/release-notes-7-3-5.md +++ b/docs/sources/release-notes/release-notes-7-3-5.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-3-5/ title: Release notes for Grafana 7.3.5 --- diff --git a/docs/sources/release-notes/release-notes-7-3-6.md b/docs/sources/release-notes/release-notes-7-3-6.md index eb89c772902b..fb40b10f3be9 100644 --- a/docs/sources/release-notes/release-notes-7-3-6.md +++ b/docs/sources/release-notes/release-notes-7-3-6.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-3-6/ title: Release notes for Grafana 7.3.6 --- diff --git a/docs/sources/release-notes/release-notes-7-3-7.md b/docs/sources/release-notes/release-notes-7-3-7.md index 942a1b19ffd3..add24b19ab80 100644 --- a/docs/sources/release-notes/release-notes-7-3-7.md +++ b/docs/sources/release-notes/release-notes-7-3-7.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-3-7/ title: Release notes for Grafana 7.3.7 --- diff --git a/docs/sources/release-notes/release-notes-7-4-0.md b/docs/sources/release-notes/release-notes-7-4-0.md index 264294b31673..5bb5f9aff001 100644 --- a/docs/sources/release-notes/release-notes-7-4-0.md +++ b/docs/sources/release-notes/release-notes-7-4-0.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-4-0/ title: Release notes for Grafana 7.4.0 --- diff --git a/docs/sources/release-notes/release-notes-7-4-1.md b/docs/sources/release-notes/release-notes-7-4-1.md index 288e2535585d..356c3eaa1dba 100644 --- a/docs/sources/release-notes/release-notes-7-4-1.md +++ b/docs/sources/release-notes/release-notes-7-4-1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-4-1/ title: Release notes for Grafana 7.4.1 --- diff --git a/docs/sources/release-notes/release-notes-7-4-2.md b/docs/sources/release-notes/release-notes-7-4-2.md index ea2bb8bfaea6..ae74a6f989cc 100644 --- a/docs/sources/release-notes/release-notes-7-4-2.md +++ b/docs/sources/release-notes/release-notes-7-4-2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-4-2/ title: Release notes for Grafana 7.4.2 --- diff --git a/docs/sources/release-notes/release-notes-7-4-3.md b/docs/sources/release-notes/release-notes-7-4-3.md index 7e07bfe1b9e8..68b479fb789f 100644 --- a/docs/sources/release-notes/release-notes-7-4-3.md +++ b/docs/sources/release-notes/release-notes-7-4-3.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-4-3/ title: Release notes for Grafana 7.4.3 --- diff --git a/docs/sources/release-notes/release-notes-7-4-5.md b/docs/sources/release-notes/release-notes-7-4-5.md index 88dacac1dcbc..2550b295363f 100644 --- a/docs/sources/release-notes/release-notes-7-4-5.md +++ b/docs/sources/release-notes/release-notes-7-4-5.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-4-5/ title: Release notes for Grafana 7.4.5 --- diff --git a/docs/sources/release-notes/release-notes-7-5-0-beta1.md b/docs/sources/release-notes/release-notes-7-5-0-beta1.md index 9d4ed27b3a62..de845a23448a 100644 --- a/docs/sources/release-notes/release-notes-7-5-0-beta1.md +++ b/docs/sources/release-notes/release-notes-7-5-0-beta1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-0-beta1/ title: Release notes for Grafana 7.5.0-beta1 --- diff --git a/docs/sources/release-notes/release-notes-7-5-0-beta2.md b/docs/sources/release-notes/release-notes-7-5-0-beta2.md index 5eb32436515c..64c6eb4a1a51 100644 --- a/docs/sources/release-notes/release-notes-7-5-0-beta2.md +++ b/docs/sources/release-notes/release-notes-7-5-0-beta2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-0-beta2/ title: Release notes for Grafana 7.5.0-beta2 --- diff --git a/docs/sources/release-notes/release-notes-7-5-0.md b/docs/sources/release-notes/release-notes-7-5-0.md index 1af413131791..5be1d0fdb346 100644 --- a/docs/sources/release-notes/release-notes-7-5-0.md +++ b/docs/sources/release-notes/release-notes-7-5-0.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-0/ title: Release notes for Grafana 7.5.0 --- diff --git a/docs/sources/release-notes/release-notes-7-5-1.md b/docs/sources/release-notes/release-notes-7-5-1.md index 89c0165b90d5..d517fccbed94 100644 --- a/docs/sources/release-notes/release-notes-7-5-1.md +++ b/docs/sources/release-notes/release-notes-7-5-1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-1/ title: Release notes for Grafana 7.5.1 --- diff --git a/docs/sources/release-notes/release-notes-7-5-10.md b/docs/sources/release-notes/release-notes-7-5-10.md index 9de611faea51..5b5aa3a35059 100644 --- a/docs/sources/release-notes/release-notes-7-5-10.md +++ b/docs/sources/release-notes/release-notes-7-5-10.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-10/ title: Release notes for Grafana 7.5.10 --- diff --git a/docs/sources/release-notes/release-notes-7-5-11.md b/docs/sources/release-notes/release-notes-7-5-11.md index 696ed760aff4..6c258c57036a 100644 --- a/docs/sources/release-notes/release-notes-7-5-11.md +++ b/docs/sources/release-notes/release-notes-7-5-11.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-11/ title: Release notes for Grafana 7.5.11 --- diff --git a/docs/sources/release-notes/release-notes-7-5-12.md b/docs/sources/release-notes/release-notes-7-5-12.md index ce5909b0b695..df0e293c4cb2 100644 --- a/docs/sources/release-notes/release-notes-7-5-12.md +++ b/docs/sources/release-notes/release-notes-7-5-12.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-12/ title: Release notes for Grafana 7.5.12 --- diff --git a/docs/sources/release-notes/release-notes-7-5-13.md b/docs/sources/release-notes/release-notes-7-5-13.md index aedaae6e2c2e..e61ce4ef0692 100644 --- a/docs/sources/release-notes/release-notes-7-5-13.md +++ b/docs/sources/release-notes/release-notes-7-5-13.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-13/ title: Release notes for Grafana 7.5.13 --- diff --git a/docs/sources/release-notes/release-notes-7-5-15.md b/docs/sources/release-notes/release-notes-7-5-15.md index 2ee4401990ff..3470e253ab2e 100644 --- a/docs/sources/release-notes/release-notes-7-5-15.md +++ b/docs/sources/release-notes/release-notes-7-5-15.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-15/ title: Release notes for Grafana 7.5.15 --- diff --git a/docs/sources/release-notes/release-notes-7-5-2.md b/docs/sources/release-notes/release-notes-7-5-2.md index 36da2f309c7d..c478a7e2e6bb 100644 --- a/docs/sources/release-notes/release-notes-7-5-2.md +++ b/docs/sources/release-notes/release-notes-7-5-2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-2/ title: Release notes for Grafana 7.5.2 --- diff --git a/docs/sources/release-notes/release-notes-7-5-3.md b/docs/sources/release-notes/release-notes-7-5-3.md index 0ebe05c8e2cc..55c31305e9ca 100644 --- a/docs/sources/release-notes/release-notes-7-5-3.md +++ b/docs/sources/release-notes/release-notes-7-5-3.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-3/ title: Release notes for Grafana 7.5.3 --- diff --git a/docs/sources/release-notes/release-notes-7-5-4.md b/docs/sources/release-notes/release-notes-7-5-4.md index 3bfaa30a0640..2a2104614b60 100644 --- a/docs/sources/release-notes/release-notes-7-5-4.md +++ b/docs/sources/release-notes/release-notes-7-5-4.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-4/ title: Release notes for Grafana 7.5.4 --- diff --git a/docs/sources/release-notes/release-notes-7-5-5.md b/docs/sources/release-notes/release-notes-7-5-5.md index 3d11d2d05507..fb940024c884 100644 --- a/docs/sources/release-notes/release-notes-7-5-5.md +++ b/docs/sources/release-notes/release-notes-7-5-5.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-5/ title: Release notes for Grafana 7.5.5 --- diff --git a/docs/sources/release-notes/release-notes-7-5-6.md b/docs/sources/release-notes/release-notes-7-5-6.md index d9f28076f148..cf4598225a1c 100644 --- a/docs/sources/release-notes/release-notes-7-5-6.md +++ b/docs/sources/release-notes/release-notes-7-5-6.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-6/ title: Release notes for Grafana 7.5.6 --- diff --git a/docs/sources/release-notes/release-notes-7-5-7.md b/docs/sources/release-notes/release-notes-7-5-7.md index eb2e4b7eaea7..f52ca7a98d2a 100644 --- a/docs/sources/release-notes/release-notes-7-5-7.md +++ b/docs/sources/release-notes/release-notes-7-5-7.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-7/ title: Release notes for Grafana 7.5.7 --- diff --git a/docs/sources/release-notes/release-notes-7-5-8.md b/docs/sources/release-notes/release-notes-7-5-8.md index 558cbb6f16d5..f034be7dabee 100644 --- a/docs/sources/release-notes/release-notes-7-5-8.md +++ b/docs/sources/release-notes/release-notes-7-5-8.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-8/ title: Release notes for Grafana 7.5.8 --- diff --git a/docs/sources/release-notes/release-notes-7-5-9.md b/docs/sources/release-notes/release-notes-7-5-9.md index 067585d0000f..864d86586593 100644 --- a/docs/sources/release-notes/release-notes-7-5-9.md +++ b/docs/sources/release-notes/release-notes-7-5-9.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-7-5-9/ title: Release notes for Grafana 7.5.9 --- diff --git a/docs/sources/release-notes/release-notes-8-0-0-beta1.md b/docs/sources/release-notes/release-notes-8-0-0-beta1.md index 575c58df022b..371f77cb2960 100644 --- a/docs/sources/release-notes/release-notes-8-0-0-beta1.md +++ b/docs/sources/release-notes/release-notes-8-0-0-beta1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-0-0-beta1/ title: Release notes for Grafana 8.0.0-beta1 --- diff --git a/docs/sources/release-notes/release-notes-8-0-0-beta2.md b/docs/sources/release-notes/release-notes-8-0-0-beta2.md index 3537f0207c9b..cf4429112e3a 100644 --- a/docs/sources/release-notes/release-notes-8-0-0-beta2.md +++ b/docs/sources/release-notes/release-notes-8-0-0-beta2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-0-0-beta2/ title: Release notes for Grafana 8.0.0-beta2 --- diff --git a/docs/sources/release-notes/release-notes-8-0-0-beta3.md b/docs/sources/release-notes/release-notes-8-0-0-beta3.md index b3f6f95d2028..d34cc2c9e5a0 100644 --- a/docs/sources/release-notes/release-notes-8-0-0-beta3.md +++ b/docs/sources/release-notes/release-notes-8-0-0-beta3.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-0-0-beta3/ title: Release notes for Grafana 8.0.0-beta3 --- diff --git a/docs/sources/release-notes/release-notes-8-0-0.md b/docs/sources/release-notes/release-notes-8-0-0.md index 9d55ddc696c8..ce6d87ac25f8 100644 --- a/docs/sources/release-notes/release-notes-8-0-0.md +++ b/docs/sources/release-notes/release-notes-8-0-0.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-0-0/ title: Release notes for Grafana 8.0.0 --- diff --git a/docs/sources/release-notes/release-notes-8-0-1.md b/docs/sources/release-notes/release-notes-8-0-1.md index 33134bfb0fc6..95069611cc22 100644 --- a/docs/sources/release-notes/release-notes-8-0-1.md +++ b/docs/sources/release-notes/release-notes-8-0-1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-0-1/ title: Release notes for Grafana 8.0.1 --- diff --git a/docs/sources/release-notes/release-notes-8-0-2.md b/docs/sources/release-notes/release-notes-8-0-2.md index eb1f7ca5117f..e4eb4943c8f6 100644 --- a/docs/sources/release-notes/release-notes-8-0-2.md +++ b/docs/sources/release-notes/release-notes-8-0-2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-0-2/ title: Release notes for Grafana 8.0.2 --- diff --git a/docs/sources/release-notes/release-notes-8-0-3.md b/docs/sources/release-notes/release-notes-8-0-3.md index a09f610584f3..0958b0f4dffb 100644 --- a/docs/sources/release-notes/release-notes-8-0-3.md +++ b/docs/sources/release-notes/release-notes-8-0-3.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-0-3/ title: Release notes for Grafana 8.0.3 --- diff --git a/docs/sources/release-notes/release-notes-8-0-4.md b/docs/sources/release-notes/release-notes-8-0-4.md index 8a81795b4b27..9a174cd9c3f9 100644 --- a/docs/sources/release-notes/release-notes-8-0-4.md +++ b/docs/sources/release-notes/release-notes-8-0-4.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-0-4/ title: Release notes for Grafana 8.0.4 --- diff --git a/docs/sources/release-notes/release-notes-8-0-5.md b/docs/sources/release-notes/release-notes-8-0-5.md index 81695de84363..dfb9896dfbce 100644 --- a/docs/sources/release-notes/release-notes-8-0-5.md +++ b/docs/sources/release-notes/release-notes-8-0-5.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-0-5/ title: Release notes for Grafana 8.0.5 --- diff --git a/docs/sources/release-notes/release-notes-8-0-6.md b/docs/sources/release-notes/release-notes-8-0-6.md index 70d82510f693..4f216090b77f 100644 --- a/docs/sources/release-notes/release-notes-8-0-6.md +++ b/docs/sources/release-notes/release-notes-8-0-6.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-0-6/ title: Release notes for Grafana 8.0.6 --- diff --git a/docs/sources/release-notes/release-notes-8-0-7.md b/docs/sources/release-notes/release-notes-8-0-7.md index 867dc7efaaab..aac854a8f6c5 100644 --- a/docs/sources/release-notes/release-notes-8-0-7.md +++ b/docs/sources/release-notes/release-notes-8-0-7.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-0-7/ title: Release notes for Grafana 8.0.7 --- diff --git a/docs/sources/release-notes/release-notes-8-1-0-beta1.md b/docs/sources/release-notes/release-notes-8-1-0-beta1.md index 9d18c2d371bd..5f22c67368a6 100644 --- a/docs/sources/release-notes/release-notes-8-1-0-beta1.md +++ b/docs/sources/release-notes/release-notes-8-1-0-beta1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-0-beta1/ title: Release notes for Grafana 8.1.0-beta1 --- diff --git a/docs/sources/release-notes/release-notes-8-1-0-beta2.md b/docs/sources/release-notes/release-notes-8-1-0-beta2.md index 934499857834..0782b758daa2 100644 --- a/docs/sources/release-notes/release-notes-8-1-0-beta2.md +++ b/docs/sources/release-notes/release-notes-8-1-0-beta2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-0-beta2/ title: Release notes for Grafana 8.1.0-beta2 --- diff --git a/docs/sources/release-notes/release-notes-8-1-0-beta3.md b/docs/sources/release-notes/release-notes-8-1-0-beta3.md index 9b787bce3ab4..accf7ca7d45d 100644 --- a/docs/sources/release-notes/release-notes-8-1-0-beta3.md +++ b/docs/sources/release-notes/release-notes-8-1-0-beta3.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-0-beta3/ title: Release notes for Grafana 8.1.0-beta3 --- diff --git a/docs/sources/release-notes/release-notes-8-1-0.md b/docs/sources/release-notes/release-notes-8-1-0.md index 79e2cd18c382..3e384e2021ef 100644 --- a/docs/sources/release-notes/release-notes-8-1-0.md +++ b/docs/sources/release-notes/release-notes-8-1-0.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-0/ title: Release notes for Grafana 8.1.0 --- diff --git a/docs/sources/release-notes/release-notes-8-1-1.md b/docs/sources/release-notes/release-notes-8-1-1.md index 37fd61e6c178..cff0d6e1bcdc 100644 --- a/docs/sources/release-notes/release-notes-8-1-1.md +++ b/docs/sources/release-notes/release-notes-8-1-1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-1/ title: Release notes for Grafana 8.1.1 --- diff --git a/docs/sources/release-notes/release-notes-8-1-2.md b/docs/sources/release-notes/release-notes-8-1-2.md index d603be55d376..15e9e2cadc49 100644 --- a/docs/sources/release-notes/release-notes-8-1-2.md +++ b/docs/sources/release-notes/release-notes-8-1-2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-2/ title: Release notes for Grafana 8.1.2 --- diff --git a/docs/sources/release-notes/release-notes-8-1-3.md b/docs/sources/release-notes/release-notes-8-1-3.md index ac9195f6b548..df829e7434fe 100644 --- a/docs/sources/release-notes/release-notes-8-1-3.md +++ b/docs/sources/release-notes/release-notes-8-1-3.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-3/ title: Release notes for Grafana 8.1.3 --- diff --git a/docs/sources/release-notes/release-notes-8-1-4.md b/docs/sources/release-notes/release-notes-8-1-4.md index 39d9a97e4190..728e5db47d44 100644 --- a/docs/sources/release-notes/release-notes-8-1-4.md +++ b/docs/sources/release-notes/release-notes-8-1-4.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-4/ title: Release notes for Grafana 8.1.4 --- diff --git a/docs/sources/release-notes/release-notes-8-1-5.md b/docs/sources/release-notes/release-notes-8-1-5.md index 89bc8433dc8c..afbbf4ffabde 100644 --- a/docs/sources/release-notes/release-notes-8-1-5.md +++ b/docs/sources/release-notes/release-notes-8-1-5.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-5/ title: Release notes for Grafana 8.1.5 --- diff --git a/docs/sources/release-notes/release-notes-8-1-6.md b/docs/sources/release-notes/release-notes-8-1-6.md index 3552f54eede2..b9a8824cdfaa 100644 --- a/docs/sources/release-notes/release-notes-8-1-6.md +++ b/docs/sources/release-notes/release-notes-8-1-6.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-6/ title: Release notes for Grafana 8.1.6 --- diff --git a/docs/sources/release-notes/release-notes-8-1-7.md b/docs/sources/release-notes/release-notes-8-1-7.md index ab3d83e0f9a5..881bb675298c 100644 --- a/docs/sources/release-notes/release-notes-8-1-7.md +++ b/docs/sources/release-notes/release-notes-8-1-7.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-7/ title: Release notes for Grafana 8.1.7 --- diff --git a/docs/sources/release-notes/release-notes-8-1-8.md b/docs/sources/release-notes/release-notes-8-1-8.md index dc7cd936edff..5c40a3fbb2db 100644 --- a/docs/sources/release-notes/release-notes-8-1-8.md +++ b/docs/sources/release-notes/release-notes-8-1-8.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-1-8/ title: Release notes for Grafana 8.1.8 --- diff --git a/docs/sources/release-notes/release-notes-8-2-0-beta1.md b/docs/sources/release-notes/release-notes-8-2-0-beta1.md index 2cb0419bb961..4ea05ce9f01e 100644 --- a/docs/sources/release-notes/release-notes-8-2-0-beta1.md +++ b/docs/sources/release-notes/release-notes-8-2-0-beta1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-2-0-beta1/ title: Release notes for Grafana 8.2.0-beta1 --- diff --git a/docs/sources/release-notes/release-notes-8-2-0-beta2.md b/docs/sources/release-notes/release-notes-8-2-0-beta2.md index 46eb5050b813..096e061496fd 100644 --- a/docs/sources/release-notes/release-notes-8-2-0-beta2.md +++ b/docs/sources/release-notes/release-notes-8-2-0-beta2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-2-0-beta2/ title: Release notes for Grafana 8.2.0-beta2 --- diff --git a/docs/sources/release-notes/release-notes-8-2-0.md b/docs/sources/release-notes/release-notes-8-2-0.md index 2ee72e73ca4e..fe578e10fa56 100644 --- a/docs/sources/release-notes/release-notes-8-2-0.md +++ b/docs/sources/release-notes/release-notes-8-2-0.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-2-0/ title: Release notes for Grafana 8.2.0 --- diff --git a/docs/sources/release-notes/release-notes-8-2-1.md b/docs/sources/release-notes/release-notes-8-2-1.md index 07dfd6dd33ba..12a1c16627ad 100644 --- a/docs/sources/release-notes/release-notes-8-2-1.md +++ b/docs/sources/release-notes/release-notes-8-2-1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-2-1/ title: Release notes for Grafana 8.2.1 --- diff --git a/docs/sources/release-notes/release-notes-8-2-2.md b/docs/sources/release-notes/release-notes-8-2-2.md index baf4a83c2103..436574112716 100644 --- a/docs/sources/release-notes/release-notes-8-2-2.md +++ b/docs/sources/release-notes/release-notes-8-2-2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-2-2/ title: Release notes for Grafana 8.2.2 --- diff --git a/docs/sources/release-notes/release-notes-8-2-3.md b/docs/sources/release-notes/release-notes-8-2-3.md index 65de6a479e3e..c4cd158bd00e 100644 --- a/docs/sources/release-notes/release-notes-8-2-3.md +++ b/docs/sources/release-notes/release-notes-8-2-3.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-2-3/ title: Release notes for Grafana 8.2.3 --- diff --git a/docs/sources/release-notes/release-notes-8-2-4.md b/docs/sources/release-notes/release-notes-8-2-4.md index 3295bb09be50..d06750adcd23 100644 --- a/docs/sources/release-notes/release-notes-8-2-4.md +++ b/docs/sources/release-notes/release-notes-8-2-4.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-2-4/ title: Release notes for Grafana 8.2.4 --- diff --git a/docs/sources/release-notes/release-notes-8-2-5.md b/docs/sources/release-notes/release-notes-8-2-5.md index 83cdaa52f7fc..542f391f7952 100644 --- a/docs/sources/release-notes/release-notes-8-2-5.md +++ b/docs/sources/release-notes/release-notes-8-2-5.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-2-5/ title: Release notes for Grafana 8.2.5 --- diff --git a/docs/sources/release-notes/release-notes-8-2-6.md b/docs/sources/release-notes/release-notes-8-2-6.md index 30b0f8fdbc81..3e671d3025d0 100644 --- a/docs/sources/release-notes/release-notes-8-2-6.md +++ b/docs/sources/release-notes/release-notes-8-2-6.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-2-6/ title: Release notes for Grafana 8.2.6 --- diff --git a/docs/sources/release-notes/release-notes-8-2-7.md b/docs/sources/release-notes/release-notes-8-2-7.md index 41889816f450..ea4e741c1161 100644 --- a/docs/sources/release-notes/release-notes-8-2-7.md +++ b/docs/sources/release-notes/release-notes-8-2-7.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-2-7/ title: Release notes for Grafana 8.2.7 --- diff --git a/docs/sources/release-notes/release-notes-8-3-0-beta1.md b/docs/sources/release-notes/release-notes-8-3-0-beta1.md index 005f46a6110b..ff4419e36114 100644 --- a/docs/sources/release-notes/release-notes-8-3-0-beta1.md +++ b/docs/sources/release-notes/release-notes-8-3-0-beta1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-3-0-beta1/ title: Release notes for Grafana 8.3.0-beta1 --- diff --git a/docs/sources/release-notes/release-notes-8-3-0-beta2.md b/docs/sources/release-notes/release-notes-8-3-0-beta2.md index fa148d686c5c..a60d31768cfa 100644 --- a/docs/sources/release-notes/release-notes-8-3-0-beta2.md +++ b/docs/sources/release-notes/release-notes-8-3-0-beta2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-3-0-beta2/ title: Release notes for Grafana 8.3.0-beta2 --- diff --git a/docs/sources/release-notes/release-notes-8-3-0.md b/docs/sources/release-notes/release-notes-8-3-0.md index 5d6f89e8f45b..1e194c5a0f73 100644 --- a/docs/sources/release-notes/release-notes-8-3-0.md +++ b/docs/sources/release-notes/release-notes-8-3-0.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-3-0/ title: Release notes for Grafana 8.3.0 --- diff --git a/docs/sources/release-notes/release-notes-8-3-1.md b/docs/sources/release-notes/release-notes-8-3-1.md index b81e2ea4c122..3d7503f75a8a 100644 --- a/docs/sources/release-notes/release-notes-8-3-1.md +++ b/docs/sources/release-notes/release-notes-8-3-1.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-3-1/ title: Release notes for Grafana 8.3.1 --- diff --git a/docs/sources/release-notes/release-notes-8-3-11.md b/docs/sources/release-notes/release-notes-8-3-11.md index a8f5a760edbb..05d0b7ebd5fd 100644 --- a/docs/sources/release-notes/release-notes-8-3-11.md +++ b/docs/sources/release-notes/release-notes-8-3-11.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 8.3.11" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 8.3.11 +--- diff --git a/docs/sources/release-notes/release-notes-8-3-2.md b/docs/sources/release-notes/release-notes-8-3-2.md index fbef2cbe78b7..fe46ed1be0b5 100644 --- a/docs/sources/release-notes/release-notes-8-3-2.md +++ b/docs/sources/release-notes/release-notes-8-3-2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-3-2/ title: Release notes for Grafana 8.3.2 --- diff --git a/docs/sources/release-notes/release-notes-8-3-3.md b/docs/sources/release-notes/release-notes-8-3-3.md index 49ce9619d911..4545111b4ebd 100644 --- a/docs/sources/release-notes/release-notes-8-3-3.md +++ b/docs/sources/release-notes/release-notes-8-3-3.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-3-3/ title: Release notes for Grafana 8.3.3 --- diff --git a/docs/sources/release-notes/release-notes-8-3-4.md b/docs/sources/release-notes/release-notes-8-3-4.md index 75ad4f5eeecd..f5396d6d7e7f 100644 --- a/docs/sources/release-notes/release-notes-8-3-4.md +++ b/docs/sources/release-notes/release-notes-8-3-4.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-3-4/ title: Release notes for Grafana 8.3.4 --- diff --git a/docs/sources/release-notes/release-notes-8-3-5.md b/docs/sources/release-notes/release-notes-8-3-5.md index bad3dfeab4f5..8d3e5c5ebd4f 100644 --- a/docs/sources/release-notes/release-notes-8-3-5.md +++ b/docs/sources/release-notes/release-notes-8-3-5.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-3-5/ title: Release notes for Grafana 8.3.5 --- diff --git a/docs/sources/release-notes/release-notes-8-3-6.md b/docs/sources/release-notes/release-notes-8-3-6.md index 0fe48979fd61..919e3c4b946b 100644 --- a/docs/sources/release-notes/release-notes-8-3-6.md +++ b/docs/sources/release-notes/release-notes-8-3-6.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-3-6/ hide_menu: true title: Release notes for Grafana 8.3.6 --- diff --git a/docs/sources/release-notes/release-notes-8-3-7.md b/docs/sources/release-notes/release-notes-8-3-7.md index 4960d7a642f2..b48f6d7949af 100644 --- a/docs/sources/release-notes/release-notes-8-3-7.md +++ b/docs/sources/release-notes/release-notes-8-3-7.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-3-7/ hide_menu: true title: Release notes for Grafana 8.3.7 --- diff --git a/docs/sources/release-notes/release-notes-8-4-0-beta1.md b/docs/sources/release-notes/release-notes-8-4-0-beta1.md index a42d02c34de1..7328e2abd204 100644 --- a/docs/sources/release-notes/release-notes-8-4-0-beta1.md +++ b/docs/sources/release-notes/release-notes-8-4-0-beta1.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-4-0-beta1/ hide_menu: true title: Release notes for Grafana 8.4.0-beta1 --- diff --git a/docs/sources/release-notes/release-notes-8-4-0.md b/docs/sources/release-notes/release-notes-8-4-0.md index c36fbfeff247..dbb92df633f9 100644 --- a/docs/sources/release-notes/release-notes-8-4-0.md +++ b/docs/sources/release-notes/release-notes-8-4-0.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-4-0/ hide_menu: true title: Release notes for Grafana 8.4.0 --- diff --git a/docs/sources/release-notes/release-notes-8-4-1.md b/docs/sources/release-notes/release-notes-8-4-1.md index 7fc8112ec9da..a9be18ca3947 100644 --- a/docs/sources/release-notes/release-notes-8-4-1.md +++ b/docs/sources/release-notes/release-notes-8-4-1.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-4-1/ hide_menu: true title: Release notes for Grafana 8.4.1 --- diff --git a/docs/sources/release-notes/release-notes-8-4-10.md b/docs/sources/release-notes/release-notes-8-4-10.md index f81cee61ec09..cac1371f5729 100644 --- a/docs/sources/release-notes/release-notes-8-4-10.md +++ b/docs/sources/release-notes/release-notes-8-4-10.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 8.4.10" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 8.4.10 +--- diff --git a/docs/sources/release-notes/release-notes-8-4-11.md b/docs/sources/release-notes/release-notes-8-4-11.md index a4d2aa10118e..413ccbfe301a 100644 --- a/docs/sources/release-notes/release-notes-8-4-11.md +++ b/docs/sources/release-notes/release-notes-8-4-11.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 8.4.11" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 8.4.11 +--- diff --git a/docs/sources/release-notes/release-notes-8-4-2.md b/docs/sources/release-notes/release-notes-8-4-2.md index 7ee5e08c0cad..ecece22c9e20 100644 --- a/docs/sources/release-notes/release-notes-8-4-2.md +++ b/docs/sources/release-notes/release-notes-8-4-2.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-4-2/ hide_menu: true title: Release notes for Grafana 8.4.2 --- diff --git a/docs/sources/release-notes/release-notes-8-4-3.md b/docs/sources/release-notes/release-notes-8-4-3.md index c4521f3eadd8..3bbe37a97511 100644 --- a/docs/sources/release-notes/release-notes-8-4-3.md +++ b/docs/sources/release-notes/release-notes-8-4-3.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-4-3/ hide_menu: true title: Release notes for Grafana 8.4.3 --- diff --git a/docs/sources/release-notes/release-notes-8-4-4.md b/docs/sources/release-notes/release-notes-8-4-4.md index a9c10e8d371d..49afa4910130 100644 --- a/docs/sources/release-notes/release-notes-8-4-4.md +++ b/docs/sources/release-notes/release-notes-8-4-4.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-4-4/ hide_menu: true title: Release notes for Grafana 8.4.4 --- diff --git a/docs/sources/release-notes/release-notes-8-4-5.md b/docs/sources/release-notes/release-notes-8-4-5.md index a3849b080116..5c7d6c499d5e 100644 --- a/docs/sources/release-notes/release-notes-8-4-5.md +++ b/docs/sources/release-notes/release-notes-8-4-5.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-4-5/ hide_menu: true title: Release notes for Grafana 8.4.5 --- diff --git a/docs/sources/release-notes/release-notes-8-4-6.md b/docs/sources/release-notes/release-notes-8-4-6.md index 660e679236c5..123a029cda77 100644 --- a/docs/sources/release-notes/release-notes-8-4-6.md +++ b/docs/sources/release-notes/release-notes-8-4-6.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-4-6/ hide_menu: true title: Release notes for Grafana 8.4.6 --- diff --git a/docs/sources/release-notes/release-notes-8-4-7.md b/docs/sources/release-notes/release-notes-8-4-7.md index 565f843bb04b..24564ba6d936 100644 --- a/docs/sources/release-notes/release-notes-8-4-7.md +++ b/docs/sources/release-notes/release-notes-8-4-7.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-4-7/ hide_menu: true title: Release notes for Grafana 8.4.7 --- diff --git a/docs/sources/release-notes/release-notes-8-5-0-beta1.md b/docs/sources/release-notes/release-notes-8-5-0-beta1.md index e5f09a3e03d1..6cd5eb6a4c13 100644 --- a/docs/sources/release-notes/release-notes-8-5-0-beta1.md +++ b/docs/sources/release-notes/release-notes-8-5-0-beta1.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-5-0-beta1/ hide_menu: true title: Release notes for Grafana 8.5.0-beta1 --- diff --git a/docs/sources/release-notes/release-notes-8-5-0.md b/docs/sources/release-notes/release-notes-8-5-0.md index 3a7449518d44..9ea04a4b2490 100644 --- a/docs/sources/release-notes/release-notes-8-5-0.md +++ b/docs/sources/release-notes/release-notes-8-5-0.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-5-0/ hide_menu: true title: Release notes for Grafana 8.5.0 --- diff --git a/docs/sources/release-notes/release-notes-8-5-1.md b/docs/sources/release-notes/release-notes-8-5-1.md index a6c3944a4c72..e5ad6085d174 100644 --- a/docs/sources/release-notes/release-notes-8-5-1.md +++ b/docs/sources/release-notes/release-notes-8-5-1.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-5-1/ hide_menu: true title: Release notes for Grafana 8.5.1 --- diff --git a/docs/sources/release-notes/release-notes-8-5-10.md b/docs/sources/release-notes/release-notes-8-5-10.md index c2e0fab8c1b1..20a9851fb8ac 100644 --- a/docs/sources/release-notes/release-notes-8-5-10.md +++ b/docs/sources/release-notes/release-notes-8-5-10.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 8.5.10" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 8.5.10 +--- diff --git a/docs/sources/release-notes/release-notes-8-5-11.md b/docs/sources/release-notes/release-notes-8-5-11.md index ccf136756775..a5faa53f168a 100644 --- a/docs/sources/release-notes/release-notes-8-5-11.md +++ b/docs/sources/release-notes/release-notes-8-5-11.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 8.5.11" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 8.5.11 +--- diff --git a/docs/sources/release-notes/release-notes-8-5-13.md b/docs/sources/release-notes/release-notes-8-5-13.md index 62efce36d673..c407e0459480 100644 --- a/docs/sources/release-notes/release-notes-8-5-13.md +++ b/docs/sources/release-notes/release-notes-8-5-13.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 8.5.13" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 8.5.13 +--- diff --git a/docs/sources/release-notes/release-notes-8-5-2.md b/docs/sources/release-notes/release-notes-8-5-2.md index 57f9502beaa0..8da0882f8d3e 100644 --- a/docs/sources/release-notes/release-notes-8-5-2.md +++ b/docs/sources/release-notes/release-notes-8-5-2.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-5-2/ hide_menu: true title: Release notes for Grafana 8.5.2 --- diff --git a/docs/sources/release-notes/release-notes-8-5-3.md b/docs/sources/release-notes/release-notes-8-5-3.md index f4848a273317..e1cf44deacd7 100644 --- a/docs/sources/release-notes/release-notes-8-5-3.md +++ b/docs/sources/release-notes/release-notes-8-5-3.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-8-5-3/ hide_menu: true title: Release notes for Grafana 8.5.3 --- diff --git a/docs/sources/release-notes/release-notes-8-5-4.md b/docs/sources/release-notes/release-notes-8-5-4.md index b50c99dac13c..9d96406c0db5 100644 --- a/docs/sources/release-notes/release-notes-8-5-4.md +++ b/docs/sources/release-notes/release-notes-8-5-4.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 8.5.4" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 8.5.4 +--- diff --git a/docs/sources/release-notes/release-notes-8-5-5.md b/docs/sources/release-notes/release-notes-8-5-5.md index 2696a0c72377..dbc87678b43e 100644 --- a/docs/sources/release-notes/release-notes-8-5-5.md +++ b/docs/sources/release-notes/release-notes-8-5-5.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 8.5.5" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 8.5.5 +--- diff --git a/docs/sources/release-notes/release-notes-8-5-6.md b/docs/sources/release-notes/release-notes-8-5-6.md index f21b52225247..bdf949ce6aac 100644 --- a/docs/sources/release-notes/release-notes-8-5-6.md +++ b/docs/sources/release-notes/release-notes-8-5-6.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 8.5.6" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 8.5.6 +--- diff --git a/docs/sources/release-notes/release-notes-8-5-9.md b/docs/sources/release-notes/release-notes-8-5-9.md index e987a00e6dea..49f82d4c27dc 100644 --- a/docs/sources/release-notes/release-notes-8-5-9.md +++ b/docs/sources/release-notes/release-notes-8-5-9.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 8.5.9" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 8.5.9 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-0-beta1.md b/docs/sources/release-notes/release-notes-9-0-0-beta1.md index f105c03a0582..7160d3f01763 100644 --- a/docs/sources/release-notes/release-notes-9-0-0-beta1.md +++ b/docs/sources/release-notes/release-notes-9-0-0-beta1.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/release-notes/release-notes-9-0-0-beta1/ hide_menu: true title: Release notes for Grafana 9.0.0-beta1 --- diff --git a/docs/sources/release-notes/release-notes-9-0-0-beta2.md b/docs/sources/release-notes/release-notes-9-0-0-beta2.md index 068c62952871..811604742c0d 100644 --- a/docs/sources/release-notes/release-notes-9-0-0-beta2.md +++ b/docs/sources/release-notes/release-notes-9-0-0-beta2.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.0-beta2" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.0-beta2 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-0-beta3.md b/docs/sources/release-notes/release-notes-9-0-0-beta3.md index 5a0f94874648..5f73419fbe72 100644 --- a/docs/sources/release-notes/release-notes-9-0-0-beta3.md +++ b/docs/sources/release-notes/release-notes-9-0-0-beta3.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.0-beta3" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.0-beta3 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-0.md b/docs/sources/release-notes/release-notes-9-0-0.md index ea30b9891547..bacaba15f6e2 100644 --- a/docs/sources/release-notes/release-notes-9-0-0.md +++ b/docs/sources/release-notes/release-notes-9-0-0.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.0" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.0 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-1.md b/docs/sources/release-notes/release-notes-9-0-1.md index 63a0eeea6e5d..58e2f6aea35d 100644 --- a/docs/sources/release-notes/release-notes-9-0-1.md +++ b/docs/sources/release-notes/release-notes-9-0-1.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.1" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.1 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-2.md b/docs/sources/release-notes/release-notes-9-0-2.md index 7b635b2d6f33..fef9d9adedf6 100644 --- a/docs/sources/release-notes/release-notes-9-0-2.md +++ b/docs/sources/release-notes/release-notes-9-0-2.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.2" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.2 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-3.md b/docs/sources/release-notes/release-notes-9-0-3.md index 97e7751754f9..070e53ab1284 100644 --- a/docs/sources/release-notes/release-notes-9-0-3.md +++ b/docs/sources/release-notes/release-notes-9-0-3.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.3" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.3 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-4.md b/docs/sources/release-notes/release-notes-9-0-4.md index 46e1d4aa4a9c..46be0d0f2a24 100644 --- a/docs/sources/release-notes/release-notes-9-0-4.md +++ b/docs/sources/release-notes/release-notes-9-0-4.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.4" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.4 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-5.md b/docs/sources/release-notes/release-notes-9-0-5.md index 135f9d1828fe..e89077d163ee 100644 --- a/docs/sources/release-notes/release-notes-9-0-5.md +++ b/docs/sources/release-notes/release-notes-9-0-5.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.5" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.5 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-6.md b/docs/sources/release-notes/release-notes-9-0-6.md index 3d7f470aa5d8..ee8e7d834892 100644 --- a/docs/sources/release-notes/release-notes-9-0-6.md +++ b/docs/sources/release-notes/release-notes-9-0-6.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.6" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.6 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-7.md b/docs/sources/release-notes/release-notes-9-0-7.md index 65efd607972b..5e1a54e4e7f9 100644 --- a/docs/sources/release-notes/release-notes-9-0-7.md +++ b/docs/sources/release-notes/release-notes-9-0-7.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.7" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.7 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-8.md b/docs/sources/release-notes/release-notes-9-0-8.md index 4c8f5f5716ae..30f023c34bfa 100644 --- a/docs/sources/release-notes/release-notes-9-0-8.md +++ b/docs/sources/release-notes/release-notes-9-0-8.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.8" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.8 +--- diff --git a/docs/sources/release-notes/release-notes-9-0-9.md b/docs/sources/release-notes/release-notes-9-0-9.md index 2dc81a36a951..25ab2cb0f5a1 100644 --- a/docs/sources/release-notes/release-notes-9-0-9.md +++ b/docs/sources/release-notes/release-notes-9-0-9.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.0.9" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.0.9 +--- diff --git a/docs/sources/release-notes/release-notes-9-1-0-beta1.md b/docs/sources/release-notes/release-notes-9-1-0-beta1.md index 349881dd2b3b..a3288ec38266 100644 --- a/docs/sources/release-notes/release-notes-9-1-0-beta1.md +++ b/docs/sources/release-notes/release-notes-9-1-0-beta1.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.1.0-beta1" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.1.0-beta1 +--- diff --git a/docs/sources/release-notes/release-notes-9-1-0.md b/docs/sources/release-notes/release-notes-9-1-0.md index 5e0c580f81d5..e31583709afc 100644 --- a/docs/sources/release-notes/release-notes-9-1-0.md +++ b/docs/sources/release-notes/release-notes-9-1-0.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.1.0" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.1.0 +--- diff --git a/docs/sources/release-notes/release-notes-9-1-1.md b/docs/sources/release-notes/release-notes-9-1-1.md index f4988b3f3691..b9cd5af8ef83 100644 --- a/docs/sources/release-notes/release-notes-9-1-1.md +++ b/docs/sources/release-notes/release-notes-9-1-1.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.1.1" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.1.1 +--- diff --git a/docs/sources/release-notes/release-notes-9-1-2.md b/docs/sources/release-notes/release-notes-9-1-2.md index 8237fd63d460..ef7dc3f66437 100644 --- a/docs/sources/release-notes/release-notes-9-1-2.md +++ b/docs/sources/release-notes/release-notes-9-1-2.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.1.2" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.1.2 +--- diff --git a/docs/sources/release-notes/release-notes-9-1-3.md b/docs/sources/release-notes/release-notes-9-1-3.md index 139c6b182913..e237c765ab47 100644 --- a/docs/sources/release-notes/release-notes-9-1-3.md +++ b/docs/sources/release-notes/release-notes-9-1-3.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.1.3" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.1.3 +--- diff --git a/docs/sources/release-notes/release-notes-9-1-4.md b/docs/sources/release-notes/release-notes-9-1-4.md index a9778ed95fbe..4d2e6734936c 100644 --- a/docs/sources/release-notes/release-notes-9-1-4.md +++ b/docs/sources/release-notes/release-notes-9-1-4.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.1.4" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.1.4 +--- diff --git a/docs/sources/release-notes/release-notes-9-1-5.md b/docs/sources/release-notes/release-notes-9-1-5.md index a86bfb42d52c..4e4605b0a9ed 100644 --- a/docs/sources/release-notes/release-notes-9-1-5.md +++ b/docs/sources/release-notes/release-notes-9-1-5.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.1.5" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.1.5 +--- diff --git a/docs/sources/release-notes/release-notes-9-1-6.md b/docs/sources/release-notes/release-notes-9-1-6.md index 9947608b29ba..483e08d8f9c8 100644 --- a/docs/sources/release-notes/release-notes-9-1-6.md +++ b/docs/sources/release-notes/release-notes-9-1-6.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.1.6" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.1.6 +--- diff --git a/docs/sources/release-notes/release-notes-9-1-7.md b/docs/sources/release-notes/release-notes-9-1-7.md index 1802941687a9..2025e4292e33 100644 --- a/docs/sources/release-notes/release-notes-9-1-7.md +++ b/docs/sources/release-notes/release-notes-9-1-7.md @@ -1,7 +1,8 @@ -+++ -title = "Release notes for Grafana 9.1.7" -hide_menu = true -+++ +--- +aliases: [] +hide_menu: true +title: Release notes for Grafana 9.1.7 +--- diff --git a/docs/sources/release-notes/release-notes-v7-4-2.md b/docs/sources/release-notes/release-notes-v7-4-2.md index 8588c9574fca..4fe9fbfc7600 100644 --- a/docs/sources/release-notes/release-notes-v7-4-2.md +++ b/docs/sources/release-notes/release-notes-v7-4-2.md @@ -1,8 +1,6 @@ --- _build: list: false -aliases: - - /docs/grafana/latest/release-notes/release-notes-v7-4-2/ title: undefined --- diff --git a/docs/sources/search/_index.md b/docs/sources/search/_index.md index 87774b094590..36e04caf1d3d 100644 --- a/docs/sources/search/_index.md +++ b/docs/sources/search/_index.md @@ -1,13 +1,13 @@ --- aliases: - - docs/grafana/latest/search/ -title: Search -menutitle: Search + - ./ description: Learn how to search for Grafana dashboards -weight: 80 keywords: - search - dashboard +menutitle: Search +title: Search +weight: 80 --- # Search dashboards diff --git a/docs/sources/search/dashboard-previews/index.md b/docs/sources/search/dashboard-previews/index.md index bc200cf16cd1..ece9144fe4c3 100644 --- a/docs/sources/search/dashboard-previews/index.md +++ b/docs/sources/search/dashboard-previews/index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/dashboards/previews/ - - /docs/grafana/latest/reference/previews/ - - /docs/grafana/latest/search/dashboard-previews/ + - ../dashboards/previews/ + - ../reference/previews/ keywords: - grafana - dashboard diff --git a/docs/sources/setup-grafana/_index.md b/docs/sources/setup-grafana/_index.md index f15d7c5e4749..8ceb3153f606 100644 --- a/docs/sources/setup-grafana/_index.md +++ b/docs/sources/setup-grafana/_index.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/setup-grafana/ description: Includes topics for setting up a Grafana instance. title: Setup weight: 10 diff --git a/docs/sources/setup-grafana/configure-docker.md b/docs/sources/setup-grafana/configure-docker.md index ca44b5c3c470..14ec62d780d6 100644 --- a/docs/sources/setup-grafana/configure-docker.md +++ b/docs/sources/setup-grafana/configure-docker.md @@ -1,7 +1,7 @@ --- aliases: - - /docs/grafana/latest/administration/configure-docker/ - - /docs/grafana/latest/installation/configure-docker/ + - ../administration/configure-docker/ + - ../installation/configure-docker/ description: Guide for configuring the Grafana Docker image keywords: - grafana diff --git a/docs/sources/setup-grafana/configure-grafana/_index.md b/docs/sources/setup-grafana/configure-grafana/_index.md index d65948b83e02..ec7f3be2a733 100644 --- a/docs/sources/setup-grafana/configure-grafana/_index.md +++ b/docs/sources/setup-grafana/configure-grafana/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/administration/configuration/ - - /docs/grafana/latest/installation/configuration/ - - /docs/grafana/latest/setup-grafana/configure-grafana/ + - ../administration/configuration/ + - ../installation/configuration/ description: Configuration documentation title: Configure Grafana weight: 200 @@ -1755,6 +1754,12 @@ This option does not require any configuration. Options to configure a remote HTTP image rendering service, e.g. using https://github.com/grafana/grafana-image-renderer. +#### renderer_token + +> **Note**: Available in Grafana v9.1.2 and Image Renderer v3.6.1 or later. + +An auth token will be sent to and verified by the renderer. The renderer will deny any request without an auth token matching the one configured on the renderer. + ### server_url URL to a remote HTTP image renderer service, e.g. http://localhost:8081/render, will enable Grafana to render panels and dashboards to PNG-images using HTTP requests to an external service. diff --git a/docs/sources/setup-grafana/configure-grafana/configure-custom-branding.md b/docs/sources/setup-grafana/configure-grafana/configure-custom-branding.md index 6df0023ded6c..c47b91b5cdef 100644 --- a/docs/sources/setup-grafana/configure-grafana/configure-custom-branding.md +++ b/docs/sources/setup-grafana/configure-grafana/configure-custom-branding.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/enterprise/white-labeling/ - - /docs/grafana/latest/setup-grafana/enable-custom-branding/ - - /docs/grafana/latest/setup-grafana/configure-grafana/configure-custom-branding/ + - ../../enterprise/white-labeling/ + - ../enable-custom-branding/ description: Change the look of Grafana to match your corporate brand. title: Configure custom branding weight: 300 diff --git a/docs/sources/setup-grafana/configure-grafana/configure-tracing.md b/docs/sources/setup-grafana/configure-grafana/configure-tracing.md index 88c22e146bac..a89c05a815f9 100644 --- a/docs/sources/setup-grafana/configure-grafana/configure-tracing.md +++ b/docs/sources/setup-grafana/configure-grafana/configure-tracing.md @@ -1,10 +1,9 @@ --- aliases: - - /docs/grafana/latest/setup-grafana/enable-diagnostics/ - - /docs/grafana/latest/troubleshooting/diagnostics/ - - /docs/grafana/latest/setup-grafana/configure-grafana/configure-tracing/ -title: Configure tracing to troubleshoot Grafana + - ../../troubleshooting/diagnostics/ + - ../enable-diagnostics/ menuTitle: Configure tracing +title: Configure tracing to troubleshoot Grafana weight: 200 --- diff --git a/docs/sources/setup-grafana/configure-grafana/enterprise-configuration.md b/docs/sources/setup-grafana/configure-grafana/enterprise-configuration.md index 9d1d6abe8821..e0f61cf2a592 100644 --- a/docs/sources/setup-grafana/configure-grafana/enterprise-configuration.md +++ b/docs/sources/setup-grafana/configure-grafana/enterprise-configuration.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/enterprise-configuration/ - - /docs/grafana/latest/setup-grafana/configure-grafana/enterprise-configuration/ + - ../../enterprise/enterprise-configuration/ description: Learn about Grafana Enterprise configuration options that you can specify. title: Configure Grafana Enterprise weight: 100 diff --git a/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md new file mode 100644 index 000000000000..bb9b531c4118 --- /dev/null +++ b/docs/sources/setup-grafana/configure-grafana/feature-toggles/index.md @@ -0,0 +1,110 @@ +--- +description: Learn about toggles for experimental and beta features, which you can enable or disable. +title: Configure feature toggles +weight: 150 +--- + + + + +# Configure feature toggles + +You use feature toggles, also known as feature flags, to turn experimental or beta features on and off in Grafana. Although we do not recommend using these features in production, you can turn on feature toggles to try out new functionality in development or test environments. + +This page contains a list of available feature toggles. To learn how to turn on feature toggles, refer to our [Configure Grafana documentation]({{< relref "../_index.md/#feature_toggles" >}}). Feature toggles are also available to Grafana Cloud Advanced customers. If you use Grafana Cloud Advanced, you can open a support ticket and specify the feature toggles and stack for which you want them enabled. + +## Stable feature toggles + +Some stable features are enabled by default. You can disable a stable feature by setting the feature flag to "false" in the configuration. + +| Feature toggle name | Description | Enabled by default | +| ---------------------------- | --------------------------------------------------------------------------------------------------------------- | ------------------ | +| `promQueryBuilder` | Show Prometheus query builder | Yes | +| `disableEnvelopeEncryption` | Disable envelope encryption (emergency only) | | +| `database_metrics` | Add Prometheus metrics for database tables | | +| `lokiMonacoEditor` | Access to Monaco query editor for Loki | Yes | +| `featureHighlights` | Highlight Grafana Enterprise features | | +| `commandPalette` | Enable command palette | Yes | +| `cloudWatchDynamicLabels` | Use dynamic labels instead of alias patterns in CloudWatch datasource | Yes | +| `prometheusBufferedClient` | Enable buffered (old) client for Prometheus datasource as default instead of streaming JSON parser client (new) | | +| `internationalization` | Enables internationalization | Yes | +| `accessTokenExpirationCheck` | Enable OAuth access_token expiration check and token refresh using the refresh_token | | + +## Beta feature toggles + +| Feature toggle name | Description | +| --------------------------------- | ------------------------------------------------------------------------------- | +| `trimDefaults` | Use cue schema to remove values that will be applied automatically | +| `panelTitleSearch` | Search for dashboards using panel title | +| `prometheusAzureOverrideAudience` | Experimental. Allow override default AAD audience for Azure Prometheus endpoint | +| `swaggerUi` | Serves swagger UI | +| `migrationLocking` | Lock database during migrations | +| `newDBLibrary` | Use jmoiron/sqlx rather than xorm for a few backend services | +| `validateDashboardsOnSave` | Validate dashboard JSON POSTed to api/dashboards/db | +| `autoMigrateGraphPanels` | Replace the angular graph panel with timeseries | +| `datasourceLogger` | Logs all datasource requests | + +## Alpha feature toggles + +These features are early in their development lifecycle and so are not yet supported in Grafana Cloud. +Alpha features might be changed or removed without prior notice. + +| Feature toggle name | Description | +| ---------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `returnUnameHeader` | Return user login as header for authenticated requests | +| `alertingBigTransactions` | Use big transactions for alerting database writes | +| `dashboardPreviews` | Create and show thumbnails for dashboard search results | +| `live-config` | Save Grafana Live configuration in SQL tables | +| `live-pipeline` | Enable a generic live processing pipeline | +| `live-service-web-worker` | This will use a webworker thread to processes events rather than the main thread | +| `queryOverLive` | Use Grafana Live WebSocket to execute backend queries | +| `tempoApmTable` | Show APM table | +| `influxdbBackendMigration` | Query InfluxDB InfluxQL without the proxy | +| `publicDashboards` | Enables public access to dashboards | +| `lokiLive` | Support WebSocket streaming for loki (early prototype) | +| `lokiDataframeApi` | Use experimental loki api for WebSocket streaming (early prototype) | +| `dashboardComments` | Enable dashboard-wide comments | +| `annotationComments` | Enable annotation comments | +| `storage` | Configurable storage for dashboards, datasources, and resources | +| `exploreMixedDatasource` | Enable mixed datasource in Explore | +| `tracing` | Adds trace ID to error notifications | +| `correlations` | Correlations page | +| `datasourceQueryMultiStatus` | Introduce HTTP 207 Multi Status for api/ds/query | +| `traceToMetrics` | Enable trace to metrics links | +| `prometheusWideSeries` | Enable wide series responses in the Prometheus datasource | +| `canvasPanelNesting` | Allow elements nesting | +| `scenes` | Experimental framework to build interactive dashboards | +| `disableSecretsCompatibility` | Disable duplicated secret storage in legacy tables | +| `logRequestsInstrumentedAsUnknown` | Logs the path for requests that are instrumented as unknown | +| `dataConnectionsConsole` | Enables a new top-level page called Connections. This page is an experiment that provides a better experience when you install and configure data sources and other plugins. | +| `topnav` | New top nav and page layouts | +| `traceqlEditor` | Show the TraceQL editor in the explore page | +| `flameGraph` | Show the flame graph | +| `cloudWatchCrossAccountQuerying` | Use cross-account querying in CloudWatch datasource | +| `redshiftAsyncQueryDataSupport` | Enable async query data support for Redshift | +| `athenaAsyncQueryDataSupport` | Enable async query data support for Athena | +| `increaseInMemDatabaseQueryCache` | Enable more in memory caching for database queries | +| `newPanelChromeUI` | Show updated look and feel of grafana-ui PanelChrome: panel header, icons, and menu | +| `showDashboardValidationWarnings` | Show warnings when dashboards do not validate against the schema | +| `mysqlAnsiQuotes` | Use double quotes to escape keyword in a MySQL query | +| `elasticsearchBackendMigration` | Use Elasticsearch as backend data source | +| `secureSocksDatasourceProxy` | Enable secure socks tunneling for supported core datasources | +| `authnService` | Use new auth service to perform authentication | +| `sessionRemoteCache` | Enable using remote cache for user sessions | + +## Development feature toggles + +The following toggles require explicitly setting Grafana's [app mode]({{< relref "../_index.md/#app_mode" >}}) to 'development' before you can enable this feature toggle. These features tend to be experimental. + +| Feature toggle name | Description | +| -------------------------------------- | --------------------------------------------------------- | +| `dashboardPreviewsAdmin` | Manage the dashboard previews crawler process from the UI | +| `showFeatureFlagsInUI` | Show feature flags in the settings UI | +| `dashboardsFromStorage` | Load dashboards from the generic storage interface | +| `export` | Export grafana instance (to git, etc) | +| `azureMonitorResourcePickerForMetrics` | New UI for Azure Monitor Metrics Query | +| `grpcServer` | Run GRPC server | +| `entityStore` | SQL-based entity store (requires storage flag also) | +| `queryLibrary` | Reusable query library | +| `accessControlOnCall` | Access control primitives for OnCall | +| `nestedFolders` | Enable folder nesting | diff --git a/docs/sources/setup-grafana/configure-grafana/settings-updates-at-runtime/index.md b/docs/sources/setup-grafana/configure-grafana/settings-updates-at-runtime/index.md index 53d29c305b75..5196e85f63e9 100644 --- a/docs/sources/setup-grafana/configure-grafana/settings-updates-at-runtime/index.md +++ b/docs/sources/setup-grafana/configure-grafana/settings-updates-at-runtime/index.md @@ -1,6 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/settings-updates/ + - ../../enterprise/settings-updates/ description: Settings updates at runtime keywords: - grafana diff --git a/docs/sources/setup-grafana/configure-security/_index.md b/docs/sources/setup-grafana/configure-security/_index.md index 2da4bc1bd0b4..7cf77501cbfa 100644 --- a/docs/sources/setup-grafana/configure-security/_index.md +++ b/docs/sources/setup-grafana/configure-security/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/administration/security/ - - /docs/grafana/latest/installation/security/ - - /docs/grafana/latest/setup-grafana/configure-security/ + - ../administration/security/ + - ../installation/security/ description: Learn how to make Grafana secure. title: Configure security weight: 600 diff --git a/docs/sources/setup-grafana/configure-security/audit-grafana.md b/docs/sources/setup-grafana/configure-security/audit-grafana.md index 816d78495c56..0cddc1ca523c 100644 --- a/docs/sources/setup-grafana/configure-security/audit-grafana.md +++ b/docs/sources/setup-grafana/configure-security/audit-grafana.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/auditing/ - - /docs/grafana/latest/setup-grafana/configure-security/audit-grafana/ + - ../../enterprise/auditing/ description: Auditing keywords: - grafana diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md b/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md index 061e1f1a6648..6575bf6828a3 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/auth/overview/ - - /docs/grafana/latest/auth/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/ + - ../../auth/ + - ../../auth/overview/ description: Learn about all the ways in which you can configure Grafana to authenticate users. title: Configure authentication diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy.md b/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy.md index 9b425da7a475..19f8b653f5f6 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/auth-proxy.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/auth/auth-proxy/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/auth-proxy/ - - /docs/grafana/latest/tutorials/authproxy/ + - ../../../auth/auth-proxy/ + - ../../../tutorials/authproxy/ description: Grafana Auth Proxy Guide keywords: - grafana diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/azuread.md b/docs/sources/setup-grafana/configure-security/configure-authentication/azuread.md index 51b8a20b9097..db368406459f 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/azuread.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/azuread.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/auth/azuread/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/azuread/ + - ../../../auth/azuread/ description: Grafana Azure AD OAuth Guide keywords: - grafana diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced_ldap.md b/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced_ldap.md index f780596ad2a9..4b9af53be900 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced_ldap.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced_ldap.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/enhanced_ldap/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/enhanced_ldap/ + - ../../../enterprise/enhanced_ldap/ description: Grafana Enhanced LDAP Integration Guide keywords: - grafana diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth.md b/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth.md index 9d7c15b93a34..c1393ed86dbe 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/generic-oauth.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/auth/generic-oauth/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/generic-oauth/ + - ../../../auth/generic-oauth/ description: Grafana OAuthentication Guide keywords: - grafana diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/github.md b/docs/sources/setup-grafana/configure-security/configure-authentication/github.md index 39f769f87e12..baf3df4a8dd9 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/github.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/github.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/auth/github/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/github/ + - ../../../auth/github/ description: Grafana OAuthentication Guide keywords: - grafana diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab.md b/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab.md index a503795ddc49..ea6e867de1c5 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/gitlab.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/auth/gitlab/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/gitlab/ + - ../../../auth/gitlab/ description: Grafana OAuthentication Guide keywords: - grafana diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/google.md b/docs/sources/setup-grafana/configure-security/configure-authentication/google.md index 9024ecbea025..81f3c35001a3 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/google.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/google.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/auth/google/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/google/ + - ../../../auth/google/ description: Grafana OAuthentication Guide title: Configure Google OAuth2 Authentication weight: 300 @@ -53,3 +52,6 @@ You may allow users to sign-up via Google authentication by setting the `allow_sign_up` option to `true`. When this option is set to `true`, any user successfully authenticating via Google authentication will be automatically signed up. + +You may specify a domain to be passed as `hd` query parameter accepted by Google's +OAuth 2.0 authentication API. Refer to Google's OAuth [documentation](https://developers.google.com/identity/openid-connect/openid-connect#hd-param). diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/grafana.md b/docs/sources/setup-grafana/configure-security/configure-authentication/grafana.md index 9a79db900276..b9bc840eb7f8 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/grafana.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/grafana.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/auth/grafana/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/grafana/ + - ../../../auth/grafana/ description: Grafana OAuthentication Guide title: Configure Grafana authentication weight: 1000 diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/jwt.md b/docs/sources/setup-grafana/configure-security/configure-authentication/jwt.md index 50b7792b1257..3f268ff658bd 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/jwt.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/jwt.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/auth/jwt/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/jwt/ + - ../../../auth/jwt/ description: Grafana JWT Authentication title: Configure JWT Authentication weight: 500 diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/ldap.md b/docs/sources/setup-grafana/configure-security/configure-authentication/ldap.md index dcb6bf4b3f7c..22d805eaedb2 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/ldap.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/ldap.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/auth/ldap/ - - /docs/grafana/latest/installation/ldap/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/ldap/ + - ../../../auth/ldap/ + - ../../../installation/ldap/ description: Grafana LDAP Authentication Guide title: Configure LDAP Authentication weight: 800 diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/okta.md b/docs/sources/setup-grafana/configure-security/configure-authentication/okta.md index 49202442c0ea..eb62f1fa1b84 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/okta.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/okta.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/auth/okta/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/okta/ + - ../../../auth/okta/ description: Grafana Okta OAuth Guide title: Configure Okta OAuth2 authentication weight: 1200 diff --git a/docs/sources/setup-grafana/configure-security/configure-authentication/saml.md b/docs/sources/setup-grafana/configure-security/configure-authentication/saml.md index 1a2892c1bad8..948932f5ce14 100644 --- a/docs/sources/setup-grafana/configure-security/configure-authentication/saml.md +++ b/docs/sources/setup-grafana/configure-security/configure-authentication/saml.md @@ -1,14 +1,13 @@ --- aliases: - - /docs/grafana/latest/auth/saml/ - - /docs/grafana/latest/enterprise/configure-saml/ - - /docs/grafana/latest/enterprise/saml/ - - /docs/grafana/latest/enterprise/saml/about-saml/ - - /docs/grafana/latest/enterprise/saml/configure-saml/ - - /docs/grafana/latest/enterprise/saml/enable-saml/ - - /docs/grafana/latest/enterprise/saml/set-up-saml-with-okta/ - - /docs/grafana/latest/enterprise/saml/troubleshoot-saml/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-authentication/saml/ + - ../../../auth/saml/ + - ../../../enterprise/configure-saml/ + - ../../../enterprise/saml/ + - ../../../enterprise/saml/about-saml/ + - ../../../enterprise/saml/configure-saml/ + - ../../../enterprise/saml/enable-saml/ + - ../../../enterprise/saml/set-up-saml-with-okta/ + - ../../../enterprise/saml/troubleshoot-saml/ description: Learn how to configure SAML authentication in Grafana. menuTitle: Configure SAML authentication title: Configure SAML authentication in Grafana diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/_index.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/_index.md index 37846122072a..c5e0c81214eb 100644 --- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/_index.md +++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/administration/database-encryption/ - - /docs/grafana/latest/enterprise/enterprise-encryption/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-database-encryption/ + - ../../administration/database-encryption/ + - ../../enterprise/enterprise-encryption/ description: If you have a Grafana Enterprise license, you can integrate with a variety of key management system providers. title: Configure database encryption diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms.md index 365ca6aaa689..fd2135440f64 100644 --- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms.md +++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/enterprise-encryption/using-aws-kms-to-encrypt-database-secrets/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-aws-kms/ + - ../../../enterprise/enterprise-encryption/using-aws-kms-to-encrypt-database-secrets/ description: Learn how to use AWS KMS to encrypt secrets in the Grafana database. title: Encrypt database secrets using AWS KMS weight: 300 diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault.md index 3a2545ba54ff..f5cc49adc42c 100644 --- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault.md +++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/enterprise-encryption/using-azure-key-vault-to-encrypt-database-secrets/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-azure-key-vault/ + - ../../../enterprise/enterprise-encryption/using-azure-key-vault-to-encrypt-database-secrets/ description: Learn how to use Azure Key Vault to encrypt secrets in the Grafana database. title: Encrypt database secrets using Azure Key Vault weight: 400 diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms.md index 17be2f0eb0a9..08e192fbe60c 100644 --- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms.md +++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/enterprise-encryption/using-google-cloud-kms-to-encrypt-database-secrets/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-google-cloud-kms/ + - ../../../enterprise/enterprise-encryption/using-google-cloud-kms-to-encrypt-database-secrets/ description: Learn how to use Google Cloud KMS to encrypt secrets in the Grafana database. title: Encrypt database secrets using Google Cloud KMS weight: 100 diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault.md index 321a978093d9..78847138feb6 100644 --- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault.md +++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/enterprise-encryption/using-hashicorp-key-vault-to-encrypt-database-secrets/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-database-encryption/encrypt-secrets-using-hashicorp-key-vault/ + - ../../../enterprise/enterprise-encryption/using-hashicorp-key-vault-to-encrypt-database-secrets/ description: Learn how to use Hashicorp Vault to encrypt secrets in the Grafana database. title: Encrypt database secrets using Hashicorp Vault weight: 200 diff --git a/docs/sources/setup-grafana/configure-security/configure-database-encryption/integrate-with-hashicorp-vault.md b/docs/sources/setup-grafana/configure-security/configure-database-encryption/integrate-with-hashicorp-vault.md index 57764c77a9d3..de6b1090a5f1 100644 --- a/docs/sources/setup-grafana/configure-security/configure-database-encryption/integrate-with-hashicorp-vault.md +++ b/docs/sources/setup-grafana/configure-security/configure-database-encryption/integrate-with-hashicorp-vault.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/vault/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-database-encryption/integrate-with-hashicorp-vault/ + - ../../../enterprise/vault/ description: Learn how to integrate Grafana with Hashicorp Vault so that you can use secrets for configuration and provisioning. title: Integrate Grafana with Hashicorp Vault diff --git a/docs/sources/setup-grafana/configure-security/configure-request-security.md b/docs/sources/setup-grafana/configure-security/configure-request-security.md index d3d6a3a16d54..4d4f7eb46904 100644 --- a/docs/sources/setup-grafana/configure-security/configure-request-security.md +++ b/docs/sources/setup-grafana/configure-security/configure-request-security.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/request-security/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-request-security/ + - ../../enterprise/request-security/ description: Request security enables you to limit requests from the Grafana server by targeting requests generated by users, such as data source metric queries and alert notifications. diff --git a/docs/sources/setup-grafana/configure-security/configure-team-sync.md b/docs/sources/setup-grafana/configure-security/configure-team-sync.md index 4d3a7c30163d..82a1a6266f79 100644 --- a/docs/sources/setup-grafana/configure-security/configure-team-sync.md +++ b/docs/sources/setup-grafana/configure-security/configure-team-sync.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/auth/saml/ - - /docs/grafana/latest/auth/team-sync/ - - /docs/grafana/latest/enterprise/team-sync/ - - /docs/grafana/latest/setup-grafana/configure-security/configure-team-sync/ + - ../../auth/saml/ + - ../../auth/team-sync/ + - ../../enterprise/team-sync/ description: Learn how to use Team Sync to synchronize between your authentication provider teams and Grafana teams. title: Configure Team Sync diff --git a/docs/sources/setup-grafana/configure-security/export-logs.md b/docs/sources/setup-grafana/configure-security/export-logs.md index 89baf3852750..3f11dae3c87a 100644 --- a/docs/sources/setup-grafana/configure-security/export-logs.md +++ b/docs/sources/setup-grafana/configure-security/export-logs.md @@ -1,6 +1,6 @@ --- aliases: - - /docs/grafana/latest/enterprise/usage-insights/export-logs/ + - ../../enterprise/usage-insights/export-logs/ description: Export logs of usage insights keywords: - grafana @@ -44,6 +44,7 @@ Logs of usage insights contain the following fields, where the fields followed b | `panelName` | string | Name of the panel of the query. | | `error` | string | Error returned by the query. | | `duration` | number | Duration of the query. | +| `source` | string | Source of the query. For example, `dashboard` or `explore`. | | `orgId`\* | number | ID of the user’s organization. | | `orgName`\* | string | Name of the user’s organization. | | `timestamp`\* | string | The date and time that the request was made, in Coordinated Universal Time (UTC) in [RFC3339](https://tools.ietf.org/html/rfc3339#section-5.6) format. | diff --git a/docs/sources/setup-grafana/image-rendering/_index.md b/docs/sources/setup-grafana/image-rendering/_index.md index 5c61bed9254a..40ea9cf221aa 100644 --- a/docs/sources/setup-grafana/image-rendering/_index.md +++ b/docs/sources/setup-grafana/image-rendering/_index.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/administration/image_rendering/ - - /docs/grafana/latest/image-rendering/ - - /docs/grafana/latest/setup-grafana/image-rendering/ + - ../administration/image_rendering/ + - ../image-rendering/ description: Image rendering keywords: - grafana @@ -55,6 +54,34 @@ docker run -d --name=renderer --network=host -v /some/path/config.json:/usr/src/ You can see a docker-compose example using a custom configuration file [here](https://github.com/grafana/grafana-image-renderer/tree/master/devenv/docker/custom-config). +### Security + +> **Note:** This feature is available in Image Renderer v3.6.1 and later. + +You can restrict access to the rendering endpoint by specifying a secret token. The token should be configured in the Grafana configuration file and the renderer configuration file. This token is important when you run the plugin in remote rendering mode. + +Renderer versions v3.6.1 or later require a Grafana version with this feature. These include: + +- Grafana v9.1.2 or later +- Grafana v9.0.8 or later patch releases +- Grafana v8.5.11 or later patch releases +- Grafana v8.4.11 or later patch releases +- Grafana v8.3.11 or later patch releases + +```bash +AUTH_TOKEN=- +``` + +```json +{ + "security": { + "authToken": "-" + } +} +``` + +See the [Grafana configuration]({{< relref "../configure-grafana/#renderer_token" >}}) for how to configure the token in Grafana. + ### Rendering mode You can instruct how headless browser instances are created by configuring a rendering mode. Default is `default`, other supported values are `clustered` and `reusable`. diff --git a/docs/sources/setup-grafana/image-rendering/monitoring.md b/docs/sources/setup-grafana/image-rendering/monitoring.md index cf73246714d7..8dd2329a3b79 100644 --- a/docs/sources/setup-grafana/image-rendering/monitoring.md +++ b/docs/sources/setup-grafana/image-rendering/monitoring.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/image-rendering/monitoring/ - - /docs/grafana/latest/setup-grafana/image-rendering/monitoring/ + - ../../image-rendering/monitoring/ description: Image rendering monitoring keywords: - grafana diff --git a/docs/sources/setup-grafana/image-rendering/troubleshooting.md b/docs/sources/setup-grafana/image-rendering/troubleshooting.md index 2275d224309e..20d075dfcafb 100644 --- a/docs/sources/setup-grafana/image-rendering/troubleshooting.md +++ b/docs/sources/setup-grafana/image-rendering/troubleshooting.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/image-rendering/troubleshooting/ - - /docs/grafana/latest/setup-grafana/image-rendering/troubleshooting/ + - ../../image-rendering/troubleshooting/ description: Image rendering troubleshooting keywords: - grafana diff --git a/docs/sources/setup-grafana/installation/_index.md b/docs/sources/setup-grafana/installation/_index.md index ee8684eeaee5..4c5b4f476f66 100644 --- a/docs/sources/setup-grafana/installation/_index.md +++ b/docs/sources/setup-grafana/installation/_index.md @@ -1,10 +1,9 @@ --- aliases: - - /docs/grafana/latest/install/ - - /docs/grafana/latest/installation/ - - /docs/grafana/latest/installation/installation/ - - /docs/grafana/latest/installation/requirements/ - - /docs/grafana/latest/setup-grafana/installation/ + - ../install/ + - ../installation/ + - ../installation/installation/ + - ../installation/requirements/ - /docs/grafana/v2.1/installation/install/ description: Installation guide for Grafana title: Install Grafana diff --git a/docs/sources/setup-grafana/installation/debian.md b/docs/sources/setup-grafana/installation/debian.md index a7add632e2d4..70f7b24fe90d 100644 --- a/docs/sources/setup-grafana/installation/debian.md +++ b/docs/sources/setup-grafana/installation/debian.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/installation/debian/ - - /docs/grafana/latest/installation/installation/debian/ - - /docs/grafana/latest/setup-grafana/installation/debian/ + - ../../installation/debian/ + - ../../installation/installation/debian/ description: Install guide for Grafana on Debian or Ubuntu title: Install on Debian or Ubuntu weight: 100 diff --git a/docs/sources/setup-grafana/installation/docker.md b/docs/sources/setup-grafana/installation/docker.md index 2560278a4528..5fb7a8b3dbb8 100644 --- a/docs/sources/setup-grafana/installation/docker.md +++ b/docs/sources/setup-grafana/installation/docker.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/installation/docker/ - - /docs/grafana/latest/setup-grafana/installation/docker/ + - ../../installation/docker/ description: Guide for running Grafana using Docker title: Run Grafana Docker image weight: 200 diff --git a/docs/sources/setup-grafana/installation/kubernetes.md b/docs/sources/setup-grafana/installation/kubernetes.md index 365861626e8a..d1a370e6a5db 100644 --- a/docs/sources/setup-grafana/installation/kubernetes.md +++ b/docs/sources/setup-grafana/installation/kubernetes.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/installation/kubernetes/ - - /docs/grafana/latest/setup-grafana/installation/kubernetes/ + - ../../installation/kubernetes/ description: Guide for deploying Grafana on Kubernetes title: Deploy Grafana on Kubernetes weight: 300 diff --git a/docs/sources/setup-grafana/installation/mac.md b/docs/sources/setup-grafana/installation/mac.md index 6601459c0059..3269c20a4930 100644 --- a/docs/sources/setup-grafana/installation/mac.md +++ b/docs/sources/setup-grafana/installation/mac.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/installation/mac/ - - /docs/grafana/latest/setup-grafana/installation/mac/ + - ../../installation/mac/ description: Installing Grafana on macOS title: Install on macOS weight: 600 diff --git a/docs/sources/setup-grafana/installation/rpm.md b/docs/sources/setup-grafana/installation/rpm.md index e63df1fc0e84..20913ea930fb 100644 --- a/docs/sources/setup-grafana/installation/rpm.md +++ b/docs/sources/setup-grafana/installation/rpm.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/installation/installation/rpm/ - - /docs/grafana/latest/installation/rpm/ - - /docs/grafana/latest/setup-grafana/installation/rpm/ + - ../../installation/installation/rpm/ + - ../../installation/rpm/ description: Grafana Installation guide for RPM-based Linux, such as Centos, Fedora, OpenSuse, and Red Hat. title: Install on RPM-based Linux diff --git a/docs/sources/setup-grafana/installation/windows.md b/docs/sources/setup-grafana/installation/windows.md index 11bee36e65d8..f2712f700f18 100644 --- a/docs/sources/setup-grafana/installation/windows.md +++ b/docs/sources/setup-grafana/installation/windows.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/installation/windows/ - - /docs/grafana/latest/setup-grafana/installation/windows/ + - ../../installation/windows/ description: Install Grafana on Windows title: Install on Windows weight: 500 diff --git a/docs/sources/setup-grafana/restart-grafana.md b/docs/sources/setup-grafana/restart-grafana.md index 9eebfd09b4b8..8e459aecedb8 100644 --- a/docs/sources/setup-grafana/restart-grafana.md +++ b/docs/sources/setup-grafana/restart-grafana.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/installation/restart-grafana/ - - /docs/grafana/latest/setup-grafana/restart-grafana/ + - ../installation/restart-grafana/ description: Instructions for restarting Grafana title: Restart Grafana weight: 300 diff --git a/docs/sources/setup-grafana/set-up-for-high-availability.md b/docs/sources/setup-grafana/set-up-for-high-availability.md index b936938f2694..31be0920b8f0 100644 --- a/docs/sources/setup-grafana/set-up-for-high-availability.md +++ b/docs/sources/setup-grafana/set-up-for-high-availability.md @@ -1,8 +1,7 @@ --- aliases: - - /docs/grafana/latest/administration/set-up-for-high-availability/ - - /docs/grafana/latest/setup-grafana/set-up-for-high-availability/ - - /docs/grafana/latest/tutorials/ha_setup/ + - ../administration/set-up-for-high-availability/ + - ../tutorials/ha_setup/ keywords: - grafana - tutorials diff --git a/docs/sources/setup-grafana/set-up-grafana-live.md b/docs/sources/setup-grafana/set-up-grafana-live.md index c57f82a64c3a..12489c29ab7f 100644 --- a/docs/sources/setup-grafana/set-up-grafana-live.md +++ b/docs/sources/setup-grafana/set-up-grafana-live.md @@ -1,12 +1,11 @@ --- aliases: - - /docs/grafana/latest/live/ - - /docs/grafana/latest/live/configure-grafana-live/ - - /docs/grafana/latest/live/live-channel/ - - /docs/grafana/latest/live/live-feature-overview/ - - /docs/grafana/latest/live/live-ha-setup/ - - /docs/grafana/latest/live/set-up-grafana-live/ - - /docs/grafana/latest/setup-grafana/set-up-grafana-live/ + - ../live/ + - ../live/configure-grafana-live/ + - ../live/live-channel/ + - ../live/live-feature-overview/ + - ../live/live-ha-setup/ + - ../live/set-up-grafana-live/ description: Grafana Live is a real-time messaging engine that pushes event data to a frontend when an event occurs. menuTitle: Set up Grafana Live diff --git a/docs/sources/setup-grafana/set-up-grafana-monitoring.md b/docs/sources/setup-grafana/set-up-grafana-monitoring.md index b813c84bae86..6634404fc9a7 100644 --- a/docs/sources/setup-grafana/set-up-grafana-monitoring.md +++ b/docs/sources/setup-grafana/set-up-grafana-monitoring.md @@ -1,9 +1,8 @@ --- aliases: - - /docs/grafana/latest/admin/metrics/ - - /docs/grafana/latest/administration/jaeger-instrumentation/ - - /docs/grafana/latest/administration/view-server/internal-metrics/ - - /docs/grafana/latest/setup-grafana/set-up-grafana-monitoring/ + - ../admin/metrics/ + - ../administration/jaeger-instrumentation/ + - ../administration/view-server/internal-metrics/ description: Jaeger traces emitted and propagation by Grafana keywords: - grafana diff --git a/docs/sources/setup-grafana/sign-in-to-grafana.md b/docs/sources/setup-grafana/sign-in-to-grafana.md index 19505b000e1b..b6ddc5635881 100644 --- a/docs/sources/setup-grafana/sign-in-to-grafana.md +++ b/docs/sources/setup-grafana/sign-in-to-grafana.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/setup-grafana/sign-in-to-grafana/ description: Learn how to sign in to Grafana title: Sign in to Grafana weight: 400 diff --git a/docs/sources/setup-grafana/upgrade-grafana.md b/docs/sources/setup-grafana/upgrade-grafana.md index da7c988346cf..1b877b225b2b 100644 --- a/docs/sources/setup-grafana/upgrade-grafana.md +++ b/docs/sources/setup-grafana/upgrade-grafana.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/installation/upgrading/ - - /docs/grafana/latest/setup-grafana/upgrade-grafana/ + - ../installation/upgrading/ description: Guide for upgrading Grafana keywords: - grafana diff --git a/docs/sources/shared/alerts/first-step.md b/docs/sources/shared/alerts/first-step.md index 51602c0b958d..de163129aec5 100644 --- a/docs/sources/shared/alerts/first-step.md +++ b/docs/sources/shared/alerts/first-step.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/alerts/first-step/ title: TBD... --- diff --git a/docs/sources/shared/alerts/grafana-managed-alerts.md b/docs/sources/shared/alerts/grafana-managed-alerts.md index 8f3dfa3b1f78..a1b06e7dc3c1 100644 --- a/docs/sources/shared/alerts/grafana-managed-alerts.md +++ b/docs/sources/shared/alerts/grafana-managed-alerts.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/alerts/grafana-managed-alerts/ title: Grafana managed alerts --- diff --git a/docs/sources/shared/basics/grafana-cloud.md b/docs/sources/shared/basics/grafana-cloud.md index c69fad1c18b8..6cb56e158658 100644 --- a/docs/sources/shared/basics/grafana-cloud.md +++ b/docs/sources/shared/basics/grafana-cloud.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/basics/grafana-cloud/ title: Grafana Cloud --- diff --git a/docs/sources/shared/basics/grafana-enterprise.md b/docs/sources/shared/basics/grafana-enterprise.md index f19c7ce9cacd..f14f2a6a26a3 100644 --- a/docs/sources/shared/basics/grafana-enterprise.md +++ b/docs/sources/shared/basics/grafana-enterprise.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/basics/grafana-enterprise/ title: Grafana Enterprise --- diff --git a/docs/sources/shared/basics/what-is-grafana.md b/docs/sources/shared/basics/what-is-grafana.md index 6ddd54b53c5c..ea5bdaf3eefb 100644 --- a/docs/sources/shared/basics/what-is-grafana.md +++ b/docs/sources/shared/basics/what-is-grafana.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/basics/what-is-grafana/ title: Grafana Open Source --- diff --git a/docs/sources/shared/example.md b/docs/sources/shared/example.md index 56c395bb6b1c..5dda3b32502c 100644 --- a/docs/sources/shared/example.md +++ b/docs/sources/shared/example.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/example/ title: Shared Content --- diff --git a/docs/sources/shared/index.md b/docs/sources/shared/index.md index 238f6e6d5d83..ca03031f1ee9 100644 --- a/docs/sources/shared/index.md +++ b/docs/sources/shared/index.md @@ -1,5 +1,3 @@ --- -aliases: - - /docs/grafana/latest/shared/ headless: true --- diff --git a/docs/sources/shared/influxdb/intro.md b/docs/sources/shared/influxdb/intro.md index 4721366f604b..8fb436af32e0 100644 --- a/docs/sources/shared/influxdb/intro.md +++ b/docs/sources/shared/influxdb/intro.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/influxdb/intro/ title: Intro paragraph --- 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 index e97fb9faf351..1539302f7b9d 100644 --- 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 @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/manage-users/view-server-org-list-and-edit/ title: View org list as server admin --- diff --git a/docs/sources/shared/manage-users/view-server-org-list.md b/docs/sources/shared/manage-users/view-server-org-list.md index 9bd85d678980..30dbb16efc60 100644 --- a/docs/sources/shared/manage-users/view-server-org-list.md +++ b/docs/sources/shared/manage-users/view-server-org-list.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/manage-users/view-server-org-list/ title: View org list as server admin --- 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 index 5011a615847c..211caa5e7881 100644 --- a/docs/sources/shared/manage-users/view-server-user-list-search.md +++ b/docs/sources/shared/manage-users/view-server-user-list-search.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/manage-users/view-server-user-list-search/ title: View user list and search - list format --- diff --git a/docs/sources/shared/manage-users/view-server-user-list.md b/docs/sources/shared/manage-users/view-server-user-list.md index 963c4fc434a6..ae4f37bdcb7b 100644 --- a/docs/sources/shared/manage-users/view-server-user-list.md +++ b/docs/sources/shared/manage-users/view-server-user-list.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/manage-users/view-server-user-list/ title: View user list as server admin --- diff --git a/docs/sources/shared/manage-users/view-team-list.md b/docs/sources/shared/manage-users/view-team-list.md index 0b4401800575..9c3afac80d42 100644 --- a/docs/sources/shared/manage-users/view-team-list.md +++ b/docs/sources/shared/manage-users/view-team-list.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/manage-users/view-team-list/ title: View team list --- diff --git a/docs/sources/shared/panels/panel-links-intro.md b/docs/sources/shared/panels/panel-links-intro.md index 669cbf0ce7d3..b7fda4ba4a3f 100644 --- a/docs/sources/shared/panels/panel-links-intro.md +++ b/docs/sources/shared/panels/panel-links-intro.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/panels/panel-links-intro/ title: Panel links intro --- diff --git a/docs/sources/shared/panels/repeat-panel-intro.md b/docs/sources/shared/panels/repeat-panel-intro.md index fed20d6e23e3..dfe630adcb62 100644 --- a/docs/sources/shared/panels/repeat-panel-intro.md +++ b/docs/sources/shared/panels/repeat-panel-intro.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/panels/repeat-panel-intro/ title: Repeat panel intro --- diff --git a/docs/sources/shared/preferences/navigate-to-the-dashboard-list.md b/docs/sources/shared/preferences/navigate-to-the-dashboard-list.md index 5d461bc36da1..e175cf837ca8 100644 --- a/docs/sources/shared/preferences/navigate-to-the-dashboard-list.md +++ b/docs/sources/shared/preferences/navigate-to-the-dashboard-list.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/preferences/navigate-to-the-dashboard-list/ title: Navigate to the dashboard list --- diff --git a/docs/sources/shared/preferences/navigate-user-preferences-list.md b/docs/sources/shared/preferences/navigate-user-preferences-list.md index 2961b6f22ffb..e41a1cd396de 100644 --- a/docs/sources/shared/preferences/navigate-user-preferences-list.md +++ b/docs/sources/shared/preferences/navigate-user-preferences-list.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/preferences/navigate-user-preferences-list/ title: Navigate to user preferences list --- diff --git a/docs/sources/shared/preferences/org-preferences-list.md b/docs/sources/shared/preferences/org-preferences-list.md index b365bd86ebe0..9762fa05a8ff 100644 --- a/docs/sources/shared/preferences/org-preferences-list.md +++ b/docs/sources/shared/preferences/org-preferences-list.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/preferences/org-preferences-list/ title: Click Org preferences --- diff --git a/docs/sources/shared/preferences/select-home-dashboard-list.md b/docs/sources/shared/preferences/select-home-dashboard-list.md index 871f385e2768..133373aa690c 100644 --- a/docs/sources/shared/preferences/select-home-dashboard-list.md +++ b/docs/sources/shared/preferences/select-home-dashboard-list.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/preferences/select-home-dashboard-list/ title: Select home dashboard list --- diff --git a/docs/sources/shared/preferences/select-timezone-list.md b/docs/sources/shared/preferences/select-timezone-list.md index 4a5cc0545b2b..499dad81cfbb 100644 --- a/docs/sources/shared/preferences/select-timezone-list.md +++ b/docs/sources/shared/preferences/select-timezone-list.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/preferences/select-timezone-list/ title: Select home dashboard list --- diff --git a/docs/sources/shared/preferences/select-ui-theme-list.md b/docs/sources/shared/preferences/select-ui-theme-list.md index 4d16d2a4d784..445f58f42c5d 100644 --- a/docs/sources/shared/preferences/select-ui-theme-list.md +++ b/docs/sources/shared/preferences/select-ui-theme-list.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/preferences/select-ui-theme-list/ title: Select the UI theme --- diff --git a/docs/sources/shared/preferences/some-tasks-require-permissions.md b/docs/sources/shared/preferences/some-tasks-require-permissions.md index 6cc85922dc75..da78645cb6e1 100644 --- a/docs/sources/shared/preferences/some-tasks-require-permissions.md +++ b/docs/sources/shared/preferences/some-tasks-require-permissions.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/preferences/some-tasks-require-permissions/ title: Some tasks require permissions --- diff --git a/docs/sources/shared/systemd/bind-net-capabilities.md b/docs/sources/shared/systemd/bind-net-capabilities.md index d5dee2c740ca..f14b21781a58 100644 --- a/docs/sources/shared/systemd/bind-net-capabilities.md +++ b/docs/sources/shared/systemd/bind-net-capabilities.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/systemd/bind-net-capabilities/ title: Serving Grafana on a port < 1024 --- diff --git a/docs/sources/shared/test.md b/docs/sources/shared/test.md index ca7fad5b6250..8c9ac7055f7b 100644 --- a/docs/sources/shared/test.md +++ b/docs/sources/shared/test.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/test/ title: Shared Content --- diff --git a/docs/sources/shared/view-server-org-list.md b/docs/sources/shared/view-server-org-list.md index a681b8cef29c..96adfdad87b0 100644 --- a/docs/sources/shared/view-server-org-list.md +++ b/docs/sources/shared/view-server-org-list.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/view-server-org-list/ title: View user list --- diff --git a/docs/sources/shared/view-server-user-list-search.md b/docs/sources/shared/view-server-user-list-search.md index cc27f7147a2b..9deed8f6be92 100644 --- a/docs/sources/shared/view-server-user-list-search.md +++ b/docs/sources/shared/view-server-user-list-search.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/view-server-user-list-search/ title: View user list --- diff --git a/docs/sources/shared/visualizations/change-axis-link.md b/docs/sources/shared/visualizations/change-axis-link.md index 70ac41c3d339..22023736e4da 100644 --- a/docs/sources/shared/visualizations/change-axis-link.md +++ b/docs/sources/shared/visualizations/change-axis-link.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/visualizations/change-axis-link/ title: Stack series link --- diff --git a/docs/sources/shared/visualizations/legend-mode.md b/docs/sources/shared/visualizations/legend-mode.md index 4d1408489868..c8a127d5bee7 100644 --- a/docs/sources/shared/visualizations/legend-mode.md +++ b/docs/sources/shared/visualizations/legend-mode.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/visualizations/legend-mode/ title: Legend mode and legend placement --- diff --git a/docs/sources/shared/visualizations/stack-series-link.md b/docs/sources/shared/visualizations/stack-series-link.md index c2beac05fc93..328f3293109e 100644 --- a/docs/sources/shared/visualizations/stack-series-link.md +++ b/docs/sources/shared/visualizations/stack-series-link.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/visualizations/stack-series-link/ title: Stack series link --- diff --git a/docs/sources/shared/visualizations/tooltip-mode.md b/docs/sources/shared/visualizations/tooltip-mode.md index 7a924c668ea0..75c2c4d2358d 100644 --- a/docs/sources/shared/visualizations/tooltip-mode.md +++ b/docs/sources/shared/visualizations/tooltip-mode.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/shared/visualizations/tooltip-mode/ title: Tooltip mode --- diff --git a/docs/sources/troubleshooting/_index.md b/docs/sources/troubleshooting/_index.md index 2a5cf0294c9c..f569b57d473a 100644 --- a/docs/sources/troubleshooting/_index.md +++ b/docs/sources/troubleshooting/_index.md @@ -1,7 +1,6 @@ --- aliases: - - /docs/grafana/latest/troubleshooting/ - - /docs/grafana/latest/troubleshooting/troubleshoot-dashboards/ + - troubleshoot-dashboards/ description: Guide to troubleshooting Grafana problems keywords: - grafana @@ -24,6 +23,10 @@ You can enable more logging by changing log level in the Grafana configuration f For more information, refer to [Enable debug logging in Grafana CLI]({{< relref "../cli/#enable-debug-logging" >}}) and the [log section in Configuration]({{< relref "../setup-grafana/configure-grafana/#log" >}}). +## Troubleshoot with Dashboards Panels + +If you have an issue with your Dashboard panel, you can send us debug information. For more information, refer to [Send a panel to Grafana Labs support]({{< relref "./send-panel-to-grafana-support/" >}}). + ## Troubleshoot transformations Order of transformations matters. If the final data output from multiple transformations looks wrong, try changing the transformation order. Each transformation transforms data returned by the previous transformation, not the original raw data. diff --git a/docs/sources/troubleshooting/send-panel-to-grafana-support/index.md b/docs/sources/troubleshooting/send-panel-to-grafana-support/index.md index 0c71eda2837b..bab5925aed91 100644 --- a/docs/sources/troubleshooting/send-panel-to-grafana-support/index.md +++ b/docs/sources/troubleshooting/send-panel-to-grafana-support/index.md @@ -1,6 +1,4 @@ --- -aliases: - - /docs/grafana/latest/troubleshooting/send-panel-to-grafana-support/ description: Learn how to send a panel to Grafana Labs support for troubleshooting keywords: - grafana diff --git a/docs/sources/troubleshooting/troubleshoot-dashboards.md b/docs/sources/troubleshooting/troubleshoot-dashboards.md deleted file mode 100644 index 7f07c2997cb7..000000000000 --- a/docs/sources/troubleshooting/troubleshoot-dashboards.md +++ /dev/null @@ -1,12 +0,0 @@ ---- -aliases: - - /docs/grafana/latest/troubleshooting/troubleshoot-dashboards/ -description: Guide to troubleshooting Grafana dashboards -keywords: - - grafana - - troubleshooting - - documentation - - dashboards -title: Troubleshoot dashboards -weight: 100 ---- diff --git a/docs/sources/visualizations/geomap.md b/docs/sources/visualizations/geomap.md deleted file mode 100644 index 968dabbcf98e..000000000000 --- a/docs/sources/visualizations/geomap.md +++ /dev/null @@ -1,183 +0,0 @@ ---- -aliases: - - /docs/grafana/latest/features/panels/geomap/ - - /docs/grafana/latest/panels/visualizations/geomap/ - - /docs/grafana/latest/visualizations/geomap/ -description: Geomap visualization documentation -keywords: - - grafana - - Geomap - - panel - - documentation -title: Geomap -weight: 600 ---- - -# Geomap - -The Geomap panel visualization allows you to view and customize the world map using geospatial data. You can configure various overlay styles and map view settings to easily focus on the important location-based characteristics of the data. - -{{< figure src="/static/img/docs/geomap-panel/geomap-example-8-1-0.png" max-width="1200px" caption="Geomap panel" >}} - -## Map View - -The map view controls the initial view of the map when the dashboard loads. - -### Initial View - -The initial view configures how the GeoMap panel renders when the panel is first loaded. - -- **View** sets the center for the map when the panel first loads. -- **Latitude** (available when the **View** mode is _Coordinates_) -- **Longitude** (available when the **View** mode is _Coordinates_) -- **Zoom** sets the initial zoom level for the GeoMap panel, or the initial maximum zoom level in case the _Fit data layers_ view is selected. - -## Data layer - -The Geomap visualization supports multiple Data Layers. Each data layer determines how you visualize geospatial data on top of the base map. - -### Layer Types - -There are four-layer types to choose from in the Geomap visualization. - -- **Marker** renders a marker at each data point. -- **Heatmap** visualizes a heatmap of the data. -- **GeoJSON** renders static data from a geojson file. - -### Layer Controls - -The layer controls allow you to create layers, change their name, reorder and delete layers. - -- **Add layer** creates an additional, configurable data layer for the Geomap visualization. When you add a layer, you are prompted to select a layer type. You can change the layer type at any point during panel configuration. See the **Layer Types** section above for details on each layer type. -- The layer controls allow you to rename, delete, and reorder the layers of the panel. - - **Edit layer name (pencil icon)** renames the layer. - - **Trash Bin** deletes the layer. - - **Reorder (six dots/grab handle)** allows you to change the layer order. Data on higher layers will appear above data on lower layers. The panel will update the layer order as you drag and drop to help simplify choosing a layer order. - -You can add multiple layers of data to a single Geomap panel in order to create rich, detailed visualizations. - -### Location - -The Geomap panel needs a source of geographical data. This data comes from a database query, and there are four mapping options for your data. - -- **Auto** automatically searches for location data. Use this option when your query is based on one of the following names for data fields. - - geohash: “geohash” - - latitude: “latitude”, “lat” - - longitude: “longitude”, “lng”, “lon” - - lookup: “lookup” -- **Coords** specifies that your query holds coordinate data. You will get prompted to select numeric data fields for latitude and longitude from your database query. -- **Geohash** specifies that your query holds geohash data. You will get prompted to select a string data field for the geohash from your database query. -- **Lookup** specifies that your query holds location name data that needs to be mapped to a value. You will get prompted to select the lookup field from your database query and a gazetteer. The gazetteer is the directory that is used to map your queried data to a geographical point. - -### Markers layer - -The markers layer allows you to display data points as different marker shapes such as circles, squares, triangles, stars, and more. - -![Markers Layer](/static/img/docs/geomap-panel/geomap-markers-8-1-0.png) - -![Markers Layer Options](/static/img/docs/geomap-panel/geomap-markers-options-8-1-0.png) - -- **Marker Color** configures the color of the marker. The default `Single color` keeps all points a single color. There is an alternate option to have multiple colors depending on the data point values and the threshold set at the `Thresholds` section. -- **Marker Size** configures the size of the marker. Default is `Fixed size`, making all marker size the same regardless of the data points. However, there is also an option to scale the circles to the corresponding data points. `Min` and `Max` marker size has to be set such that the Marker layer can scale within this range. -- **Marker Shape** allows you to choose the shape, icon, or graphic to aid in providing additional visual context to your data. Choose from assets that are included with Grafana such as simple shapes or the Unicon library. You can also specify a URL containing an image asset. The image must be a scalable vector graphic (SVG). -- **Fill opacity** configures the transparency of each marker. - -### Heatmap layer - -The heatmap layer clusters various data points to visualize locations with different densities. -To add a heatmap layer: - -Click on the drop-down menu under Data Layer and choose `Heatmap`. - -Similar to `Markers`, you are prompted with various options to determine which data points to visualize and how. - -![Heatmap Layer](/static/img/docs/geomap-panel/geomap-heatmap-8-1-0.png) - -![Heatmap Layer Options](/static/img/docs/geomap-panel/geomap-heatmap-options-8-1-0.png) - -- **Weight values** configure the intensity of the heatmap clusters. `Fixed value` keeps a constant weight value throughout all data points. This value should be in the range of 0~1. Similar to Markers, there is an alternate option in the drop-down to automatically scale the weight values depending on data values. -- **Radius** configures the size of the heatmap clusters. -- **Blur** configures the amount of blur on each cluster. - -### GeoJSON layer - -The GeoJSON layer allows you to select and load a static GeoJSON file from the filesystem. - -- **GeoJSON URL** provides a choice of GeoJSON files that ship with Grafana. -- **Default Style** controls which styles to apply when no rules above match. - - **Color** configures the color of the default style - - **Opacity** configures the default opacity -- **Style Rules** apply styles based on feature properties - - **Rule** allows you to select a _feature_, _condition_, and _value_ from the GeoJSON file in order to define a rule. The trash bin icon can be used to delete the current rule. - - **Color** configures the color of the style for the current rule - - **Opacity** configures the transparency level for the current rule -- **Add style rule** creates additional style rules. - -## Base layer - -The base layer loads in a blank world map from the tile server to the Grafana panel. Several base layer options are available each with specific configuration options to style the base map. The default base layer is CartoDB base map. Custom default base layers can be defined in the `.ini` configuration file. - -![Base layer options](/static/img/docs/geomap-panel/geomap-baselayer-8-1-0.png) - -### Configure the default base layer with provisioning - -You can configure the default base map using config files with Grafana’s provisioning system. For more information on all the settings, refer to the [provisioning docs page]({{< relref "../../administration/provisioning/" >}}). - -Use the JSON configuration option `default_baselayer_config` to define the default base map. There are currently four base map options to choose from: `carto`, `esri-xyz`, `osm-standard`, `xyz`. Here are some provisioning examples for each base map option. - -- **carto** loads the CartoDB tile server. You can choose from `auto`, `dark`, and `light` theme for the base map and can be set as shown below. The `showLabels` tag determines whether or not Grafana shows the Country details on top of the map. Here is an example: - -```ini -geomap_default_baselayer = `{ - "type": "carto", - "config": { - "theme": "auto", - "showLabels": true - } -}` -``` - -- **esri-xyz** loads the ESRI tile server. There are already multiple server instances implemented to show the various map styles: `world-imagery`, `world-physical`, `topo`, `usa-topo`, and `ocean`. The `custom` server option allows you to configure your own ArcGIS map server. Here are some examples: - -```ini -geomap_default_baselayer = `{ - "type": "esri-xyz", - "config": { - "server": "world-imagery" - } -}` -``` - -```ini -geomap_default_baselayer = `{ - "type": "esri-xyz", - "config": { - "server": "custom", - "url": "[tile server url]", - "attribution": "[tile server attribution]" - } -}` -``` - -- **osm-standard** loads the OpenStreetMap tile server. There are no additional configurations needed and the `config` fields can be left blank. Here is an example: - -```ini -default_baselayer_config = `{ - "type": "osm-standard", - "config": {} -}` -``` - -- **xyz** loads a custom tile server defined by the user. Set a valid tile server `url`, with {z}/{x}/{y} for this option in order to properly load a default base map. Here is an example: - -```ini -default_baselayer_config = `{ - "type": "xyz", - "config": { - "attribution": "Open street map", - "url": "https://tile.openstreetmap.org/{z}/{x}/{y}.png" - } -}` -``` - -`enable_custom_baselayers` allows you to enable or disable custom open source base maps that are already implemented. The default is `true`. diff --git a/docs/sources/visualizations/graph-panel.md b/docs/sources/visualizations/graph-panel.md deleted file mode 100644 index 0f4b3c6beb20..000000000000 --- a/docs/sources/visualizations/graph-panel.md +++ /dev/null @@ -1,178 +0,0 @@ ---- -aliases: - - /docs/grafana/latest/features/panels/graph/ - - /docs/grafana/latest/panels/visualizations/graph-panel/ - - /docs/grafana/latest/reference/graph/ - - /docs/grafana/latest/visualizations/graph-panel/ -keywords: - - grafana - - graph panel - - documentation - - guide - - graph -title: Graph (old) -weight: 500 ---- - -# Graph panel (old) - -> **Note:** [Time series panel]({{< relref "time-series/" >}}) visualization is going to replace the Graph panel visualization in a future release. - -The graph panel can render metrics as a line, a path of dots, or a series of bars. This type of graph is versatile enough to display almost any time-series data. - -## Data and field options - -Graph visualizations allow you to apply: - -- [Alerts]({{< relref "../alerting/" >}}) - This is the only type of visualization that allows you to set alerts. -- [Transform data]({{< relref "../panels/transform-data/#add-a-transformation-function-to-data" >}}) -- [Add a field override]({{< relref "../panels/configure-overrides#add-a-field-override" >}}) -- [Configure thresholds]({{< relref "../panels/configure-thresholds/" >}}) - -## Display options - -Use these settings to refine your visualization. - -- **Bars -** Display values as a bar chart. -- **Lines -** Display values as a line graph. -- **Line width -** The width of the line for a series. (default 1). -- **Staircase -** Draws adjacent points as staircase. -- **Area fill -** Amount of color fill for a series. (default 1, 0 is none) -- **Fill gradient -** Degree of gradient on the area fill. (0 is no gradient, 10 is a steep gradient. Default is 0.) -- **Points -** Display points for values. -- **Point radius -** Controls how large the points are. -- **Alert thresholds -** Display alert thresholds and regions on the panel. - -### Stacking and null value - -- **Stack -** Each series is stacked on top of another. -- **Percent -** Available when **Stack** is selected. Each series is drawn as a percentage of the total of all series. -- **Null value -** How null values are displayed. _This is a very important setting._ See note below. - - **connected -** If there is a gap in the series, meaning a null value or values, then the line will skip the gap and connect to the next non-null value. - - **null -** (default) If there is a gap in the series, meaning a null value, then the line in the graph will be broken and show the gap. - - **null as zero -** If there is a gap in the series, meaning a null value, then it will be displayed as a zero value in the graph panel. - -> **Note:** If you are monitoring a server's CPU load and the load reaches 100%, then the server will lock up and the agent sending statistics will not be able to collect the load statistic. This leads to a gap in the metrics and having the default as _null_ means Grafana will show the gaps and indicate that something is wrong. If this is set to _connected_, then it would be easy to miss this signal. - -### Hover tooltip - -Use these settings to change the appearance of the tooltip that appears when you hover your cursor over the graph visualization. - -- **Mode** - - **All series -** The hover tooltip shows all series in the graph. Grafana highlights the series that you are hovering over in bold in the series list in the tooltip. - - **Single -** The hover tooltip shows only a single series, the one that you are hovering over on the graph. -- **Sort order -** Sorts the order of series in the hover tooltip if you have selected **All series** mode. When you hover your cursor on a graph, Grafana displays the values associated with the lines. Generally users are most interested in the highest or lowest values. Sorting these values can make it much easier to find the data of interest. - - **None -** The order of the series in the tooltip is determined by the sort order in your query. For example, they could be alphabetically sorted by series name. - - **Increasing -** The series in the hover tooltip are sorted by value and in increasing order, with the lowest value at the top of the list. - - **Decreasing -** The series in the hover tooltip are sorted by value and in decreasing order, with the highest value at the top of the list. - -## Series overrides - -Series overrides allow a series in a graph panel to be rendered differently from the others. You can customize display options on a per-series bases or by using regex rules. For example, one series can have a thicker line width to make it stand out or be moved to the right Y-axis. - -You can add multiple series overrides. - -**Add a series override** - -1. Click **Add series override**. -1. In **Alias or regex** Type or select a series. Click in the field to see a list of available series. - - **Example:** `/Network.*/` would match two series named `Network out` and `Network in`. - -1. Click **+** and then select a style to apply to the series. You can add multiple styles to each entry. - -- **Bars -** Show series as a bar graph. -- **Lines -** Show series as line graph. -- **Line fill -** Show line graph with area fill. -- **Fill gradient -** Area fill gradient amount. -- **Line width -** Set line width. -- **Null point mode -** Option to ignore null values or replace with zero. Important if you want to ignore gaps in your data. -- **Fill below to -** Fill area between two series. -- **Staircase line -** Show series as a staircase line. -- **Dashes -** Show line with dashes. -- **Hidden Series -** Hide the series. -- **Dash Length -** Dashed line length. -- **Dash Space -** Dashed line spacing. -- **Points -** Show series as separate points. -- **Point Radius -** Radius for point rendering. -- **Stack -** Set stack group for series. -- **Color -** Set series color. -- **Y-axis -** Set series y-axis. -- **Z-index -** Set series z-index (rendering order). Important when overlaying different styles (bar charts, area charts). -- **Transform -** Transform value to negative to render below the y-axis. -- **Legend -** Control if a series is shown in legend. -- **Hide in tooltip -** Control if a series is shown in graph tooltip. - -## Axes - -Use these options to control the display of axes in the visualization. - -### Left Y/Right Y - -Options are identical for both Y-axes. - -- **Show -** Click to show or hide the axis. -- **Unit -** The display unit for the Y value. -- **Scale -** The scale to use for the Y value, linear, or logarithmic. (default linear) -- **Y-Min -** The minimum Y value. (default auto) -- **Y-Max -** The maximum Y value. (default auto) -- **Decimals -** Defines how many decimals are displayed for Y value. (default auto) -- **Label -** The Y axis label. (default “") - -### Y-Axes - -- **Align -** Select to align left and right Y-axes by value. (default unchecked/false) -- **Level -** Available when **Align** is selected. Value to use for alignment of left and right Y-axes, starting from Y=0. (default 0) - -### X-Axis - -- **Show -** Click to show or hide the axis. -- **Mode -** The display mode completely changes the visualization of the graph panel. It's like three panels in one. The main mode is the time series mode with time on the X-axis. The other two modes are a basic bar chart mode with series on the X-axis instead of time and a histogram mode. - - - **Time -** (default) The X-axis represents time and that the data is grouped by time (for example, by hour, or by minute). - - **Series -** The data is grouped by series and not by time. The Y-axis still represents the value. - - **Value -** The aggregation type to use for the values. The default is total (summing the values together). - - **Histogram -** Converts the graph into a histogram. A histogram is a kind of bar chart that groups numbers into ranges, often called buckets or bins. Taller bars show that more data falls in that range. - - For more information about histograms, refer to [Introduction to histograms and heatmaps]({{< relref "../basics/intro-histograms/" >}}). - - - **Buckets -** The number of buckets to group the values by. If left empty, then Grafana tries to calculate a suitable number of buckets. - - **X-Min -** Filters out values from the histogram that are under this minimum limit. - - **X-Max -** Filters out values that are greater than this maximum limit. - -## Legend - -Use these settings to refine how the legend appears in your visualization. - -### Options - -- **Show -** Uncheck to hide the legend. (default checked/true) -- **As Table -** Check to display legend in table. (default checked/true) -- **To the right -** Check to display legend to the right. -- **Width -** Available when **To the right** is selected. Enter the minimum width for the legend in pixels. - -### Values - -Additional values can be shown along-side the legend names: - -- **Min -** Minimum of all values returned from the metric query. -- **Max -** Maximum of all values returned from the metric query. -- **Avg -** Average of all values returned from the metric query. -- **Current** - Last value returned from the metric query. -- **Total -** Sum of all values returned from the metric query. -- **Decimals -** Controls how many decimals are displayed for legend values and graph hover tooltips. - -The legend values are calculated on the client side by Grafana and depend on what type of aggregation or point consolidation your metric query is using. All the above legend values cannot be correct at the same time. - -For example, if you plot a rate like requests/second, this is probably using average as an aggregator, then the Total in the legend will not represent the total number of requests. It is just the sum of all data points received by Grafana. - -### Hide series - -Hide series when all values of a series from a metric query are of a specific value. - -- **With only nulls -** Value=null (default unchecked) -- **With only zeroes -** Value=zero (default unchecked) - -### Time regions - -Time regions allow you to highlight certain time regions of the graph to make it easier to see for example weekends, business hours and/or off work hours. All configured time regions refer to UTC time. diff --git a/docs/sources/visualizations/heatmap.md b/docs/sources/visualizations/heatmap.md deleted file mode 100644 index f4970c7c7f14..000000000000 --- a/docs/sources/visualizations/heatmap.md +++ /dev/null @@ -1,108 +0,0 @@ ---- -aliases: - - /docs/grafana/latest/features/panels/heatmap/ - - /docs/grafana/latest/visualizations/heatmap/ -description: Heatmap visualization documentation -keywords: - - grafana - - heatmap - - panel - - documentation -title: Heatmap -weight: 600 ---- - -# Heatmap - -The Heatmap panel visualization allows you to view histograms over time. For more information about histograms, refer to [Introduction to histograms and heatmaps]({{< relref "../basics/intro-histograms/" >}}). - -![](/static/img/docs/v43/heatmap_panel_cover.jpg) - -## Calculate from data - -This setting determines if the data is already a calculated heatmap (from the data source/transformer), or one that should be -calculated in the panel. - -### X Bucket - -This setting determines how the X-axis is split into buckets. You can specify a time interval in the **Size** input. For example, a time range of `1h` makes the cells 1-hour wide on the X-axis. - -### Y Bucket - -This setting determines how the Y-axis is split into buckets. - -### Y Bucket scale - -Select one of the following Y-axis value scales: - -- **linear -** Linear scale. -- **log (base 2) -** Logarithmic scale with base 2. -- **log (base 10) -** Logarithmic scale with base 10. - -## Y Axes - -Defines how the Y axis is displayed - -### Placement - -- **Left** On the left -- **Right** On the right -- **Hidden** Hidden - -### Unit - -Unit configuration - -### Decimals - -This setting determines decimal configuration. - -### Min/Max value - -This setting configures the axis range. - -### Reverse - -When selected, the axis appears in reverse order. - -## Colors - -The color spectrum controls the mapping between value count (in each bucket) and the color assigned to each bucket. The leftmost color on the spectrum represents the minimum count and the color on the right most side represents the maximum count. Some color schemes are automatically inverted when using the light theme. - -You can also change the color mode to Opacity. In this case, the color will not change but the amount of opacity will change with the bucket count - -- **Mode** - - **Scheme -** Bucket value represented by cell color. - - **Scheme -** If the mode is **scheme**, then select a color scheme. - - **opacity -** Bucket value represented by cell opacity. Opaque cell means maximum value. - - **Color -** Cell base color. - - **Scale -** Scale for mapping bucket values to the opacity. - - **linear -** Linear scale. Bucket value maps linearly to the opacity. - - **sqrt -** Power scale. Cell opacity calculated as `value ^ k`, where `k` is a configured **Exponent** value. If exponent is less than `1`, you will get a logarithmic scale. If exponent is greater than `1`, you will get an exponential scale. In case of `1`, scale will be the same as linear. - - **Exponent -** value of the exponent, greater than `0`. - -### Start/end color from value - -By default, Grafana calculates cell colors based on minimum and maximum bucket values. With Min and Max you can overwrite those values. Consider a bucket value as a Z-axis and Min and Max as Z-Min and Z-Max, respectively. - -- **Start -** Minimum value using for cell color calculation. If the bucket value is less than Min, then it is mapped to the "minimum" color. The series min value is the default value. -- **End -** Maximum value using for cell color calculation. If the bucket value is greater than Max, then it is mapped to the "maximum" color. The series max value is the default value. - -## Cell display - -Use these settings to refine your visualization. - -## Additional display options - -### Tooltip - -- **Show tooltip -** Show heatmap tooltip. -- **Show Histogram -** Show a Y-axis histogram on the tooltip. A histogram represents the distribution of the bucket values for a specific timestamp. - -### Legend - -Choose whether you want to display the heatmap legend on the visualization. - -### Exemplars - -Set the color used to show exemplar data. diff --git a/docs/sources/whatsnew/_index.md b/docs/sources/whatsnew/_index.md index 935ba017a0c1..4637b22f9e03 100644 --- a/docs/sources/whatsnew/_index.md +++ b/docs/sources/whatsnew/_index.md @@ -1,59 +1,58 @@ --- aliases: - - /docs/grafana/latest/guides/ - - /docs/grafana/latest/whatsnew/ - - /docs/grafana/latest/guides/whats-new-in-v2/ - - /docs/grafana/latest/whatsnew/whats-new-in-v2-0/ - - /docs/grafana/latest/guides/whats-new-in-v2-1/ - - /docs/grafana/latest/whatsnew/whats-new-in-v2-1/ - - /docs/grafana/latest/guides/whats-new-in-v2-5/ - - /docs/grafana/latest/whatsnew/whats-new-in-v2-5/ - - /docs/grafana/latest/guides/whats-new-in-v2-6/ - - /docs/grafana/latest/whatsnew/whats-new-in-v2-6/ - - /docs/grafana/latest/guides/whats-new-in-v3/ - - /docs/grafana/latest/whatsnew/whats-new-in-v3-0/ - - /docs/grafana/latest/guides/whats-new-in-v3-1/ - - /docs/grafana/latest/whatsnew/whats-new-in-v3-1/ - - /docs/grafana/latest/guides/whats-new-in-v4/ - - /docs/grafana/latest/whatsnew/whats-new-in-v4-0/ - - /docs/grafana/latest/guides/whats-new-in-v4-1/ - - /docs/grafana/latest/whatsnew/whats-new-in-v4-1/ - - /docs/grafana/latest/guides/whats-new-in-v4-2/ - - /docs/grafana/latest/whatsnew/whats-new-in-v4-2/ - - /docs/grafana/latest/guides/whats-new-in-v4-3/ - - /docs/grafana/latest/whatsnew/whats-new-in-v4-3/ - - /docs/grafana/latest/guides/whats-new-in-v4-4/ - - /docs/grafana/latest/whatsnew/whats-new-in-v4-4/ - - /docs/grafana/latest/guides/whats-new-in-v4-5/ - - /docs/grafana/latest/whatsnew/whats-new-in-v4-5/ - - /docs/grafana/latest/guides/whats-new-in-v4-6/ - - /docs/grafana/latest/whatsnew/whats-new-in-v4-6/ - - /docs/grafana/latest/guides/whats-new-in-v5/ - - /docs/grafana/latest/whatsnew/whats-new-in-v5-0/ - - /docs/grafana/latest/guides/whats-new-in-v5-1/ - - /docs/grafana/latest/whatsnew/whats-new-in-v5-1/ - - /docs/grafana/latest/guides/whats-new-in-v5-2/ - - /docs/grafana/latest/whatsnew/whats-new-in-v5-2/ - - /docs/grafana/latest/guides/whats-new-in-v5-3/ - - /docs/grafana/latest/whatsnew/whats-new-in-v5-3/ - - /docs/grafana/latest/guides/whats-new-in-v5-4/ - - /docs/grafana/latest/whatsnew/whats-new-in-v5-4/ - - /docs/grafana/latest/guides/whats-new-in-v6-0/ - - /docs/grafana/latest/whatsnew/whats-new-in-v6-0/ - - /docs/grafana/latest/guides/whats-new-in-v6-1/ - - /docs/grafana/latest/whatsnew/whats-new-in-v6-1/ - - /docs/grafana/latest/guides/whats-new-in-v6-2/ - - /docs/grafana/latest/whatsnew/whats-new-in-v6-2/ - - /docs/grafana/latest/guides/whats-new-in-v6-3/ - - /docs/grafana/latest/whatsnew/whats-new-in-v6-3/ - - /docs/grafana/latest/guides/whats-new-in-v6-4/ - - /docs/grafana/latest/whatsnew/whats-new-in-v6-4/ - - /docs/grafana/latest/guides/whats-new-in-v6-5/ - - /docs/grafana/latest/whatsnew/whats-new-in-v6-5/ - - /docs/grafana/latest/guides/whats-new-in-v6-6/ - - /docs/grafana/latest/whatsnew/whats-new-in-v6-6/ - - /docs/grafana/latest/guides/whats-new-in-v6-7/ - - /docs/grafana/latest/whatsnew/whats-new-in-v6-7/ + - guides/ + - guides/whats-new-in-v2-1/ + - guides/whats-new-in-v2-5/ + - guides/whats-new-in-v2-6/ + - guides/whats-new-in-v2/ + - guides/whats-new-in-v3-1/ + - guides/whats-new-in-v3/ + - guides/whats-new-in-v4-1/ + - guides/whats-new-in-v4-2/ + - guides/whats-new-in-v4-3/ + - guides/whats-new-in-v4-4/ + - guides/whats-new-in-v4-5/ + - guides/whats-new-in-v4-6/ + - guides/whats-new-in-v4/ + - guides/whats-new-in-v5-1/ + - guides/whats-new-in-v5-2/ + - guides/whats-new-in-v5-3/ + - guides/whats-new-in-v5-4/ + - guides/whats-new-in-v5/ + - guides/whats-new-in-v6-0/ + - guides/whats-new-in-v6-1/ + - guides/whats-new-in-v6-2/ + - guides/whats-new-in-v6-3/ + - guides/whats-new-in-v6-4/ + - guides/whats-new-in-v6-5/ + - guides/whats-new-in-v6-6/ + - guides/whats-new-in-v6-7/ + - whats-new-in-v2-0/ + - whats-new-in-v2-1/ + - whats-new-in-v2-5/ + - whats-new-in-v2-6/ + - whats-new-in-v3-0/ + - whats-new-in-v3-1/ + - whats-new-in-v4-0/ + - whats-new-in-v4-1/ + - whats-new-in-v4-2/ + - whats-new-in-v4-3/ + - whats-new-in-v4-4/ + - whats-new-in-v4-5/ + - whats-new-in-v4-6/ + - whats-new-in-v5-0/ + - whats-new-in-v5-1/ + - whats-new-in-v5-2/ + - whats-new-in-v5-3/ + - whats-new-in-v5-4/ + - whats-new-in-v6-0/ + - whats-new-in-v6-1/ + - whats-new-in-v6-2/ + - whats-new-in-v6-3/ + - whats-new-in-v6-4/ + - whats-new-in-v6-5/ + - whats-new-in-v6-6/ + - whats-new-in-v6-7/ title: What's new weight: 1 --- diff --git a/docs/sources/whatsnew/whats-new-in-v7-0.md b/docs/sources/whatsnew/whats-new-in-v7-0.md index 35b4f05ebefa..1cac0c5b2d9c 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-0.md +++ b/docs/sources/whatsnew/whats-new-in-v7-0.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v7-0/ - - /docs/grafana/latest/whatsnew/whats-new-in-v7-0/ + - ../guides/whats-new-in-v7-0/ description: Feature and improvement highlights for Grafana v7 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v7-1.md b/docs/sources/whatsnew/whats-new-in-v7-1.md index 690906f3746b..519901ec1140 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-1.md +++ b/docs/sources/whatsnew/whats-new-in-v7-1.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v7-1/ - - /docs/grafana/latest/whatsnew/whats-new-in-v7-1/ + - ../guides/whats-new-in-v7-1/ description: Feature and improvement highlights for Grafana v7.1 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v7-2.md b/docs/sources/whatsnew/whats-new-in-v7-2.md index 0c0dc323cdf7..2c894d28f393 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-2.md +++ b/docs/sources/whatsnew/whats-new-in-v7-2.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v7-2/ - - /docs/grafana/latest/whatsnew/whats-new-in-v7-2/ + - ../guides/whats-new-in-v7-2/ description: Feature and improvement highlights for Grafana v7.2 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v7-3.md b/docs/sources/whatsnew/whats-new-in-v7-3.md index d60fd9b6e5ac..94a2be59a5f4 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-3.md +++ b/docs/sources/whatsnew/whats-new-in-v7-3.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v7-3/ - - /docs/grafana/latest/whatsnew/whats-new-in-v7-3/ + - ../guides/whats-new-in-v7-3/ description: Feature and improvement highlights for Grafana v7.3 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v7-4.md b/docs/sources/whatsnew/whats-new-in-v7-4.md index 688805d09553..ea31d2555f5b 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-4.md +++ b/docs/sources/whatsnew/whats-new-in-v7-4.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v7-4/ - - /docs/grafana/latest/whatsnew/whats-new-in-v7-4/ + - ../guides/whats-new-in-v7-4/ description: Feature and improvement highlights for Grafana v7.4 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v7-5.md b/docs/sources/whatsnew/whats-new-in-v7-5.md index de9ce19db5da..15d018352b87 100644 --- a/docs/sources/whatsnew/whats-new-in-v7-5.md +++ b/docs/sources/whatsnew/whats-new-in-v7-5.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v7-5/ - - /docs/grafana/latest/whatsnew/whats-new-in-v7-5/ + - ../guides/whats-new-in-v7-5/ description: Feature and improvement highlights for Grafana v7.5 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v8-0.md b/docs/sources/whatsnew/whats-new-in-v8-0.md index e6d0abee7d36..ceb608ffd235 100644 --- a/docs/sources/whatsnew/whats-new-in-v8-0.md +++ b/docs/sources/whatsnew/whats-new-in-v8-0.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v8-0/ - - /docs/grafana/latest/whatsnew/whats-new-in-v8-0/ + - ../guides/whats-new-in-v8-0/ description: Feature and improvement highlights for Grafana v8.0 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v8-1.md b/docs/sources/whatsnew/whats-new-in-v8-1.md index 56b5c14d6a47..4077964b30b9 100644 --- a/docs/sources/whatsnew/whats-new-in-v8-1.md +++ b/docs/sources/whatsnew/whats-new-in-v8-1.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v8-1/ - - /docs/grafana/latest/whatsnew/whats-new-in-v8-1/ + - ../guides/whats-new-in-v8-1/ description: Feature and improvement highlights for Grafana v8.1 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v8-2.md b/docs/sources/whatsnew/whats-new-in-v8-2.md index c5f063279206..13cb1a31de5d 100644 --- a/docs/sources/whatsnew/whats-new-in-v8-2.md +++ b/docs/sources/whatsnew/whats-new-in-v8-2.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v8-2/ - - /docs/grafana/latest/whatsnew/whats-new-in-v8-2/ + - ../guides/whats-new-in-v8-2/ description: Feature and improvement highlights for Grafana v8.2 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v8-3.md b/docs/sources/whatsnew/whats-new-in-v8-3.md index c609c24c4f08..74f290cea102 100644 --- a/docs/sources/whatsnew/whats-new-in-v8-3.md +++ b/docs/sources/whatsnew/whats-new-in-v8-3.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v8-3/ - - /docs/grafana/latest/whatsnew/whats-new-in-v8-3/ + - ../guides/whats-new-in-v8-3/ description: Feature and improvement highlights for Grafana v8.3 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v8-4.md b/docs/sources/whatsnew/whats-new-in-v8-4.md index c193e08a9d7a..fa930d4df66e 100644 --- a/docs/sources/whatsnew/whats-new-in-v8-4.md +++ b/docs/sources/whatsnew/whats-new-in-v8-4.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v8-4/ - - /docs/grafana/latest/whatsnew/whats-new-in-v8-4/ + - ../guides/whats-new-in-v8-4/ description: Feature and improvement highlights for Grafana v8.4 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v8-5.md b/docs/sources/whatsnew/whats-new-in-v8-5.md index 1d7fefd60f90..019285d71dc6 100644 --- a/docs/sources/whatsnew/whats-new-in-v8-5.md +++ b/docs/sources/whatsnew/whats-new-in-v8-5.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v8-5/ - - /docs/grafana/latest/whatsnew/whats-new-in-v8-5/ + - ../guides/whats-new-in-v8-5/ description: Feature and improvement highlights for Grafana v8.5 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v9-0.md b/docs/sources/whatsnew/whats-new-in-v9-0.md index 81fde0d2a6a9..8db726253567 100644 --- a/docs/sources/whatsnew/whats-new-in-v9-0.md +++ b/docs/sources/whatsnew/whats-new-in-v9-0.md @@ -2,8 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v9-0/ - - /docs/grafana/latest/whatsnew/whats-new-in-v9-0/ + - ../guides/whats-new-in-v9-0/ description: Feature and improvement highlights for Grafana v9.0 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v9-1.md b/docs/sources/whatsnew/whats-new-in-v9-1.md index 8ea36ac8c9d9..7b53889a71f2 100644 --- a/docs/sources/whatsnew/whats-new-in-v9-1.md +++ b/docs/sources/whatsnew/whats-new-in-v9-1.md @@ -2,7 +2,7 @@ _build: list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v9-1/ + - ../guides/whats-new-in-v9-1/ description: Feature and improvement highlights for Grafana v9.1 keywords: - grafana diff --git a/docs/sources/whatsnew/whats-new-in-v9-2.md b/docs/sources/whatsnew/whats-new-in-v9-2.md index baaf519f9fb4..ada1d5a623df 100644 --- a/docs/sources/whatsnew/whats-new-in-v9-2.md +++ b/docs/sources/whatsnew/whats-new-in-v9-2.md @@ -1,8 +1,6 @@ --- -_build: - list: false aliases: - - /docs/grafana/latest/guides/whats-new-in-v9-2/ + - ../guides/whats-new-in-v9-2/ description: Feature and improvement highlights for Grafana v9.2 keywords: - grafana diff --git a/go.mod b/go.mod index 42b6b1bbda48..03c00985c458 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b github.com/centrifugal/centrifuge v0.25.0 github.com/cortexproject/cortex v1.10.1-0.20211014125347-85c378182d0d - github.com/crewjam/saml v0.4.8 + github.com/crewjam/saml v0.4.9 github.com/davecgh/go-spew v1.1.1 github.com/denisenkom/go-mssqldb v0.12.0 github.com/dop251/goja v0.0.0-20210804101310-32956a348b49 @@ -341,7 +341,7 @@ require ( ) // Use fork of crewjam/saml with fixes for some issues until changes get merged into upstream -replace github.com/crewjam/saml => github.com/grafana/saml v0.4.9-0.20220727151557-61cd9c9353fc +replace github.com/crewjam/saml => github.com/grafana/saml v0.4.9-0.20230102094056-b61b9eb7c8b7 replace github.com/apache/thrift => github.com/apache/thrift v0.14.1 diff --git a/go.sum b/go.sum index d3fc570e3ac2..5498eac5eeb2 100644 --- a/go.sum +++ b/go.sum @@ -1377,8 +1377,8 @@ github.com/grafana/grafana-plugin-sdk-go v0.139.0 h1:2RQKM2QpSaWTtaGN6sK+R7LO7zy github.com/grafana/grafana-plugin-sdk-go v0.139.0/go.mod h1:Y+Ps2sesZ62AyCnX+hzrYnyDQYe/ZZl+A8yKLOBm12c= github.com/grafana/prometheus-alertmanager v0.24.1-0.20221012142027-823cd9150293 h1:dJIdfHqu+XjKz+w9zXLqXKPdp6Jjx/UPSOwdeSfWdeQ= github.com/grafana/prometheus-alertmanager v0.24.1-0.20221012142027-823cd9150293/go.mod h1:HVHqK+BVPa/tmL8EMhLCCrPt2a1GdJpEyxr5hgur2UI= -github.com/grafana/saml v0.4.9-0.20220727151557-61cd9c9353fc h1:1PY8n+rXuBNr3r1JQhoytWDCpc+pq+BibxV0SZv+Cr4= -github.com/grafana/saml v0.4.9-0.20220727151557-61cd9c9353fc/go.mod h1:9Zh6dWPtB3MSzTRt8fIFH60Z351QQ+s7hCU3J/tTlA4= +github.com/grafana/saml v0.4.9-0.20230102094056-b61b9eb7c8b7 h1:cujJQ3XV6IK7Y96VpYurd2EpI5rfMRFcuyGqUlk+030= +github.com/grafana/saml v0.4.9-0.20230102094056-b61b9eb7c8b7/go.mod h1:9Zh6dWPtB3MSzTRt8fIFH60Z351QQ+s7hCU3J/tTlA4= github.com/grafana/thema v0.0.0-20220817114012-ebeee841c104 h1:dYpwFYIChrMfpq3wDa/ZBxAbUGSW5NYmYBeSezhaoao= github.com/grafana/thema v0.0.0-20220817114012-ebeee841c104/go.mod h1:fCV1rqv6XRQg2GfIQ7pU9zdxd5fLRcEBCnrDVwlK+ZY= github.com/grafana/xorm v0.8.3-0.20220614223926-2fcda7565af6 h1:I9dh1MXGX0wGyxdV/Sl7+ugnki4Dfsy8lv2s5Yf887o= @@ -1830,8 +1830,6 @@ github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vq github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.11.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.6/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/mattn/go-sqlite3 v1.14.7 h1:fxWBnXkxfM6sRiuH3bqJ4CfzZojMOLVc0UTsTglEghA= -github.com/mattn/go-sqlite3 v1.14.7/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/mattn/go-tty v0.0.0-20180907095812-13ff1204f104/go.mod h1:XPvLUNfbS4fJH25nqRHfWLMa1ONC8Amw+mIA639KxkE= diff --git a/lerna.json b/lerna.json index fc2a42cc6e03..55053d447780 100644 --- a/lerna.json +++ b/lerna.json @@ -1,8 +1,6 @@ { "npmClient": "yarn", "useWorkspaces": true, - "packages": [ - "packages/*" - ], - "version": "9.2.5" + "packages": ["packages/*"], + "version": "9.2.13" } diff --git a/package.json b/package.json index bdc60812d551..92bfd05e53c5 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "license": "AGPL-3.0-only", "private": true, "name": "grafana", - "version": "9.2.5", + "version": "9.2.13", "repository": "github:grafana/grafana", "scripts": { "api-tests": "jest --notify --watch --config=devenv/e2e-api-tests/jest.js", @@ -127,6 +127,7 @@ "@types/d3-force": "^2.1.0", "@types/d3-scale-chromatic": "1.3.1", "@types/debounce-promise": "3.1.4", + "@types/dompurify": "^2", "@types/enzyme": "3.10.12", "@types/enzyme-adapter-react-16": "1.0.6", "@types/eslint": "8.4.5", @@ -326,6 +327,7 @@ "dangerously-set-html-content": "1.0.9", "date-fns": "2.29.1", "debounce-promise": "3.1.2", + "dompurify": "^2.4.1", "emotion": "11.0.0", "eventemitter3": "4.0.7", "fast-deep-equal": "^3.1.3", diff --git a/packages/grafana-data/package.json b/packages/grafana-data/package.json index b491c861da3a..7094ba972e43 100644 --- a/packages/grafana-data/package.json +++ b/packages/grafana-data/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/data", - "version": "9.2.5", + "version": "9.2.13", "description": "Grafana Data Library", "keywords": [ "typescript" @@ -34,7 +34,7 @@ }, "dependencies": { "@braintree/sanitize-url": "6.0.0", - "@grafana/schema": "9.2.5", + "@grafana/schema": "9.2.13", "@types/d3-interpolate": "^1.4.0", "d3-interpolate": "1.4.0", "date-fns": "2.29.1", diff --git a/packages/grafana-data/src/types/featureToggles.gen.ts b/packages/grafana-data/src/types/featureToggles.gen.ts index 04292b94b55a..18e01320941f 100644 --- a/packages/grafana-data/src/types/featureToggles.gen.ts +++ b/packages/grafana-data/src/types/featureToggles.gen.ts @@ -16,6 +16,7 @@ export interface FeatureToggles { [name: string]: boolean | undefined; // support any string value + returnUnameHeader?: boolean; trimDefaults?: boolean; disableEnvelopeEncryption?: boolean; database_metrics?: boolean; @@ -67,4 +68,7 @@ export interface FeatureToggles { redshiftAsyncQueryDataSupport?: boolean; athenaAsyncQueryDataSupport?: boolean; increaseInMemDatabaseQueryCache?: boolean; + userRemoteCache?: boolean; + datasourceLogger?: boolean; + sessionRemoteCache?: boolean; } diff --git a/packages/grafana-data/src/vector/SortedVector.ts b/packages/grafana-data/src/vector/SortedVector.ts index 0d66dff6dedc..e2a318e95d4e 100644 --- a/packages/grafana-data/src/vector/SortedVector.ts +++ b/packages/grafana-data/src/vector/SortedVector.ts @@ -23,4 +23,8 @@ export class SortedVector implements Vector { toJSON(): T[] { return vectorToArray(this); } + + getOrderArray(): number[] { + return this.order; + } } diff --git a/packages/grafana-e2e-selectors/package.json b/packages/grafana-e2e-selectors/package.json index 361d8fe117ac..9cf2f69402ad 100644 --- a/packages/grafana-e2e-selectors/package.json +++ b/packages/grafana-e2e-selectors/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/e2e-selectors", - "version": "9.2.5", + "version": "9.2.13", "description": "Grafana End-to-End Test Selectors Library", "keywords": [ "cli", diff --git a/packages/grafana-e2e/package.json b/packages/grafana-e2e/package.json index c71120efbfd1..4359a8c542a5 100644 --- a/packages/grafana-e2e/package.json +++ b/packages/grafana-e2e/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/e2e", - "version": "9.2.5", + "version": "9.2.13", "description": "Grafana End-to-End Test Library", "keywords": [ "cli", @@ -61,7 +61,7 @@ "@babel/core": "7.19.0", "@babel/preset-env": "7.19.0", "@cypress/webpack-preprocessor": "5.12.0", - "@grafana/e2e-selectors": "9.2.5", + "@grafana/e2e-selectors": "9.2.13", "@grafana/tsconfig": "^1.2.0-rc1", "@mochajs/json-file-reporter": "^1.2.0", "babel-loader": "8.2.5", diff --git a/packages/grafana-runtime/package.json b/packages/grafana-runtime/package.json index 5eb916b6cef2..4c40df9a47a9 100644 --- a/packages/grafana-runtime/package.json +++ b/packages/grafana-runtime/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/runtime", - "version": "9.2.5", + "version": "9.2.13", "description": "Grafana Runtime Library", "keywords": [ "grafana", @@ -36,9 +36,9 @@ }, "dependencies": { "@grafana/agent-web": "^0.4.0", - "@grafana/data": "9.2.5", - "@grafana/e2e-selectors": "9.2.5", - "@grafana/ui": "9.2.5", + "@grafana/data": "9.2.13", + "@grafana/e2e-selectors": "9.2.13", + "@grafana/ui": "9.2.13", "@sentry/browser": "6.19.7", "history": "4.10.1", "lodash": "4.17.21", diff --git a/packages/grafana-runtime/src/types/analytics.ts b/packages/grafana-runtime/src/types/analytics.ts index c3e7f585303f..1a1e87332b18 100644 --- a/packages/grafana-runtime/src/types/analytics.ts +++ b/packages/grafana-runtime/src/types/analytics.ts @@ -1,3 +1,5 @@ +import { CoreApp } from '@grafana/data'; + import { EchoEvent, EchoEventType } from '../services/EchoSrv'; /** @@ -20,6 +22,7 @@ export interface DashboardInfo { * @public */ export interface DataRequestInfo extends Partial { + source?: CoreApp | string; datasourceName: string; datasourceId: number; datasourceType: string; diff --git a/packages/grafana-schema/package.json b/packages/grafana-schema/package.json index 77dc65e72396..573b5a6c811b 100644 --- a/packages/grafana-schema/package.json +++ b/packages/grafana-schema/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/schema", - "version": "9.2.5", + "version": "9.2.13", "description": "Grafana Schema Library", "keywords": [ "typescript" diff --git a/packages/grafana-toolkit/package.json b/packages/grafana-toolkit/package.json index e97ba8d5767f..8ab3f44242b1 100644 --- a/packages/grafana-toolkit/package.json +++ b/packages/grafana-toolkit/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/toolkit", - "version": "9.2.5", + "version": "9.2.13", "description": "Grafana Toolkit", "keywords": [ "grafana", @@ -50,10 +50,10 @@ "@babel/preset-env": "7.18.9", "@babel/preset-react": "7.18.6", "@babel/preset-typescript": "7.18.6", - "@grafana/data": "9.2.5", + "@grafana/data": "9.2.13", "@grafana/eslint-config": "5.0.0", "@grafana/tsconfig": "^1.2.0-rc1", - "@grafana/ui": "9.2.5", + "@grafana/ui": "9.2.13", "@jest/core": "27.5.1", "@types/command-exists": "^1.2.0", "@types/eslint": "8.4.1", diff --git a/packages/grafana-ui/package.json b/packages/grafana-ui/package.json index 108e8a895bb1..4285fe714735 100644 --- a/packages/grafana-ui/package.json +++ b/packages/grafana-ui/package.json @@ -2,7 +2,7 @@ "author": "Grafana Labs", "license": "Apache-2.0", "name": "@grafana/ui", - "version": "9.2.5", + "version": "9.2.13", "description": "Grafana Components Library", "keywords": [ "grafana", @@ -47,9 +47,9 @@ "dependencies": { "@emotion/css": "11.9.0", "@emotion/react": "11.9.3", - "@grafana/data": "9.2.5", - "@grafana/e2e-selectors": "9.2.5", - "@grafana/schema": "9.2.5", + "@grafana/data": "9.2.13", + "@grafana/e2e-selectors": "9.2.13", + "@grafana/schema": "9.2.13", "@monaco-editor/react": "4.4.5", "@popperjs/core": "2.11.5", "@react-aria/button": "3.6.1", diff --git a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx index 8139228a81c8..477104a4375e 100644 --- a/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx +++ b/packages/grafana-ui/src/components/ConfirmModal/ConfirmModal.tsx @@ -7,7 +7,7 @@ import { selectors } from '@grafana/e2e-selectors'; import { HorizontalGroup, Input } from '..'; import { useStyles2 } from '../../themes'; import { IconName } from '../../types/icon'; -import { Button } from '../Button'; +import { Button, ButtonVariant } from '../Button'; import { Modal } from '../Modal/Modal'; export interface ConfirmModalProps { @@ -21,8 +21,12 @@ export interface ConfirmModalProps { description?: React.ReactNode; /** Text for confirm button */ confirmText: string; + /** Variant for confirm button */ + confirmVariant?: ButtonVariant; /** Text for dismiss button */ dismissText?: string; + /** Variant for dismiss button */ + dismissVariant?: ButtonVariant; /** Icon for the modal header */ icon?: IconName; /** Text user needs to fill in before confirming */ @@ -43,8 +47,10 @@ export const ConfirmModal = ({ body, description, confirmText, + confirmVariant = 'destructive', confirmationText, dismissText = 'Cancel', + dismissVariant = 'secondary', alternativeText, icon = 'exclamation-triangle', onConfirm, @@ -79,11 +85,11 @@ export const ConfirmModal = ({ ) : null} -