Your commit message

.github/ISSUE_TEMPLATE/1-feature_requests.md

@@ -1,7 +1,6 @@
 ---
 name: Feature Requests
 about: Suggest an enhancement or new feature for the Grafana project
-labels: 'type/feature-request'
 ---
 
 <!-- Please only use this template for submitting feature requests -->
@@ -18,4 +17,4 @@ labels: 'type/feature-request'
 
 **Who is this feature for?**
 
-[Add information on what kind of user the feature is for.]
+[Add information on what kind of user the feature is for.]

.github/pr-checks.json

@@ -6,25 +6,6 @@
     "success": "Milestone set",
     "failure": "Milestone not set"
   },
-  {
-    "type": "check-label",
-    "title": "Backport Check",
-    "labels": {
-      "exists": "Backport enabled",
-      "notExists": "Backport decision needed",
-      "matches": [
-        "backport v*"
-      ]
-    },
-    "skip": {
-      "message": "Backport skipped",
-      "matches": [
-        "backport",
-        "no-backport"
-      ]
-    },
-    "targetUrl": "https://github.com/grafana/grafana/blob/main/contribute/merge-pull-request.md#should-the-pull-request-be-backported"
-  },
   {
     "type": "check-changelog",
     "title": "Changelog Check",

.github/pr-commands.json

@@ -149,7 +149,7 @@
   },
   {
     "type": "changedfiles",
-    "matches": [ "public/app/plugins/datasource/postgres/**/*", "pkg/tsdb/postgres/**/*"],
+    "matches": [ "public/app/plugins/datasource/grafana-postgresql-datasource/**/*", "pkg/tsdb/grafana-postgresql-datasource/**/*"],
     "action": "updateLabel",
     "addLabel": "datasource/Postgres"
   },

.github/renovate.json5

@@ -11,7 +11,7 @@
   ],
   "includePaths": ["package.json", "packages/**", "public/app/plugins/**"],
   "ignorePaths": ["emails/**", "plugins-bundled/**", "**/mocks/**", "packages/grafana-e2e/**"],
