Update branch from current release

.changeset/breezy-sails-pay.md

@@ -0,0 +1,5 @@
+---
+'grafana-github-datasource': patch
+---
+
+update create-plugin configs

.changeset/fancy-teeth-search.md

@@ -0,0 +1,5 @@
+---
+'grafana-github-datasource': patch
+---
+
+Fixed the broken E2E tests with updated plugin-e2e package

.config/.cprc.json

@@ -1,3 +1,4 @@
 {
-  "version": "5.25.8"
+  "version": "6.6.0",
+  "features": {}
 }

.config/bundler/externals.ts

@@ -0,0 +1,43 @@
+import type { Configuration, ExternalItemFunctionData } from 'webpack';
+
+type ExternalsType = Configuration['externals'];
+
+export const externals: ExternalsType = [
+  // Required for dynamic publicPath resolution
+  { 'amd-module': 'module' },
+  'lodash',
+  'jquery',
+  'moment',
+  'slate',
+  'emotion',
+  '@emotion/react',
+  '@emotion/css',
+  'prismjs',
+  'slate-plain-serializer',
+  '@grafana/slate-react',
+  'react',
+  'react-dom',
+  'react-redux',
+  'redux',
+  'rxjs',
+  'i18next',
+  'react-router',
+  'd3',
+  'angular',
+  /^@grafana\/ui/i,
+  /^@grafana\/runtime/i,
+  /^@grafana\/data/i,
+
+  // Mark legacy SDK imports as external if their name starts with the "grafana/" prefix
+  ({ request }: ExternalItemFunctionData, callback: (error?: Error, result?: string) => void) => {
+    const prefix = 'grafana/';
+    const hasPrefix = (request: string) => request.indexOf(prefix) === 0;
+    const stripPrefix = (request: string) => request.slice(prefix.length);
+
+    if (request && hasPrefix(request)) {
+      return callback(undefined, stripPrefix(request));
+    }
+
+    callback();
+  },
+];

.config/docker-compose-base.yaml

@@ -7,7 +7,7 @@ services:
       context: .
       args:
         grafana_image: ${GRAFANA_IMAGE:-grafana-enterprise}
-        grafana_version: ${GRAFANA_VERSION:-12.1.0}
+        grafana_version: ${GRAFANA_VERSION:-12.2.0}
         development: ${DEVELOPMENT:-false}
         anonymous_auth_enabled: ${ANONYMOUS_AUTH_ENABLED:-true}
     ports:

.config/eslint.config.mjs

@@ -0,0 +1,31 @@
+import { defineConfig } from 'eslint/config';
+import grafanaConfig from '@grafana/eslint-config/flat.js';
+
+export default defineConfig([
+  ...grafanaConfig,
+  {
+    rules: {
+      'react/prop-types': 'off',
+    },
+  },
+  {
+    files: ['src/**/*.{ts,tsx}'],
+
+    languageOptions: {
+      parserOptions: {
+        project: './tsconfig.json',
+      },
+    },
+
+    rules: {
+      '@typescript-eslint/no-deprecated': 'warn',
+    },
+  },
+  {
+    files: ['./tests/**/*'],
+
+    rules: {
+      'react-hooks/rules-of-hooks': 'off',
+    },
+  },
+]);

.config/types/setupTests.d.ts

@@ -0,0 +1 @@
+import '@testing-library/jest-dom';

.config/webpack/webpack.config.ts

@@ -19,9 +19,11 @@ import VirtualModulesPlugin from 'webpack-virtual-modules';
 import { BuildModeWebpackPlugin } from './BuildModeWebpackPlugin.ts';
 import { DIST_DIR, SOURCE_DIR } from './constants.ts';
 import { getCPConfigVersion, getEntries, getPackageJson, getPluginJson, hasReadme, isWSL } from './utils.ts';
+import { externals } from '../bundler/externals.ts';
 
 const pluginJson = getPluginJson();
 const cpVersion = getCPConfigVersion();
+const pluginVersion = getPackageJson().version;
 
 const virtualPublicPath = new VirtualModulesPlugin({
   'node_modules/grafana-public-path.js': `
@@ -54,44 +56,7 @@ const config = async (env: Env): Promise<Configuration> => {
 
     entry: await getEntries(),
 
-    externals: [
-      // Required for dynamic publicPath resolution
-      { 'amd-module': 'module' },
-      'lodash',
-      'jquery',
-      'moment',
-      'slate',
-      'emotion',
-      '@emotion/react',
-      '@emotion/css',
-      'prismjs',
-      'slate-plain-serializer',
-      '@grafana/slate-react',
-      'react',
-      'react-dom',
-      'react-redux',
-      'redux',
-      'rxjs',
-      'react-router',
-      'd3',
-      'angular',
-      /^@grafana\/ui/i,
-      /^@grafana\/runtime/i,
-      /^@grafana\/data/i,
-
-      // Mark legacy SDK imports as external if their name starts with the "grafana/" prefix
-      ({ request }, callback) => {
-        const prefix = 'grafana/';
-        const hasPrefix = (request: string) => request.indexOf(prefix) === 0;
-        const stripPrefix = (request: string) => request.substr(prefix.length);
-
-        if (request && hasPrefix(request)) {
-          return callback(undefined, stripPrefix(request));
-        }
-
-        callback();
-      },
-    ],
+    externals,
 
     // Support WebAssembly according to latest spec - makes WebAssembly module async
     experiments: {
@@ -195,7 +160,8 @@ const config = async (env: Env): Promise<Configuration> => {
       virtualPublicPath,
       // Insert create plugin version information into the bundle
       new webpack.BannerPlugin({
-        banner: '/* [create-plugin] version: ' + cpVersion + ' */',
+        banner: `/* [create-plugin] version: ${cpVersion} */
+          /* [create-plugin] plugin: ${pluginJson.id}@${pluginVersion} */`,
         raw: true,
         entryOnly: true,
       }),
@@ -221,11 +187,12 @@ const config = async (env: Env): Promise<Configuration> => {
       new ReplaceInFileWebpackPlugin([
         {
           dir: DIST_DIR,
-          files: ['plugin.json', 'README.md'],
+          test: [/(^|\/)plugin\.json$/, /(^|\/)README\.md$/],
+
           rules: [
             {
               search: /\%VERSION\%/g,
-              replace: getPackageJson().version,
+              replace: pluginVersion,
             },
             {
               search: /\%TODAY\%/g,

.github/workflows/add-to-project.yml

@@ -16,20 +16,12 @@ jobs:
     name: Add issue to project
     runs-on: ubuntu-latest
     steps:
-      - id: get-secrets
-        uses: grafana/shared-workflows/actions/get-vault-secrets@main # zizmor: ignore[unpinned-uses]
+      - id: get-github-token
+        uses: grafana/shared-workflows/actions/create-github-app-token@ae92934a14a48b94494dbc06d74a81d47fe08a40 # create-github-app-token/v0.2.2
         with:
-          repo_secrets: |
-            GITHUB_APP_ID=grafana-oss-big-tent:app-id
-            GITHUB_APP_PRIVATE_KEY=grafana-oss-big-tent:private-key
-      - name: Generate a token
-        id: generate-token
-        uses: actions/create-github-app-token@v1
-        with:
-          app-id: ${{ env.GITHUB_APP_ID }}
-          private-key: ${{ env.GITHUB_APP_PRIVATE_KEY }}
-          owner: ${{ github.repository_owner }}
-      - uses: actions/add-to-project@main
+          github_app: grafana-oss-big-tent
+      - name: Add to project
+        uses: actions/add-to-project@main
         with:
           project-url: https://github.com/orgs/grafana/projects/457
-          github-token: ${{ steps.generate-token.outputs.token }}
+          github-token: ${{ steps.get-github-token.outputs.token }}

.github/workflows/publish.yaml

@@ -27,11 +27,12 @@ on:
 jobs:
   cd:
     name: CD
-    uses: grafana/plugin-ci-workflows/.github/workflows/cd.yml@main
+    uses: grafana/plugin-ci-workflows/.github/workflows/cd.yml@ci-cd-workflows/v4.1.0
     with:
       go-version: '1.25'
       golangci-lint-version: '2.4.0'
       branch: ${{ github.event.inputs.branch }}
       environment: ${{ github.event.inputs.environment }}
       docs-only: ${{ fromJSON(github.event.inputs.docs-only) }}
       run-playwright: true
+      github-draft-release: false

.github/workflows/push.yaml

@@ -14,7 +14,7 @@ on:
 jobs:
   ci:
     name: CI
-    uses: grafana/plugin-ci-workflows/.github/workflows/ci.yml@main
+    uses: grafana/plugin-ci-workflows/.github/workflows/ci.yml@ci-cd-workflows/v4.1.0
     with:
       go-version: '1.25'
       golangci-lint-version: '2.4.0'

.github/workflows/update-create-plugin.yml

@@ -7,10 +7,17 @@ on:
 
 permissions:
   contents: write
+  id-token: write # Needed for create-github-app-token
   pull-requests: write
 
 jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: grafana/plugin-actions/create-plugin-update@main
+      - id: get-github-token
+        uses: grafana/shared-workflows/actions/create-github-app-token@ae92934a14a48b94494dbc06d74a81d47fe08a40 # create-github-app-token/v0.2.2
+        with:
+          github_app: grafana-oss-big-tent
+      - uses: grafana/plugin-actions/create-plugin-update@244c3bc9c6eb94bc1dd6458ade2462499bbf0f5b #create-plugin-update/v2.0.1
+        with:
+          token: ${{ steps.get-github-token.outputs.token }}

.gitignore

@@ -17,3 +17,11 @@ mage_output_file.go
 
 # provisioning
 /provisioning/
+
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Change Log
 
+## 2.4.0
+
+### Minor Changes
+
+🚀 Add support for PDC
+
+### Patch Changes
+
+🐛 Fix empty results in Workflows query type. Added nil check for CreatedAt/UpdatedAt timestamps and added "None" option to Time Field dropdown (default) to return all workflows without time filtering.
+
+## 2.3.0
+
+🚀 Add UpdatedAt time field to pull request queries
+
+🐛 Add runStartedAt field for workflow runs query response
+
 ## 2.2.0
 
 🚀 Adds support for Pull Request Review queries

README.md

@@ -22,6 +22,10 @@ Watch this video to learn more about setting up the Grafana GitHub data source p
 
 This data source uses the [`githubv4` package](https://github.com/shurcooL/githubv4), which is under active development.
 
+## Private data source connect - Only for Grafana Cloud users.
+
+Establishes a private, secured connection between a Grafana Cloud stack and data sources within a private network. Use the drop-down to locate the PDC URL. For setup instructions, refer to [Private data source connect (PDC)](https://grafana.com/docs/grafana-cloud/connect-externally-hosted/private-data-source-connect/) and [Configure PDC](https://grafana.com/docs/grafana-cloud/connect-externally-hosted/private-data-source-connect/configure-pdc/#configure-grafana-private-data-source-connect-pdc). Click Manage private data source connect to open your PDC connection page and view your configuration details.
+
 ## Frequently Asked Questions
 
 - **Why does it sometimes take up to 5 minutes for my new pull request / new issue / new commit to show up?**

docs/sources/query/_index.md

@@ -554,10 +554,16 @@ List GitHub Actions workflows defined in a repository.
 | ---------- | -------------------------------------------------- | -------- |
 | owner      | GitHub user or organization that owns the repository | Yes      |
 | repository | Name of the repository                             | Yes      |
-| Time Field | The time field to filter the responses on, can be: `CreatedAt` or `UpdatedAt` | Yes      |
+| Time Field | The time field to filter the responses on, can be: `None` (returns all workflows), `CreatedAt`, or `UpdatedAt` | Yes      |
 
 ##### Sample queries
 
+Show all workflows in the `grafana/grafana` repository:
+
+- Owner: `grafana`
+- Repository: `grafana`
+- Time Field: `None`
+
 Show all workflows created within the `grafana/grafana` repository within the current time range:
 
 - Owner: `grafana`

docs/sources/setup/datasource.md

@@ -34,6 +34,13 @@ weight: 103
 
 1. Click **Save & Test** button and you should see a confirmation dialog box that says "Data source is working".
 
+**Private data source connect** - _Only for Grafana Cloud users._
+
+| Setting                         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      |
+| ------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| **Private data source connect** | Establishes a private, secured connection between a Grafana Cloud stack and data sources within a private network. Use the drop-down to locate the PDC URL. For setup instructions, refer to [Private data source connect (PDC)](https://grafana.com/docs/grafana-cloud/connect-externally-hosted/private-data-source-connect/configure-pdc/#configure-grafana-private-data-source-connect-pdc) and [Configure PDC](https://grafana.com/docs/grafana-cloud/connect-externally-hosted/private-data-source-connect/). Click **Manage private data source connect** to open your PDC connection page and view your configuration details. |
+
+
 {{< admonition type="tip" >}}
 If you see errors, check the Grafana logs for troubleshooting.
 {{< /admonition >}}