-  "labels": ["area/frontend", "dependencies", "no-backport", "no-changelog"],
+  "labels": ["area/frontend", "dependencies", "no-changelog"],
   "postUpdateOptions": ["yarnDedupeHighest"],
   "packageRules": [
     {

.github/workflows/alerting-swagger-gen.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set go version
         uses: actions/setup-go@v4
         with:
-          go-version: '1.20.10'
+          go-version: '1.21.3'
       - name: Build swagger
         run: |
           make -C pkg/services/ngalert/api/tooling post.json api.json
@@ -31,7 +31,7 @@ jobs:
             Please review and merge.
           branch: update-alerting-swagger-spec
           delete-branch: true
-          labels: 'area/alerting,type/docs,no-backport,no-changelog'
+          labels: 'area/alerting,type/docs,no-changelog'
           team-reviewers: 'grafana/alerting-backend-product'
           draft: false
 

.github/workflows/codeql-analysis.yml

@@ -47,7 +47,7 @@ jobs:
       name: Set go version
       uses: actions/setup-go@v4
       with:
-        go-version: '1.20.10'
+        go-version: '1.21.3'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/core-plugins-build-and-release.yml

@@ -45,11 +45,11 @@ jobs:
             PLUGINS_GRAFANA_API_KEY=core-plugins-build-and-release:PLUGINS_GRAFANA_API_KEY
             PLUGINS_GCOM_TOKEN=core-plugins-build-and-release:PLUGINS_GCOM_TOKEN
       - name: 'Authenticate to Google Cloud'
-        uses: 'google-github-actions/auth@v1'
+        uses: 'google-github-actions/auth@v2'
         with:
           credentials_json: '${{ env.PLUGINS_GOOGLE_CREDENTIALS }}'
       - name: 'Set up Cloud SDK'
-        uses: 'google-github-actions/setup-gcloud@v1'
+        uses: 'google-github-actions/setup-gcloud@v2'
       - name: Setup nodejs environment
         uses: actions/setup-node@v4
         with:

.github/workflows/detect-breaking-changes-build.yml

@@ -1,9 +1,9 @@
-# Only runs if anything under the packages/ directory changes. 
+# Only runs if anything under the packages/ directory changes.
 # (Otherwise detect-breaking-changes-build-skip.yml takes over)
 
 name: Levitate / Detect breaking changes
 
-on: 
+on:
   pull_request:
     paths:
       - 'packages/**'
@@ -24,7 +24,7 @@ jobs:
         path: './pr'
     - uses: actions/setup-node@v4
       with:
-        node-version: 16.16.0
+        node-version: 20.9.0
 
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
@@ -72,7 +72,7 @@ jobs:
 
     - uses: actions/setup-node@v4
       with:
-        node-version: 16.16.0
+        node-version: 20.9.0
 
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path

.github/workflows/i18n-crowdin-fix-files.yml

@@ -0,0 +1,67 @@
+# When Crowdin creates a pull request from the crowdin-service-branch branch,
+# run `yarn i18n:extract` and commit the changed grafana.json files back into the PR
+# to reformat crowdin's changes to prevent conflicts with our CI checks.
+
+name: Fix Crowdin I18n files
+
+on:
+  pull_request:
+    paths:
+      - 'public/locales/*/grafana.json'
+    branches:
+      - main # Only run on pull requests *target* main (will be merged into main)
+
+jobs:
+  fix-files:
+    # Only run on pull requests *from* the crowdin-service-branch branch
+    if: github.head_ref == 'crowdin-service-branch'
+
+    name: Fix files
+    runs-on: ubuntu-latest
+
+
+    permissions:
+      contents: write # needed to commit changes back into the PR
+      pull-requests: write # needed to update PR description
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          ref: ${{ github.head_ref }}
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20.9.0
+          cache: 'yarn'
+
+      - name: Install dependencies
+        run: yarn install
+
+      - name: Extract I18n files
+        run: yarn i18n:extract
+
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@8756aa072ef5b4a080af5dc8fef36c5d586e521d # v5.0.0
+        with:
+          commit_message: "Github Action: Auto-fix i18n files"
+          file_pattern: public/locales/*/grafana.json
+
+      - name: Update PR description
+        uses: devindford/Append_PR_Comment@32dd2619cd96ac8da9907c416c992fe265233ca8 # v1.1.3
+        if: ${{ ! contains(github.event.pull_request.body, 'Steps for merging') }}
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          body-update-action: prefix
+          body-template: |
+            :robot: Automatic sync of translations from Crowdin.
+
+            Steps for merging:
+              1. Wait for the "Github Action: Auto-fix i18n files" commit that may be required for CI to pass.
+              2. A quick sanity check of the changes and approve. Things to look out for:
+                - No changes to the English strings. The source of truth is already in the main branch, NOT Crowdin.
+                - Translations maybe be removed if the English phrase was removed, but there should not be many of these
+                - Anything else that looks 'funky'. Ask if you're not sure.
+              3. Approve & (Auto-)merge. :tada:
+
+            If there's a conflict, close the pull request and **delete the branch**. Crowdin will recreate the pull request eventually.
+            Remember, the longer this pull request is open, the more likely it is that it'll get conflicts.

.github/workflows/pr-codeql-analysis-go.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Set go version
       uses: actions/setup-go@v4
       with:
-        go-version: '1.20.10'
+        go-version: '1.21.3'
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/publish-kinds-next.yml

@@ -36,7 +36,7 @@ jobs:
       - name: "Setup Go"
         uses: "actions/setup-go@v4"
         with:
-          go-version: '1.20.10'
+          go-version: '1.21.3'
 
       - name: "Verify kinds"
         run: go run .github/workflows/scripts/kinds/verify-kinds.go

.github/workflows/publish-kinds-release.yml

@@ -39,7 +39,7 @@ jobs:
       - name: "Setup Go"
         uses: "actions/setup-go@v4"
         with:
-          go-version: '1.20.10'
+          go-version: '1.21.3'
 
       - name: "Verify kinds"
         run: go run .github/workflows/scripts/kinds/verify-kinds.go

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           # Number of days of inactivity before a stale Issue or Pull Request is closed.

.github/workflows/update-make-docs.yml

@@ -2,26 +2,18 @@ name: Update `make docs` procedure
 on:
   schedule:
     - cron: '0 7 * * 1-5'
+  workflow_dispatch:
 jobs:
   main:
     if: github.repository == 'grafana/grafana'
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Update procedure
-        run: |
-          curl -s -Lo docs/docs.mk https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/docs.mk
-          curl -s -Lo docs/make-docs https://raw.githubusercontent.com/grafana/writers-toolkit/main/docs/make-docs
-          if git diff --exit-code; then exit 0; fi
-          BRANCH="$(date +%Y-%m-%d)/update-make-docs"
-          git checkout -b "${BRANCH}"
-          git add .
-          git config --local user.email "[email protected]"
-          git config --local user.name "grafanabot"
-          git commit -m "Update \`make docs\` procedure"
-          git push -v origin "refs/heads/${BRANCH}"
-          gh pr create --fill --label no-changelog --label --no-backport --label type/docs
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v4
+      - uses: grafana/writers-toolkit/update-make-docs@update-make-docs/v1
+        with:
+          pr_options: >
+            --label 'backport v10.0.x'
+            --label 'backport v10.1.x'
+            --label 'backport v10.2.x'
+            --label no-changelog
+            --label type/docs

.github/workflows/verify-kinds.yml

@@ -18,7 +18,7 @@ jobs:
       - name: "Setup Go"
         uses: "actions/setup-go@v4"
         with:
-          go-version: '1.20.10'
+          go-version: '1.21.3'
 
       - name: "Verify kinds"
         run: go run .github/workflows/scripts/kinds/verify-kinds.go

.gitignore

@@ -7,8 +7,6 @@ awsconfig
 /.awcache
 /dist
 /public/build
-/public/views/index.html
-/public/views/error.html
 /emails/dist
 /reports
 /e2e/tmp
@@ -78,6 +76,13 @@ public/css/*.min.css
 /data/*
 /bin/*
 
+# any certificates generated by grafana apiserver
+apiserver.local.config/
+default.etcd/
+
+# kubeconfig path used by example apiserver
+example-apiserver/
+
 # devenv
 /devenv/docker-compose.yaml
 /devenv/docker-compose.override.yaml

.pa11yci-pr.conf.js

@@ -51,6 +51,7 @@ var config = {
     useIncognitoBrowserContext: false,
     standard: 'WCAG2AA',
     chromeLaunchConfig: {
+      executablePath: '/usr/bin/google-chrome',
       args: ['--no-sandbox'],
     },
     // see https://github.com/grafana/grafana/pull/41693#issuecomment-979921463 for context
@@ -72,8 +73,8 @@ var config = {
         "wait for element input[name='user'] to be added",
         "set field input[name='user'] to admin",
         "set field input[name='password'] to admin",
-        "click element button[aria-label='Login button']",
-        "wait for element [aria-label='Skip change password button'] to be visible",
+        "click element button[data-testid='data-testid Login button']",
+        "wait for element button[data-testid='data-testid Skip change password button'] to be visible",
       ],
       threshold: 15,
       rootElement: '.main-view',

.pa11yci.conf.js

@@ -61,8 +61,8 @@ var config = {
         "wait for element input[name='user'] to be added",
         "set field input[name='user'] to admin",
         "set field input[name='password'] to admin",
-        "click element button[aria-label='Login button']",
-        "wait for element [aria-label='Skip change password button'] to be visible",
+        "click element button[data-testid='data-testid Login button']",
+        "wait for element button[data-testid='data-testid Skip change password button'] to be visible",
       ],
       wait: 500,
       rootElement: '.main-view',

.vscode/launch.json

@@ -11,6 +11,16 @@
       "cwd": "${workspaceFolder}",
       "args": ["server", "--homepath", "${workspaceFolder}", "--packaging", "dev"]
     },
+    {
+      "name": "Run API Server (k8s)",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}/pkg/cmd/grafana/",
+      "env": {},
+      "cwd": "${workspaceFolder}",
+      "args": ["apiserver", "example.grafana.app"]
+    },
     {
       "name": "Attach to Chrome",
       "port": 9222,

.yarn/sdks/typescript/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript",
-  "version": "4.8.4-sdk",
+  "version": "5.2.2-sdk",
   "main": "./lib/typescript.js",
   "type": "commonjs",
   "bin": {