Add more variants to cloud version

Chore: Update SAML lib (#824 )
Update saml lib
2025-12-21 12:04:45 +08:00 · 2023-04-06 13:13:31 +03:00 · 2023-04-06 10:10:56 +02:00 · 2023-04-06 10:10:55 +02:00 · 2023-04-06 10:10:54 +02:00 · 2023-04-06 10:30:45 +03:00
46 changed files with 847 additions and 248 deletions
--- a/docs/sources/introduction/_index.md
+++ b/docs/sources/introduction/_index.md
@@ -8,7 +8,7 @@ weight: 5

 # Grafana OSS

-[Grafana open source software](https://grafana.com/oss/) enables you to query, visualize, alert on, and explore your metrics, logs, and traces wherever they are stored. Grafana OSS provides you with tools to turn your time-series database (TSDB) data into insightful graphs and visualizations.
+[Grafana open source software](https://grafana.com/oss/) enables you to query, visualize, alert on, and explore your metrics, logs, and traces wherever they are stored. Grafana OSS provides you with tools to turn your time-series database (TSDB) data into insightful graphs and visualizations. The Grafana OSS plugin framework also enables you to connect other data sources like NoSQL/SQL databases, ticketing tools like Jira or ServiceNow, and CI/CD tooling like GitLab.

 After you have [installed Grafana]({{< relref "../setup-grafana/installation/" >}}) and set up your first dashboard using instructions in [Getting started with Grafana]({{< relref "../getting-started/build-first-dashboard.md" >}}), you will have many options to choose from depending on your requirements. For example, if you want to view weather data and statistics about your smart home, then you can create a [playlist]({{< relref "../dashboards/create-manage-playlists/" >}}). If you are the administrator for an enterprise and are managing Grafana for multiple teams, then you can set up [provisioning]({{< relref "../administration/provisioning/" >}}) and [authentication]({{< relref "../setup-grafana/configure-security/configure-authentication/" >}}).

@@ -71,3 +71,5 @@ In addition to Grafana, Grafana Labs also provides the following open source pro
 **Grafana Tempo:** Grafana Tempo is an open source, easy-to-use and high-volume distributed tracing backend. For more information, refer to [Grafana Tempo documentation](https://grafana.com/docs/tempo/latest/?pg=oss-tempo&plcmt=hero-txt/).

 **Grafana Mimir:** Grafana Mimir is an open source software project that provides a scalable long-term storage for Prometheus. For more information about Grafana Mimir, refer to [Grafana Mimir documentation](https://grafana.com/docs/mimir/latest/).
+
+**Grafana Phlare:** Grafana Phlare is an open-source software project for aggregating continuous profiling data. Continuous profiling is an observability signal that enables you to understand your workload's resource (CPU, memory, etc.) usage to the exact line number. For more information about using Grafana Phlare, refer to [Grafana Phlare documentation](https://grafana.com/docs/phlare/latest/).
--- a/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md
+++ b/docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md
@@ -18,7 +18,7 @@ weight: 900

 The enhanced LDAP integration adds additional functionality on top of the [LDAP integration]({{< relref "ldap/" >}}) available in the open source edition of Grafana.

-> **Note:** Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced](/docs/grafana-cloud).
+> **Note:** Available in [Grafana Enterprise]({{< relref "../../../../introduction/grafana-enterprise/" >}}) and [Grafana Cloud Advanced](/docs/grafana-cloud). If you are a Grafana Cloud customer, please [open a support ticket in the Cloud Portal](https://grafana.com/orgs/$org/tickets) to request this feature.

 > To control user access with role-based permissions, refer to [role-based access control]({{< relref "../../../../administration/roles-and-permissions/access-control/" >}}).

--- a/go.mod
+++ b/go.mod
@@ -400,7 +400,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.13-0.20230203140620-5f476db5c00a
+replace github.com/crewjam/saml => github.com/grafana/saml v0.4.13-0.20230331080031-67cbfa09c7b6

 // Thema's thema CLI requires cobra, which eventually works its way down to go-hclog@v1.0.0.
 // Upgrading affects backend plugins: https://github.com/grafana/grafana/pull/47653#discussion_r850508593
--- a/go.sum
+++ b/go.sum
@@ -1284,8 +1284,8 @@ github.com/grafana/phlare/api v0.1.3 h1:mYTaE9mLsAW/uzPXlW/PQSLsZ4ojBFA+oAMfR/PD
 github.com/grafana/phlare/api v0.1.3/go.mod h1:29vcLwFDmZBDce2jwFIMtzvof7fzPadT8VMKw9ks7FU=
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20230308154952-78fedf89728b h1:VQOGGGJ2lKcVPANyzIESKYhSeA0QIvUQwfA3CbrkDfA=
 github.com/grafana/prometheus-alertmanager v0.25.1-0.20230308154952-78fedf89728b/go.mod h1:MnBfDPXJqXmmfPwQlCLvVUdqfnvrAw+hSPtDeaaFwj4=
-github.com/grafana/saml v0.4.13-0.20230203140620-5f476db5c00a h1:aWSTt/pTOI4uGY9DhBMG1l0GOnGjIYtaqxzYR3/q82o=
-github.com/grafana/saml v0.4.13-0.20230203140620-5f476db5c00a/go.mod h1:igEejV+fihTIlHXYP8zOec3V5A8y3lws5bQBFsTm4gA=
+github.com/grafana/saml v0.4.13-0.20230331080031-67cbfa09c7b6 h1:oHn/OOUkECNX06DPHksS7R3UY5Qdye04b/sBj2/OJ5E=
+github.com/grafana/saml v0.4.13-0.20230331080031-67cbfa09c7b6/go.mod h1:igEejV+fihTIlHXYP8zOec3V5A8y3lws5bQBFsTm4gA=
 github.com/grafana/sqlds/v2 v2.3.10 h1:HWKhE0vR6LoEiE+Is8CSZOgaB//D1yqb2ntkass9Fd4=
 github.com/grafana/sqlds/v2 v2.3.10/go.mod h1:c6ibxnxRVGxV/0YkEgvy7QpQH/lyifFyV7K/14xvdIs=
 github.com/grafana/thema v0.0.0-20230302221249-6952e4a999b7 h1:XOxaBjhozlleshff3mKNdp55ul74nXJEX3wz8ckjTpc=
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,8 @@
 {
  "npmClient": "yarn",
  "useWorkspaces": true,
-  "packages": ["packages/*"],
-  "version": "9.5.0-pre"
+  "packages": [
+    "packages/*"
+  ],
+  "version": "9.5.0"
 }
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
  "license": "AGPL-3.0-only",
  "private": true,
  "name": "grafana",
-  "version": "9.5.0-pre",
+  "version": "9.5.0",
  "repository": "github:grafana/grafana",
  "scripts": {
    "build": "yarn i18n:compile && NODE_ENV=production webpack --progress --config scripts/webpack/webpack.prod.js",
--- 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.5.0-pre",
+  "version": "9.5.0",
  "description": "Grafana Data Library",
  "keywords": [
    "typescript"
@@ -36,7 +36,7 @@
  },
  "dependencies": {
    "@braintree/sanitize-url": "6.0.2",
-    "@grafana/schema": "9.5.0-pre",
+    "@grafana/schema": "9.5.0",
    "@types/d3-interpolate": "^3.0.0",
    "d3-interpolate": "3.0.1",
    "date-fns": "2.29.3",
--- a/packages/grafana-data/src/field/fieldOverrides.test.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.test.ts
@@ -441,6 +441,124 @@ describe('setFieldConfigDefaults', () => {
      }
    `);
  });
+
+  it('applies field config defaults correctly when links property exist in field config and no links are defined in panel', () => {
+    const dsFieldConfig: FieldConfig = {
+      links: [
+        {
+          title: 'Google link',
+          url: 'https://google.com',
+        },
+      ],
+    };
+
+    const panelFieldConfig: FieldConfig = {};
+
+    const context: FieldOverrideEnv = {
+      data: [],
+      field: { type: FieldType.number } as Field,
+      dataFrameIndex: 0,
+      fieldConfigRegistry: customFieldRegistry,
+    };
+
+    // we mutate dsFieldConfig
+    // @ts-ignore
+    setFieldConfigDefaults(dsFieldConfig, panelFieldConfig, context);
+
+    expect(dsFieldConfig).toMatchInlineSnapshot(`
+      {
+        "custom": {},
+        "links": [
+          {
+            "title": "Google link",
+            "url": "https://google.com",
+          },
+        ],
+      }
+    `);
+  });
+
+  it('applies field config defaults correctly when links property exist in panel config and no links are defined in ds field config', () => {
+    const dsFieldConfig: FieldConfig = {};
+
+    const panelFieldConfig: FieldConfig = {
+      links: [
+        {
+          title: 'Google link',
+          url: 'https://google.com',
+        },
+      ],
+    };
+
+    const context: FieldOverrideEnv = {
+      data: [],
+      field: { type: FieldType.number } as Field,
+      dataFrameIndex: 0,
+      fieldConfigRegistry: customFieldRegistry,
+    };
+
+    // we mutate dsFieldConfig
+    // @ts-ignore
+    setFieldConfigDefaults(dsFieldConfig, panelFieldConfig, context);
+
+    expect(dsFieldConfig).toMatchInlineSnapshot(`
+      {
+        "custom": {},
+        "links": [
+          {
+            "title": "Google link",
+            "url": "https://google.com",
+          },
+        ],
+      }
+    `);
+  });
+
+  it('applies a merge strategy for links when they exist in ds config and panel', () => {
+    const dsFieldConfig: FieldConfig = {
+      links: [
+        {
+          title: 'Google link',
+          url: 'https://google.com',
+        },
+      ],
+    };
+
+    const panelFieldConfig: FieldConfig = {
+      links: [
+        {
+          title: 'Grafana',
+          url: 'https://grafana.com',
+        },
+      ],
+    };
+
+    const context: FieldOverrideEnv = {
+      data: [],
+      field: { type: FieldType.number } as Field,
+      dataFrameIndex: 0,
+      fieldConfigRegistry: customFieldRegistry,
+    };
+
+    // we mutate dsFieldConfig
+    setFieldConfigDefaults(dsFieldConfig, panelFieldConfig, context);
+
+    expect(dsFieldConfig).toMatchInlineSnapshot(`
+      {
+        "custom": {},
+        "links": [
+          {
+            "title": "Google link",
+            "url": "https://google.com",
+          },
+          {
+            "title": "Grafana",
+            "url": "https://grafana.com",
+          },
+        ],
+      }
+    `);
+  });
 });

 describe('setDynamicConfigValue', () => {
--- a/packages/grafana-data/src/field/fieldOverrides.ts
+++ b/packages/grafana-data/src/field/fieldOverrides.ts
@@ -293,6 +293,11 @@ export function setDynamicConfigValue(config: FieldConfig, value: DynamicConfigV
 // config -> from DS
 // defaults -> from Panel config
 export function setFieldConfigDefaults(config: FieldConfig, defaults: FieldConfig, context: FieldOverrideEnv) {
+  // For cases where we have links on the datasource config and the panel config, we need to merge them
+  if (config.links && defaults.links) {
+    // Combine the data source links and the panel default config links
+    config.links = [...config.links, ...defaults.links];
+  }
  for (const fieldConfigProperty of context.fieldConfigRegistry.list()) {
    if (fieldConfigProperty.isCustom && !config.custom) {
      config.custom = {};
--- a/packages/grafana-data/src/types/app.ts
+++ b/packages/grafana-data/src/types/app.ts
@@ -97,7 +97,7 @@ export class AppPlugin<T extends KeyValue = KeyValue> extends GrafanaPlugin<AppP
    return this._extensionConfigs;
  }

-  configureExtensionLink<Context extends object>(extension: Exclude<PluginExtensionLinkConfig<Context>, 'type'>) {
+  configureExtensionLink<Context extends object>(extension: Omit<PluginExtensionLinkConfig<Context>, 'type'>) {
    this._extensionConfigs.push({
      ...extension,
      type: PluginExtensionTypes.link,
--- a/packages/grafana-data/src/types/pluginExtensions.ts
+++ b/packages/grafana-data/src/types/pluginExtensions.ts
@@ -1,3 +1,5 @@
+import { DataQuery } from '@grafana/schema';
+
 import { RawTimeRange, TimeZone } from './time';

 // Plugin Extensions types
@@ -18,7 +20,7 @@ export type PluginExtension = {
 export type PluginExtensionLink = PluginExtension & {
  type: PluginExtensionTypes.link;
  path?: string;
-  onClick?: (event: React.MouseEvent) => void;
+  onClick?: (event?: React.MouseEvent) => void;
 };

 // Objects used for registering extensions (in app plugins)
@@ -43,7 +45,7 @@ export type PluginExtensionLinkConfig<Context extends object = object> = PluginE
  Context,
  Pick<PluginExtensionLink, 'path'> & {
    type: PluginExtensionTypes.link;
-    onClick?: (event: React.MouseEvent, helpers: PluginExtensionEventHelpers<Context>) => void;
+    onClick?: (event: React.MouseEvent | undefined, helpers: PluginExtensionEventHelpers<Context>) => void;
  }
 >;

@@ -73,7 +75,7 @@ export type PluginExtensionPanelContext = {
  timeRange: RawTimeRange;
  timeZone: TimeZone;
  dashboard: Dashboard;
-  targets: Target[];
+  targets: DataQuery[];
 };

 type Dashboard = {
@@ -81,8 +83,3 @@ type Dashboard = {
  title: string;
  tags: string[];
 };
-
-type Target = {
-  pluginId: string;
-  refId: string;
-};
--- 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.5.0-pre",
+  "version": "9.5.0",
  "description": "Grafana End-to-End Test Selectors Library",
  "keywords": [
    "cli",
--- 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.5.0-pre",
+  "version": "9.5.0",
  "description": "Grafana End-to-End Test Library",
  "keywords": [
    "cli",
@@ -63,7 +63,7 @@
    "@babel/core": "7.20.5",
    "@babel/preset-env": "7.20.2",
    "@cypress/webpack-preprocessor": "5.17.0",
-    "@grafana/e2e-selectors": "9.5.0-pre",
+    "@grafana/e2e-selectors": "9.5.0",
    "@grafana/tsconfig": "^1.2.0-rc1",
    "@mochajs/json-file-reporter": "^1.2.0",
    "babel-loader": "9.1.2",
--- a/packages/grafana-eslint-rules/package.json
+++ b/packages/grafana-eslint-rules/package.json
@@ -1,7 +1,7 @@
 {
  "name": "@grafana/eslint-plugin",
  "description": "ESLint rules for use within the Grafana repo. Not suitable (or supported) for external use.",
-  "version": "9.5.0-pre",
+  "version": "9.5.0",
  "main": "./index.cjs",
  "author": "Grafana Labs",
  "license": "Apache-2.0",
--- 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.5.0-pre",
+  "version": "9.5.0",
  "description": "Grafana Runtime Library",
  "keywords": [
    "grafana",
@@ -37,10 +37,10 @@
    "postpack": "mv package.json.bak package.json"
  },
  "dependencies": {
-    "@grafana/data": "9.5.0-pre",
-    "@grafana/e2e-selectors": "9.5.0-pre",
+    "@grafana/data": "9.5.0",
+    "@grafana/e2e-selectors": "9.5.0",
    "@grafana/faro-web-sdk": "1.0.2",
-    "@grafana/ui": "9.5.0-pre",
+    "@grafana/ui": "9.5.0",
    "@sentry/browser": "6.19.7",
    "history": "4.10.1",
    "lodash": "4.17.21",
--- 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.5.0-pre",
+  "version": "9.5.0",
  "description": "Grafana Schema Library",
  "keywords": [
    "typescript"
--- 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.5.0-pre",
+  "version": "9.5.0",
  "description": "Grafana Toolkit",
  "keywords": [
    "grafana",
@@ -51,10 +51,10 @@
    "@babel/preset-env": "7.18.9",
    "@babel/preset-react": "7.18.6",
    "@babel/preset-typescript": "7.18.6",
-    "@grafana/data": "9.5.0-pre",
+    "@grafana/data": "9.5.0",
    "@grafana/eslint-config": "5.1.0",
    "@grafana/tsconfig": "^1.2.0-rc1",
-    "@grafana/ui": "9.5.0-pre",
+    "@grafana/ui": "9.5.0",
    "@jest/core": "27.5.1",
    "@types/command-exists": "^1.2.0",
    "@types/eslint": "8.4.1",
--- 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.5.0-pre",
+  "version": "9.5.0",
  "description": "Grafana Components Library",
  "keywords": [
    "grafana",
@@ -49,10 +49,10 @@
  "dependencies": {
    "@emotion/css": "11.10.6",
    "@emotion/react": "11.10.6",
-    "@grafana/data": "9.5.0-pre",
-    "@grafana/e2e-selectors": "9.5.0-pre",
+    "@grafana/data": "9.5.0",
+    "@grafana/e2e-selectors": "9.5.0",
    "@grafana/faro-web-sdk": "1.0.2",
-    "@grafana/schema": "9.5.0-pre",
+    "@grafana/schema": "9.5.0",
    "@leeoniya/ufuzzy": "1.0.6",
    "@monaco-editor/react": "4.4.6",
    "@popperjs/core": "2.11.6",
--- a/pkg/build/config/versions.go
+++ b/pkg/build/config/versions.go
@@ -206,6 +206,14 @@ var Versions = VersionMap{
 	},
 	CloudMode: {
 		Variants: []Variant{
+			VariantArmV6,
+			VariantArmV7,
+			VariantArmV7Musl,
+			VariantArm64,
+			VariantArm64Musl,
+			VariantDarwinAmd64,
+			VariantWindowsAmd64,
+			VariantLinuxAmd64,
 			VariantLinuxAmd64Musl,
 		},
 		PluginSignature: PluginSignature{
@@ -216,9 +224,12 @@ var Versions = VersionMap{
 			ShouldSave: true,
 			Architectures: []Architecture{
 				ArchAMD64,
+				ArchARM64,
+				ArchARMv7,
 			},
 			Distribution: []Distribution{
 				Alpine,
+				Ubuntu,
 			},
 			PrereleaseBucket: "grafana-prerelease/artifacts/docker",
 		},
--- a/pkg/infra/tracing/opentelemetry_tracing.go
+++ b/pkg/infra/tracing/opentelemetry_tracing.go
@@ -320,3 +320,15 @@ func (s OpentelemetrySpan) AddEvents(keys []string, values []EventValue) {
 		}
 	}
 }
+
+func (s OpentelemetrySpan) contextWithSpan(ctx context.Context) context.Context {
+	if s.span != nil {
+		ctx = trace.ContextWithSpan(ctx, s.span)
+		// Grafana also manages its own separate traceID in the context in addition to what opentracing handles.
+		// It's derived from the span. Ensure that we propagate this too.
+		if traceID := s.span.SpanContext().TraceID(); traceID.IsValid() {
+			ctx = context.WithValue(ctx, traceKey{}, traceValue{traceID.String(), s.span.SpanContext().IsSampled()})
+		}
+	}
+	return ctx
+}
--- a/pkg/infra/tracing/test_helper.go
+++ b/pkg/infra/tracing/test_helper.go
@@ -92,6 +92,10 @@ func (t *FakeSpan) AddEvents(keys []string, values []EventValue) {
 	}
 }

+func (t *FakeSpan) contextWithSpan(ctx context.Context) context.Context {
+	return ctx
+}
+
 type FakeTracer struct {
 	Spans []*FakeSpan
 }
--- a/pkg/infra/tracing/tracing.go
+++ b/pkg/infra/tracing/tracing.go
@@ -76,6 +76,10 @@ type Span interface {
 	//
 	// Panics if the length of keys is shorter than the length of values.
 	AddEvents(keys []string, values []EventValue)
+
+	// contextWithSpan returns a context.Context that holds the parent
+	// context plus a reference to this span.
+	contextWithSpan(ctx context.Context) context.Context
 }

 func ProvideService(cfg *setting.Cfg) (Tracer, error) {
@@ -146,6 +150,29 @@ func TraceIDFromContext(c context.Context, requireSampled bool) string {
 	return ""
 }

+// SpanFromContext returns the Span previously associated with ctx, or nil, if no such span could be found.
+// It is the equivalent of opentracing.SpanFromContext and trace.SpanFromContext.
+func SpanFromContext(ctx context.Context) Span {
+	// Look for both opentracing and opentelemetry spans.
+	if span := opentracing.SpanFromContext(ctx); span != nil {
+		return OpentracingSpan{span: span}
+	}
+	if span := trace.SpanFromContext(ctx); span != nil {
+		return OpentelemetrySpan{span: span}
+	}
+	return nil
+}
+
+// ContextWithSpan returns a new context.Context that holds a reference to the given span.
+// If span is nil, a new context without an active span is returned.
+// It is the equivalent of opentracing.ContextWithSpan and trace.ContextWithSpan.
+func ContextWithSpan(ctx context.Context, span Span) context.Context {
+	if span != nil {
+		return span.contextWithSpan(ctx)
+	}
+	return ctx
+}
+
 type Opentracing struct {
 	enabled                  bool
 	address                  string
@@ -324,6 +351,18 @@ func (s OpentracingSpan) AddEvents(keys []string, values []EventValue) {
 	s.span.LogFields(fields...)
 }

+func (s OpentracingSpan) contextWithSpan(ctx context.Context) context.Context {
+	if s.span != nil {
+		ctx = opentracing.ContextWithSpan(ctx, s.span)
+		// Grafana also manages its own separate traceID in the context in addition to what opentracing handles.
+		// It's derived from the span. Ensure that we propagate this too.
+		if sctx, ok := s.span.Context().(jaeger.SpanContext); ok {
+			ctx = context.WithValue(ctx, traceKey{}, traceValue{sctx.TraceID().String(), sctx.IsSampled()})
+		}
+	}
+	return ctx
+}
+
 func splitTagSettings(input string) map[string]string {
 	res := map[string]string{}

--- a/pkg/services/authn/clients/jwt.go
+++ b/pkg/services/authn/clients/jwt.go
@@ -19,6 +19,8 @@ import (
 	"github.com/grafana/grafana/pkg/util/errutil"
 )

+const authQueryParamName = "auth_token"
+
 var _ authn.ContextAwareClient = new(JWT)

 var (
@@ -50,6 +52,7 @@ func (s *JWT) Name() string {

 func (s *JWT) Authenticate(ctx context.Context, r *authn.Request) (*authn.Identity, error) {
 	jwtToken := s.retrieveToken(r.HTTPRequest)
+	s.stripSensitiveParam(r.HTTPRequest)

 	claims, err := s.jwtService.Verify(ctx, jwtToken)
 	if err != nil {
@@ -120,6 +123,18 @@ func (s *JWT) Authenticate(ctx context.Context, r *authn.Request) (*authn.Identi
 	return id, nil
 }

+// remove sensitive query param
+// avoid JWT URL login passing auth_token in URL
+func (s *JWT) stripSensitiveParam(httpRequest *http.Request) {
+	if s.cfg.JWTAuthURLLogin {
+		params := httpRequest.URL.Query()
+		if params.Has(authQueryParamName) {
+			params.Del(authQueryParamName)
+			httpRequest.URL.RawQuery = params.Encode()
+		}
+	}
+}
+
 // retrieveToken retrieves the JWT token from the request.
 func (s *JWT) retrieveToken(httpRequest *http.Request) string {
 	jwtToken := httpRequest.Header.Get(s.cfg.JWTAuthHeaderName)
--- a/pkg/services/authn/clients/jwt_test.go
+++ b/pkg/services/authn/clients/jwt_test.go
@@ -307,3 +307,47 @@ func TestJWTTest(t *testing.T) {
 		})
 	}
 }
+
+func TestJWTStripParam(t *testing.T) {
+	jwtService := &jwt.FakeJWTService{
+		VerifyProvider: func(context.Context, string) (jwt.JWTClaims, error) {
+			return jwt.JWTClaims{
+				"sub":                "1234567890",
+				"email":              "eai.doe@cor.po",
+				"preferred_username": "eai-doe",
+				"name":               "Eai Doe",
+				"roles":              "Admin",
+			}, nil
+		},
+	}
+
+	jwtHeaderName := "X-Forwarded-User"
+
+	cfg := &setting.Cfg{
+		JWTAuthEnabled:                 true,
+		JWTAuthHeaderName:              jwtHeaderName,
+		JWTAuthAutoSignUp:              true,
+		JWTAuthAllowAssignGrafanaAdmin: true,
+		JWTAuthURLLogin:                true,
+		JWTAuthRoleAttributeStrict:     false,
+		JWTAuthRoleAttributePath:       "roles",
+		JWTAuthEmailClaim:              "email",
+		JWTAuthUsernameClaim:           "preferred_username",
+	}
+
+	// #nosec G101 -- This is a dummy/test token
+	token := "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiaWF0IjoxNTE2MjM5MDIyfQ.XbPfbIHMI6arZ3Y922BhjWgQzWXcXNrz0ogtVhfEd2o"
+
+	httpReq := &http.Request{
+		URL: &url.URL{RawQuery: "auth_token=" + token + "&other_param=other_value"},
+	}
+	jwtClient := ProvideJWT(jwtService, cfg)
+	_, err := jwtClient.Authenticate(context.Background(), &authn.Request{
+		OrgID:       1,
+		HTTPRequest: httpReq,
+		Resp:        nil,
+	})
+	require.NoError(t, err)
+	// auth_token should be removed from the query string
+	assert.Equal(t, "other_param=other_value", httpReq.URL.RawQuery)
+}
--- a/pkg/services/contexthandler/auth_jwt.go
+++ b/pkg/services/contexthandler/auth_jwt.go
@@ -15,12 +15,14 @@ import (
 	loginsvc "github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/services/org"
 	"github.com/grafana/grafana/pkg/services/user"
+	"github.com/grafana/grafana/pkg/setting"
 )

 const (
-	InvalidJWT   = "Invalid JWT"
-	InvalidRole  = "Invalid Role"
-	UserNotFound = "User not found"
+	InvalidJWT         = "Invalid JWT"
+	InvalidRole        = "Invalid Role"
+	UserNotFound       = "User not found"
+	authQueryParamName = "auth_token"
 )

 func (h *ContextHandler) initContextWithJWT(ctx *contextmodel.ReqContext, orgId int64) bool {
@@ -30,13 +32,15 @@ func (h *ContextHandler) initContextWithJWT(ctx *contextmodel.ReqContext, orgId

 	jwtToken := ctx.Req.Header.Get(h.Cfg.JWTAuthHeaderName)
 	if jwtToken == "" && h.Cfg.JWTAuthURLLogin {
-		jwtToken = ctx.Req.URL.Query().Get("auth_token")
+		jwtToken = ctx.Req.URL.Query().Get(authQueryParamName)
 	}

 	if jwtToken == "" {
 		return false
 	}

+	stripSensitiveParam(h.Cfg, ctx.Req)
+
 	// Strip the 'Bearer' prefix if it exists.
 	jwtToken = strings.TrimPrefix(jwtToken, "Bearer ")

@@ -204,3 +208,15 @@ func searchClaimsForStringAttr(attributePath string, claims map[string]interface

 	return "", nil
 }
+
+// remove sensitive query params
+// avoid JWT URL login passing auth_token in URL
+func stripSensitiveParam(cfg *setting.Cfg, httpRequest *http.Request) {
+	if cfg.JWTAuthURLLogin {
+		params := httpRequest.URL.Query()
+		if params.Has(authQueryParamName) {
+			params.Del(authQueryParamName)
+			httpRequest.URL.RawQuery = params.Encode()
+		}
+	}
+}
--- a/pkg/services/ngalert/state/historian/annotation.go
+++ b/pkg/services/ngalert/state/historian/annotation.go
@@ -14,6 +14,7 @@ import (

 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/annotations"
 	"github.com/grafana/grafana/pkg/services/dashboards"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
@@ -67,10 +68,23 @@ func (h *AnnotationBackend) Record(ctx context.Context, rule history_model.RuleM
 		return errCh
 	}

-	go func() {
+	// This is a new background job, so let's create a brand new context for it.
+	// We want it to be isolated, i.e. we don't want grafana shutdowns to interrupt this work
+	// immediately but rather try to flush writes.
+	// This also prevents timeouts or other lingering objects (like transactions) from being
+	// incorrectly propagated here from other areas.
+	writeCtx := context.Background()
+	writeCtx, cancel := context.WithTimeout(writeCtx, StateHistoryWriteTimeout)
+	writeCtx = history_model.WithRuleData(writeCtx, rule)
+	writeCtx = tracing.ContextWithSpan(writeCtx, tracing.SpanFromContext(ctx))
+
+	go func(ctx context.Context) {
+		defer cancel()
 		defer close(errCh)
+		logger := h.log.FromContext(ctx)
+
 		errCh <- h.recordAnnotations(ctx, panel, annotations, rule.OrgID, logger)
-	}()
+	}(writeCtx)
 	return errCh
 }

--- a/pkg/services/ngalert/state/historian/core.go
+++ b/pkg/services/ngalert/state/historian/core.go
@@ -2,6 +2,7 @@ package historian

 import (
 	"strings"
+	"time"

 	"github.com/grafana/grafana-plugin-sdk-go/data"

@@ -12,6 +13,8 @@ import (
 	history_model "github.com/grafana/grafana/pkg/services/ngalert/state/historian/model"
 )

+const StateHistoryWriteTimeout = time.Minute
+
 func shouldRecord(transition state.StateTransition) bool {
 	if !transition.Changed() {
 		return false
--- a/pkg/services/ngalert/state/historian/loki.go
+++ b/pkg/services/ngalert/state/historian/loki.go
@@ -14,6 +14,7 @@ import (

 	"github.com/grafana/grafana/pkg/components/simplejson"
 	"github.com/grafana/grafana/pkg/infra/log"
+	"github.com/grafana/grafana/pkg/infra/tracing"
 	"github.com/grafana/grafana/pkg/services/ngalert/eval"
 	"github.com/grafana/grafana/pkg/services/ngalert/metrics"
 	"github.com/grafana/grafana/pkg/services/ngalert/models"
@@ -80,8 +81,20 @@ func (h *RemoteLokiBackend) Record(ctx context.Context, rule history_model.RuleM
 		return errCh
 	}

-	go func() {
+	// This is a new background job, so let's create a brand new context for it.
+	// We want it to be isolated, i.e. we don't want grafana shutdowns to interrupt this work
+	// immediately but rather try to flush writes.
+	// This also prevents timeouts or other lingering objects (like transactions) from being
+	// incorrectly propagated here from other areas.
+	writeCtx := context.Background()
+	writeCtx, cancel := context.WithTimeout(writeCtx, StateHistoryWriteTimeout)
+	writeCtx = history_model.WithRuleData(writeCtx, rule)
+	writeCtx = tracing.ContextWithSpan(writeCtx, tracing.SpanFromContext(ctx))
+
+	go func(ctx context.Context) {
+		defer cancel()
 		defer close(errCh)
+		logger := h.log.FromContext(ctx)

 		org := fmt.Sprint(rule.OrgID)
 		h.metrics.WritesTotal.WithLabelValues(org, "loki").Inc()
@@ -93,7 +106,7 @@ func (h *RemoteLokiBackend) Record(ctx context.Context, rule history_model.RuleM
 			h.metrics.TransitionsFailed.WithLabelValues(org).Add(float64(len(logStream.Values)))
 			errCh <- fmt.Errorf("failed to save alert state history batch: %w", err)
 		}
-	}()
+	}(writeCtx)
 	return errCh
 }

--- a/pkg/services/ngalert/state/historian/loki_http.go
+++ b/pkg/services/ngalert/state/historian/loki_http.go
@@ -17,12 +17,8 @@ import (
 	"github.com/weaveworks/common/http/client"
 )

-const defaultClientTimeout = 30 * time.Second
-
 func NewRequester() client.Requester {
-	return &http.Client{
-		Timeout: defaultClientTimeout,
-	}
+	return &http.Client{}
 }

 // encoder serializes log streams to some byte format.
--- a/pkg/services/ngalert/state/historian/model/rule.go
+++ b/pkg/services/ngalert/state/historian/model/rule.go
@@ -1,6 +1,7 @@
 package model

 import (
+	"context"
 	"strconv"

 	"github.com/grafana/grafana/pkg/cmd/grafana-cli/logger"
@@ -44,3 +45,7 @@ func NewRuleMeta(r *models.AlertRule, log log.Logger) RuleMeta {
 		PanelID:      panelID,
 	}
 }
+
+func WithRuleData(ctx context.Context, rule RuleMeta) context.Context {
+	return models.WithRuleKey(ctx, models.AlertRuleKey{OrgID: rule.OrgID, UID: rule.UID})
+}
--- a/pkg/services/publicdashboards/service/query.go
+++ b/pkg/services/publicdashboards/service/query.go
@@ -213,7 +213,10 @@ func getUniqueDashboardDatasourceUids(dashboard *simplejson.Json) []string {
 	var datasourceUids []string
 	exists := map[string]bool{}

-	for _, panelObj := range dashboard.Get("panels").MustArray() {
+	// collapsed rows contain panels in a nested structure, so we need to flatten them before calculate unique uids
+	flattenedPanels := getFlattenedPanels(dashboard)
+
+	for _, panelObj := range flattenedPanels {
 		panel := simplejson.NewFromAny(panelObj)
 		uid := getDataSourceUidFromJson(panel)

@@ -238,6 +241,23 @@ func getUniqueDashboardDatasourceUids(dashboard *simplejson.Json) []string {
 	return datasourceUids
 }

+func getFlattenedPanels(dashboard *simplejson.Json) []interface{} {
+	var flatPanels []interface{}
+	for _, panelObj := range dashboard.Get("panels").MustArray() {
+		panel := simplejson.NewFromAny(panelObj)
+		// if the panel is a row and it is collapsed, get the queries from the panels inside the row
+		// if it is not collapsed, the row does not have any panels
+		if panel.Get("type").MustString() == "row" {
+			if panel.Get("collapsed").MustBool() {
+				flatPanels = append(flatPanels, panel.Get("panels").MustArray()...)
+			}
+		} else {
+			flatPanels = append(flatPanels, panelObj)
+		}
+	}
+	return flatPanels
+}
+
 func groupQueriesByPanelId(dashboard *simplejson.Json) map[int64][]*simplejson.Json {
 	result := make(map[int64][]*simplejson.Json)

--- a/pkg/services/publicdashboards/service/query_test.go
+++ b/pkg/services/publicdashboards/service/query_test.go
@@ -432,6 +432,218 @@ const (
  ],
  "schemaVersion": 35
 }`
+
+	dashboardWithCollapsedRows = `
+{
+"panels": [
+    {
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 12,
+      "title": "Row title",
+      "type": "row"
+    },
+    {
+      "datasource": {
+        "type": "prometheus",
+        "uid": "qCbTUC37k"
+      },
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "auto",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 8,
+        "w": 12,
+        "x": 0,
+        "y": 1
+      },
+      "id": 11,
+      "options": {
+        "legend": {
+          "calcs": [],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "targets": [
+        {
+          "datasource": {
+            "type": "prometheus",
+            "uid": "qCbTUC37k"
+          },
+          "editorMode": "builder",
+          "expr": "access_evaluation_duration_bucket",
+          "legendFormat": "__auto",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Panel Title",
+      "type": "timeseries"
+    },
+    {
+      "collapsed": true,
+      "gridPos": {
+        "h": 1,
+        "w": 24,
+        "x": 0,
+        "y": 9
+      },
+      "id": 10,
+      "panels": [
+        {
+          "datasource": {
+            "type": "influxdb",
+            "uid": "P49A45DF074423DFB"
+          },
+          "fieldConfig": {
+            "defaults": {
+              "color": {
+                "mode": "palette-classic"
+              },
+              "custom": {
+                "axisCenteredZero": false,
+                "axisColorMode": "text",
+                "axisLabel": "",
+                "axisPlacement": "auto",
+                "barAlignment": 0,
+                "drawStyle": "line",
+                "fillOpacity": 0,
+                "gradientMode": "none",
+                "hideFrom": {
+                  "legend": false,
+                  "tooltip": false,
+                  "viz": false
+                },
+                "lineInterpolation": "linear",
+                "lineWidth": 1,
+                "pointSize": 5,
+                "scaleDistribution": {
+                  "type": "linear"
+                },
+                "showPoints": "auto",
+                "spanNulls": false,
+                "stacking": {
+                  "group": "A",
+                  "mode": "none"
+                },
+                "thresholdsStyle": {
+                  "mode": "off"
+                }
+              },
+              "mappings": [],
+              "thresholds": {
+                "mode": "absolute",
+                "steps": [
+                  {
+                    "color": "green"
+                  },
+                  {
+                    "color": "red",
+                    "value": 80
+                  }
+                ]
+              }
+            },
+            "overrides": []
+          },
+          "gridPos": {
+            "h": 9,
+            "w": 12,
+            "x": 0,
+            "y": 10
+          },
+          "id": 8,
+          "options": {
+            "legend": {
+              "calcs": [],
+              "displayMode": "list",
+              "placement": "bottom",
+              "showLegend": true
+            },
+            "tooltip": {
+              "mode": "single",
+              "sort": "none"
+            }
+          },
+          "pluginVersion": "9.4.0-pre",
+          "targets": [
+            {
+              "datasource": {
+                "type": "influxdb",
+                "uid": "P49A45DF074423DFB"
+              },
+              "query": "// v.bucket, v.timeRangeStart, and v.timeRange stop are all variables supported by the flux plugin and influxdb\nfrom(bucket: v.bucket)\n  |> range(start: v.timeRangeStart, stop: v.timeRangeStop)\n  |> filter(fn: (r) => r[\"_value\"] >= 10 and r[\"_value\"] <= 20)",
+              "refId": "A"
+            }
+          ],
+          "title": "Panel Title",
+          "type": "timeseries"
+        }
+      ],
+      "title": "Row title 1",
+      "type": "row"
+    }
+  ]
+}`
 )

 func TestGetQueryDataResponse(t *testing.T) {
@@ -951,6 +1163,16 @@ func TestGetUniqueDashboardDatasourceUids(t *testing.T) {
 		uids := getUniqueDashboardDatasourceUids(json)
 		require.Len(t, uids, 0)
 	})
+
+	t.Run("can get unique datasource ids from dashboard with rows", func(t *testing.T) {
+		json, err := simplejson.NewJson([]byte(dashboardWithCollapsedRows))
+		require.NoError(t, err)
+
+		uids := getUniqueDashboardDatasourceUids(json)
+		require.Len(t, uids, 2)
+		require.Equal(t, "qCbTUC37k", uids[0])
+		require.Equal(t, "P49A45DF074423DFB", uids[1])
+	})
 }

 func TestBuildMetricRequest(t *testing.T) {
--- a/plugins-bundled/internal/input-datasource/package.json
+++ b/plugins-bundled/internal/input-datasource/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@grafana-plugins/input-datasource",
-  "version": "9.5.0-pre",
+  "version": "9.5.0",
  "description": "Input Datasource",
  "private": true,
  "repository": {
@@ -15,15 +15,15 @@
  },
  "author": "Grafana Labs",
  "devDependencies": {
-    "@grafana/toolkit": "9.5.0-pre",
+    "@grafana/toolkit": "9.5.0",
    "@types/jest": "26.0.15",
    "@types/lodash": "4.14.149",
    "@types/react": "17.0.30",
    "lodash": "4.17.21"
  },
  "dependencies": {
-    "@grafana/data": "9.5.0-pre",
-    "@grafana/ui": "9.5.0-pre",
+    "@grafana/data": "9.5.0",
+    "@grafana/ui": "9.5.0",
    "jquery": "3.5.1",
    "react": "17.0.1",
    "react-dom": "17.0.1",
--- a/public/app/features/dashboard/utils/getPanelMenu.test.ts
+++ b/public/app/features/dashboard/utils/getPanelMenu.test.ts
@@ -228,7 +228,9 @@ describe('getPanelMenu()', () => {
        targets: [
          {
            refId: 'A',
-            pluginId: 'testdata',
+            datasource: {
+              type: 'testdata',
+            },
          },
        ],
        dashboard: {
--- a/public/app/features/dashboard/utils/getPanelMenu.ts
+++ b/public/app/features/dashboard/utils/getPanelMenu.ts
@@ -332,16 +332,13 @@ function createExtensionContext(panel: PanelModel, dashboard: DashboardModel): P
    id: panel.id,
    pluginId: panel.type,
    title: panel.title,
-    timeRange: Object.assign({}, dashboard.time),
+    timeRange: dashboard.time,
    timeZone: dashboard.timezone,
    dashboard: {
      uid: dashboard.uid,
      title: dashboard.title,
      tags: Array.from<string>(dashboard.tags),
    },
-    targets: panel.targets.map((t) => ({
-      refId: t.refId,
-      pluginId: t.datasource?.type ?? 'unknown',
-    })),
+    targets: panel.targets,
  };
 }
--- a/public/app/features/plugins/extensions/getPluginExtensions.test.ts
+++ b/public/app/features/plugins/extensions/getPluginExtensions.test.ts
@@ -246,4 +246,43 @@ describe('getPluginExtensions()', () => {
    expect(global.console.warn).toHaveBeenCalledTimes(1);
    expect(global.console.warn).toHaveBeenCalledWith('[Plugin Extensions] Something went wrong!');
  });
+
+  test('should pass a frozen copy of the context to the onClick() function', () => {
+    const context = { title: 'New title from the context!' };
+
+    link2.path = undefined;
+    link2.onClick = jest.fn();
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    const { extensions } = getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 });
+    const [extension] = extensions;
+
+    assertPluginExtensionLink(extension);
+    extension.onClick?.({} as React.MouseEvent);
+
+    const helpers = (link2.onClick as jest.Mock).mock.calls[0][1];
+
+    expect(link2.configure).toHaveBeenCalledTimes(1);
+    expect(Object.isFrozen(helpers.context)).toBe(true);
+    expect(() => {
+      helpers.context.title = 'New title';
+    }).toThrow();
+  });
+
+  test('should should not freeze the original context', () => {
+    const context = {
+      title: 'New title from the context!',
+      nested: { title: 'title' },
+      array: ['a'],
+    };
+
+    const registry = createPluginExtensionRegistry([{ pluginId, extensionConfigs: [link2] }]);
+    getPluginExtensions({ registry, context, extensionPointId: extensionPoint2 });
+
+    expect(() => {
+      context.title = 'Updating the title';
+      context.nested.title = 'new title';
+      context.array.push('b');
+    }).not.toThrow();
+  });
 });
--- a/public/app/features/plugins/extensions/getPluginExtensions.ts
+++ b/public/app/features/plugins/extensions/getPluginExtensions.ts
@@ -108,14 +108,14 @@ function getLinkExtensionOverrides(pluginId: string, config: PluginExtensionLink
 function getLinkExtensionOnClick(
  config: PluginExtensionLinkConfig,
  context?: object
-): ((event: React.MouseEvent) => void) | undefined {
+): ((event?: React.MouseEvent) => void) | undefined {
  const { onClick } = config;

  if (!onClick) {
    return;
  }

-  return function onClickExtensionLink(event: React.MouseEvent) {
+  return function onClickExtensionLink(event?: React.MouseEvent) {
    try {
      const result = onClick(event, getEventHelpers(context));

--- a/public/app/plugins/datasource/loki/querySplitting.test.ts
+++ b/public/app/plugins/datasource/loki/querySplitting.test.ts
@@ -246,6 +246,20 @@ describe('runSplitQuery()', () => {
        expect(datasource.runQuery).toHaveBeenCalledTimes(3);
      });
    });
+    test('with mixed splitDuration runs the expected amount of queries', async () => {
+      const request = getQueryOptions<LokiQuery>({
+        targets: [
+          { expr: 'count_over_time({c="d"}[1m])', refId: 'A', splitDuration: '15m' },
+          { expr: '{a="b"}', refId: 'B', splitDuration: '15m' },
+          { expr: '{a="b"}', refId: 'C', splitDuration: '1h' },
+        ],
+        range: range1h,
+      });
+      await expect(runSplitQuery(datasource, request)).toEmitValuesWith(() => {
+        // 4 * 15m + 4 * 15m + 1 * 1h
+        expect(datasource.runQuery).toHaveBeenCalledTimes(9);
+      });
+    });
    test('with 1h/30m splitDuration and 1 log and 2 metric target runs 3 queries', async () => {
      const request = getQueryOptions<LokiQuery>({
        targets: [
--- a/public/app/plugins/datasource/loki/querySplitting.ts
+++ b/public/app/plugins/datasource/loki/querySplitting.ts
@@ -154,11 +154,14 @@ export function runSplitGroupedQueries(datasource: LokiDatasource, requests: Lok

 function getNextRequestPointers(requests: LokiGroupedRequest, requestGroup: number, requestN: number) {
  // There's a pending request from the next group:
-  if (requests[requestGroup + 1]?.partition[requestN - 1]) {
-    return {
-      nextRequestGroup: requestGroup + 1,
-      nextRequestN: requestN,
-    };
+  for (let i = requestGroup + 1; i < requests.length; i++) {
+    const group = requests[i];
+    if (group.partition[requestN - 1]) {
+      return {
+        nextRequestGroup: i,
+        nextRequestN: requestN,
+      };
+    }
  }
  return {
    // Find the first group where `[requestN - 1]` is defined
--- a/public/app/plugins/panel/geomap/utils/layers.ts
+++ b/public/app/plugins/panel/geomap/utils/layers.ts
@@ -2,7 +2,7 @@ import { Map as OpenLayersMap } from 'ol';
 import { FeatureLike } from 'ol/Feature';
 import { Subject } from 'rxjs';

-import { getFrameMatchers, MapLayerHandler, MapLayerOptions, PanelData } from '@grafana/data/src';
+import { getFrameMatchers, MapLayerHandler, MapLayerOptions, PanelData, textUtil } from '@grafana/data';
 import { config } from '@grafana/runtime/src';

 import { GeomapPanel } from '../GeomapPanel';
@@ -114,6 +114,10 @@ export async function initLayer(
    return Promise.reject('unknown layer: ' + options.type);
  }

+  if (options.config?.attribution) {
+    options.config.attribution = textUtil.sanitizeTextPanelContent(options.config.attribution);
+  }
+
  const handler = await item.create(map, options, panel.props.eventBus, config.theme2);
  const layer = handler.init(); // eslint-disable-line
  if (options.opacity != null) {
--- a/public/app/plugins/panel/piechart/PieChart.tsx
+++ b/public/app/plugins/panel/piechart/PieChart.tsx
@@ -84,7 +84,7 @@ export const PieChart = ({

  return (
    <div className={styles.container}>
-      <svg width={layout.size} height={layout.size} ref={containerRef}>
+      <svg width={layout.size} height={layout.size} ref={containerRef} style={{ overflow: 'visible' }}>
        <Group top={layout.position} left={layout.position}>
          {colors.map((color) => {
            return (
--- a/public/app/plugins/panel/table/snapshots/migrations.test.ts.snap
+++ b/public/app/plugins/panel/table/snapshots/migrations.test.ts.snap
@@ -1,142 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP

-exports[`Table Migrations migrates styles to field config overrides and defaults 1`] = `
-{
-  "fieldConfig": {
-    "defaults": {
-      "custom": {
-        "align": "right",
-        "displayMode": undefined,
-      },
-      "decimals": 2,
-      "displayName": "",
-      "unit": "short",
-    },
-    "overrides": [
-      {
-        "matcher": {
-          "id": "byName",
-          "options": "Time",
-        },
-        "properties": [
-          {
-            "id": "displayName",
-            "value": "Time",
-          },
-          {
-            "id": "unit",
-            "value": "time: YYYY-MM-DD HH:mm:ss",
-          },
-          {
-            "id": "custom.align",
-            "value": null,
-          },
-        ],
-      },
-      {
-        "matcher": {
-          "id": "byName",
-          "options": "ColorCell",
-        },
-        "properties": [
-          {
-            "id": "unit",
-            "value": "currencyUSD",
-          },
-          {
-            "id": "decimals",
-            "value": 2,
-          },
-          {
-            "id": "custom.displayMode",
-            "value": "color-background",
-          },
-          {
-            "id": "custom.align",
-            "value": "left",
-          },
-          {
-            "id": "thresholds",
-            "value": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "rgba(245, 54, 54, 0.9)",
-                  "value": -Infinity,
-                },
-                {
-                  "color": "rgba(237, 129, 40, 0.89)",
-                  "value": 5,
-                },
-                {
-                  "color": "rgba(50, 172, 45, 0.97)",
-                  "value": 10,
-                },
-              ],
-            },
-          },
-        ],
-      },
-      {
-        "matcher": {
-          "id": "byName",
-          "options": "ColorValue",
-        },
-        "properties": [
-          {
-            "id": "unit",
-            "value": "Bps",
-          },
-          {
-            "id": "decimals",
-            "value": 2,
-          },
-          {
-            "id": "links",
-            "value": [
-              {
-                "targetBlank": true,
-                "title": "",
-                "url": "http://www.grafana.com",
-              },
-            ],
-          },
-          {
-            "id": "custom.displayMode",
-            "value": "color-text",
-          },
-          {
-            "id": "custom.align",
-            "value": null,
-          },
-          {
-            "id": "thresholds",
-            "value": {
-              "mode": "absolute",
-              "steps": [
-                {
-                  "color": "rgba(245, 54, 54, 0.9)",
-                  "value": -Infinity,
-                },
-                {
-                  "color": "rgba(237, 129, 40, 0.89)",
-                  "value": 5,
-                },
-                {
-                  "color": "rgba(50, 172, 45, 0.97)",
-                  "value": 10,
-                },
-              ],
-            },
-          },
-        ],
-      },
-    ],
-  },
-  "transformations": [],
-}
-`;
-
 exports[`Table Migrations migrates transform out to core transforms 1`] = `
 {
  "fieldConfig": {
--- a/public/app/plugins/panel/table/migrations.test.ts
+++ b/public/app/plugins/panel/table/migrations.test.ts
@@ -128,6 +128,144 @@ describe('Table Migrations', () => {
    };
    const panel = {} as PanelModel;
    tablePanelChangedHandler(panel, 'table-old', oldStyles);
-    expect(panel).toMatchSnapshot();
+    expect(panel).toMatchInlineSnapshot(`
+      {
+        "fieldConfig": {
+          "defaults": {
+            "custom": {
+              "align": "right",
+            },
+            "decimals": 2,
+            "displayName": "",
+            "unit": "short",
+          },
+          "overrides": [
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "Time",
+              },
+              "properties": [
+                {
+                  "id": "displayName",
+                  "value": "Time",
+                },
+                {
+                  "id": "unit",
+                  "value": "time: YYYY-MM-DD HH:mm:ss",
+                },
+                {
+                  "id": "custom.align",
+                  "value": null,
+                },
+              ],
+            },
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "ColorCell",
+              },
+              "properties": [
+                {
+                  "id": "unit",
+                  "value": "currencyUSD",
+                },
+                {
+                  "id": "decimals",
+                  "value": 2,
+                },
+                {
+                  "id": "custom.cellOptions",
+                  "value": {
+                    "type": "color-background",
+                  },
+                },
+                {
+                  "id": "custom.align",
+                  "value": "left",
+                },
+                {
+                  "id": "thresholds",
+                  "value": {
+                    "mode": "absolute",
+                    "steps": [
+                      {
+                        "color": "rgba(245, 54, 54, 0.9)",
+                        "value": -Infinity,
+                      },
+                      {
+                        "color": "rgba(237, 129, 40, 0.89)",
+                        "value": 5,
+                      },
+                      {
+                        "color": "rgba(50, 172, 45, 0.97)",
+                        "value": 10,
+                      },
+                    ],
+                  },
+                },
+              ],
+            },
+            {
+              "matcher": {
+                "id": "byName",
+                "options": "ColorValue",
+              },
+              "properties": [
+                {
+                  "id": "unit",
+                  "value": "Bps",
+                },
+                {
+                  "id": "decimals",
+                  "value": 2,
+                },
+                {
+                  "id": "links",
+                  "value": [
+                    {
+                      "targetBlank": true,
+                      "title": "",
+                      "url": "http://www.grafana.com",
+                    },
+                  ],
+                },
+                {
+                  "id": "custom.cellOptions",
+                  "value": {
+                    "type": "color-text",
+                  },
+                },
+                {
+                  "id": "custom.align",
+                  "value": null,
+                },
+                {
+                  "id": "thresholds",
+                  "value": {
+                    "mode": "absolute",
+                    "steps": [
+                      {
+                        "color": "rgba(245, 54, 54, 0.9)",
+                        "value": -Infinity,
+                      },
+                      {
+                        "color": "rgba(237, 129, 40, 0.89)",
+                        "value": 5,
+                      },
+                      {
+                        "color": "rgba(50, 172, 45, 0.97)",
+                        "value": 10,
+                      },
+                    ],
+                  },
+                },
+              ],
+            },
+          ],
+        },
+        "transformations": [],
+      }
+    `);
  });
 });
--- a/public/app/plugins/panel/table/migrations.ts
+++ b/public/app/plugins/panel/table/migrations.ts
@@ -163,8 +163,10 @@ const migrateTableStyleToOverride = (style: Style) => {

  if (style.colorMode) {
    override.properties.push({
-      id: 'custom.displayMode',
-      value: colorModeMap[style.colorMode],
+      id: 'custom.cellOptions',
+      value: {
+        type: colorModeMap[style.colorMode],
+      },
    });
  }

@@ -200,11 +202,11 @@ const migrateDefaults = (prevDefaults: Style) => {
        displayName: prevDefaults.alias,
        custom: {
          align: prevDefaults.align === 'auto' ? null : prevDefaults.align,
-          displayMode: colorModeMap[prevDefaults.colorMode],
        },
      },
      isNil
    );
+
    if (prevDefaults.thresholds.length) {
      const thresholds: ThresholdsConfig = {
        mode: ThresholdsMode.Absolute,
@@ -212,6 +214,12 @@ const migrateDefaults = (prevDefaults: Style) => {
      };
      defaults.thresholds = thresholds;
    }
+
+    if (prevDefaults.colorMode) {
+      defaults.custom.cellOptions = {
+        type: colorModeMap[prevDefaults.colorMode],
+      };
+    }
  }
  return defaults;
 };
--- a/public/app/plugins/panel/xychart/TooltipView.tsx
+++ b/public/app/plugins/panel/xychart/TooltipView.tsx
@@ -11,6 +11,7 @@ import {
  TimeRange,
 } from '@grafana/data';
 import { LinkButton, usePanelContext, useStyles2, VerticalGroup, VizTooltipOptions } from '@grafana/ui';
+import { findField } from 'app/features/dimensions';
 import { getFieldLinksForExplore } from 'app/features/explore/utils/links';

 import { ScatterSeriesConfig, SeriesMapping } from './models.gen';
@@ -69,14 +70,16 @@ export const TooltipView = ({
    range,
  });

+  let extraFields: Field[] = frame.fields.filter((f) => f !== xField && f !== yField);
+
  let yValue: YValue | null = null;
  let extraFacets: ExtraFacets | null = null;
  if (seriesMapping === SeriesMapping.Manual && manualSeriesConfigs) {
    const colorFacetFieldName = manualSeriesConfigs[hoveredPointIndex].pointColor?.field ?? '';
    const sizeFacetFieldName = manualSeriesConfigs[hoveredPointIndex].pointSize?.field ?? '';

-    const colorFacet = colorFacetFieldName ? frame.fields.find((f) => f.name === colorFacetFieldName) : undefined;
-    const sizeFacet = sizeFacetFieldName ? frame.fields.find((f) => f.name === sizeFacetFieldName) : undefined;
+    const colorFacet = colorFacetFieldName ? findField(frame, colorFacetFieldName) : undefined;
+    const sizeFacet = sizeFacetFieldName ? findField(frame, sizeFacetFieldName) : undefined;

    extraFacets = {
      colorFacetFieldName,
@@ -84,6 +87,8 @@ export const TooltipView = ({
      colorFacetValue: colorFacet?.values.get(rowIndex),
      sizeFacetValue: sizeFacet?.values.get(rowIndex),
    };
+
+    extraFields = extraFields.filter((f) => f !== colorFacet && f !== sizeFacet);
  }

  yValue = {
@@ -101,7 +106,7 @@ export const TooltipView = ({
        </tr>
        <tbody>
          <tr>
-            <th>{xField.name}</th>
+            <th>{getFieldDisplayName(xField, frame)}</th>
            <td>{fmt(xField, xField.values.get(rowIndex))}</td>
          </tr>
          <tr>
@@ -120,6 +125,12 @@ export const TooltipView = ({
              <td>{extraFacets.sizeFacetValue}</td>
            </tr>
          )}
+          {extraFields.map((field, i) => (
+            <tr key={i}>
+              <th>{getFieldDisplayName(field, frame)}:</th>
+              <td>{fmt(field, field.values.get(rowIndex))}</td>
+            </tr>
+          ))}
          {links.length > 0 && (
            <tr>
              <td colSpan={2}>
--- a/yarn.lock
+++ b/yarn.lock
@@ -2988,9 +2988,9 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@grafana-plugins/input-datasource@workspace:plugins-bundled/internal/input-datasource"
  dependencies:
-    "@grafana/data": 9.5.0-pre
-    "@grafana/toolkit": 9.5.0-pre
-    "@grafana/ui": 9.5.0-pre
+    "@grafana/data": 9.5.0
+    "@grafana/toolkit": 9.5.0
+    "@grafana/ui": 9.5.0
    "@types/jest": 26.0.15
    "@types/lodash": 4.14.149
    "@types/react": 17.0.30
@@ -3023,12 +3023,12 @@ __metadata:
  languageName: node
  linkType: hard

-"@grafana/data@9.5.0-pre, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
+"@grafana/data@9.5.0, @grafana/data@workspace:*, @grafana/data@workspace:packages/grafana-data":
  version: 0.0.0-use.local
  resolution: "@grafana/data@workspace:packages/grafana-data"
  dependencies:
    "@braintree/sanitize-url": 6.0.2
-    "@grafana/schema": 9.5.0-pre
+    "@grafana/schema": 9.5.0
    "@grafana/tsconfig": ^1.2.0-rc1
    "@rollup/plugin-commonjs": 23.0.2
    "@rollup/plugin-json": 5.0.1
@@ -3088,7 +3088,7 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@grafana/e2e-selectors@9.5.0-pre, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
+"@grafana/e2e-selectors@9.5.0, @grafana/e2e-selectors@^9.4.3, @grafana/e2e-selectors@workspace:*, @grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors":
  version: 0.0.0-use.local
  resolution: "@grafana/e2e-selectors@workspace:packages/grafana-e2e-selectors"
  dependencies:
@@ -3107,17 +3107,6 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@grafana/e2e-selectors@npm:^9.4.3":
-  version: 9.4.3
-  resolution: "@grafana/e2e-selectors@npm:9.4.3"
-  dependencies:
-    "@grafana/tsconfig": ^1.2.0-rc1
-    tslib: 2.4.1
-    typescript: 4.8.4
-  checksum: 85a88cdf4adb643ff863b15f96fc6c04ecb7567c27cc526a00c157eb02575e55adc1e7701d58e1b48f00f24951c332fbb191cd2b5a8e74cd0c545543777e82af
-  languageName: node
-  linkType: hard
-
 "@grafana/e2e@workspace:*, @grafana/e2e@workspace:packages/grafana-e2e":
  version: 0.0.0-use.local
  resolution: "@grafana/e2e@workspace:packages/grafana-e2e"
@@ -3125,7 +3114,7 @@ __metadata:
    "@babel/core": 7.20.5
    "@babel/preset-env": 7.20.2
    "@cypress/webpack-preprocessor": 5.17.0
-    "@grafana/e2e-selectors": 9.5.0-pre
+    "@grafana/e2e-selectors": 9.5.0
    "@grafana/tsconfig": ^1.2.0-rc1
    "@mochajs/json-file-reporter": ^1.2.0
    "@rollup/plugin-node-resolve": 15.0.1
@@ -3285,11 +3274,11 @@ __metadata:
  version: 0.0.0-use.local
  resolution: "@grafana/runtime@workspace:packages/grafana-runtime"
  dependencies:
-    "@grafana/data": 9.5.0-pre
-    "@grafana/e2e-selectors": 9.5.0-pre
+    "@grafana/data": 9.5.0
+    "@grafana/e2e-selectors": 9.5.0
    "@grafana/faro-web-sdk": 1.0.2
    "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 9.5.0-pre
+    "@grafana/ui": 9.5.0
    "@rollup/plugin-commonjs": 23.0.2
    "@rollup/plugin-node-resolve": 15.0.1
    "@sentry/browser": 6.19.7
@@ -3340,7 +3329,7 @@ __metadata:
  languageName: node
  linkType: hard

-"@grafana/schema@9.5.0-pre, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
+"@grafana/schema@9.5.0, @grafana/schema@workspace:*, @grafana/schema@workspace:packages/grafana-schema":
  version: 0.0.0-use.local
  resolution: "@grafana/schema@workspace:packages/grafana-schema"
  dependencies:
@@ -3359,7 +3348,7 @@ __metadata:
  languageName: unknown
  linkType: soft

-"@grafana/toolkit@9.5.0-pre, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
+"@grafana/toolkit@9.5.0, @grafana/toolkit@workspace:*, @grafana/toolkit@workspace:packages/grafana-toolkit":
  version: 0.0.0-use.local
  resolution: "@grafana/toolkit@workspace:packages/grafana-toolkit"
  dependencies:
@@ -3375,10 +3364,10 @@ __metadata:
    "@babel/preset-env": 7.18.9
    "@babel/preset-react": 7.18.6
    "@babel/preset-typescript": 7.18.6
-    "@grafana/data": 9.5.0-pre
+    "@grafana/data": 9.5.0
    "@grafana/eslint-config": 5.1.0
    "@grafana/tsconfig": ^1.2.0-rc1
-    "@grafana/ui": 9.5.0-pre
+    "@grafana/ui": 9.5.0
    "@jest/core": 27.5.1
    "@types/command-exists": ^1.2.0
    "@types/eslint": 8.4.1
@@ -3459,17 +3448,17 @@ __metadata:
  languageName: node
  linkType: hard

-"@grafana/ui@9.5.0-pre, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
+"@grafana/ui@9.5.0, @grafana/ui@workspace:*, @grafana/ui@workspace:packages/grafana-ui":
  version: 0.0.0-use.local
  resolution: "@grafana/ui@workspace:packages/grafana-ui"
  dependencies:
    "@babel/core": 7.20.5
    "@emotion/css": 11.10.6
    "@emotion/react": 11.10.6
-    "@grafana/data": 9.5.0-pre
-    "@grafana/e2e-selectors": 9.5.0-pre
+    "@grafana/data": 9.5.0
+    "@grafana/e2e-selectors": 9.5.0
    "@grafana/faro-web-sdk": 1.0.2
-    "@grafana/schema": 9.5.0-pre
+    "@grafana/schema": 9.5.0
    "@grafana/tsconfig": ^1.2.0-rc1
    "@leeoniya/ufuzzy": 1.0.6
    "@mdx-js/react": 1.6.22
@@ -35667,13 +35656,6 @@ __metadata:
  languageName: node
  linkType: hard

-"tslib@npm:2.4.1":
-  version: 2.4.1
-  resolution: "tslib@npm:2.4.1"
-  checksum: 19480d6e0313292bd6505d4efe096a6b31c70e21cf08b5febf4da62e95c265c8f571f7b36fcc3d1a17e068032f59c269fab3459d6cd3ed6949eafecf64315fca
-  languageName: node
-  linkType: hard
-
 "tslib@npm:2.5.0, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.4.1":
  version: 2.5.0
  resolution: "tslib@npm:2.5.0"
Author	SHA1	Message	Date
dsotirakis	efe95b4c21	Add more variants to cloud version	2023-04-06 13:13:31 +03:00
Misi	a14c2d674a	Chore: Update SAML lib (#824 ) Update saml lib	2023-04-06 10:10:56 +02:00
Jo	262d642d77	AuthJWT: Fix JWT query param leak (CVE-2023-1387) (#825 ) fix JWT query param leak Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: Kalle Persson <kalle.persson@grafana.com>	2023-04-06 10:10:55 +02:00
dsotirakis	5e6893c425	Geomap: Sanitize the attribution string (#745 ) * SAML: Update grafana/saml library (#691) Co-authored-by: jguer <joao.guerreiro@grafana.com> * SVG: Add dompurify preprocessor step (#698) * add sanitized SVG component * add sanitize * Fix frontend build * Remove unnecessary yarn.lock changes * Fix formatting * Re-add yarn.lock message as I guess it is needed --------- Co-authored-by: dsotirakis <dimitrios.sotirakis@grafana.com> Co-authored-by: jguer <joao.guerreiro@grafana.com> Co-authored-by: nmarrs <nathanielmarrs@gmail.com> Co-authored-by: Drew Slobodnjak <60050885+drew08t@users.noreply.github.com>	2023-04-06 10:10:54 +02:00
Grot (@grafanabot)	ec109a913b	[v9.5.x] Table: Fix migrations from old angular table for cell color modes (#66085 ) Table: Fix migrations from old angular table for cell color modes (#65760) * Table: Fix migrations from old angular table * Update defaults (cherry picked from commit `3843c73162`) Co-authored-by: Torkel Ödegaard <torkel@grafana.com>	2023-04-06 10:30:45 +03:00
Grot (@grafanabot)	7104dc3fef	[v9.5.x] PieChart: Show long labels properly (#66083 ) PieChart: Show long labels properly (#65699) Fix label hidden when overflowing (cherry picked from commit `91a61f1e0d`) Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>	2023-04-06 09:20:56 +02:00
Grot (@grafanabot)	a6a9e4e0ed	[v9.5.x] XYChart: Add all dataset columns in tooltip (#66065 ) XYChart: Add all dataset columns in tooltip (#65027) Co-authored-by: Leon Sorokin <leeoniya@gmail.com> (cherry picked from commit `df62bba354`) Co-authored-by: Victor Marin <36818606+mdvictor@users.noreply.github.com>	2023-04-05 15:55:53 -05:00
Grot (@grafanabot)	62e0b45067	[v9.5.x] PublicDashboards: fix collapsed rows queries (#66030 ) PublicDashboards: fix collapsed rows queries (#66014) (cherry picked from commit `232834f455`) Co-authored-by: Ezequiel Victorero <ezequiel.victorero@grafana.com>	2023-04-05 10:54:28 -03:00
Grot (@grafanabot)	0f0e2664cc	[v9.5.x] Fix: DataLinks from data sources override user defined data link (#66031 ) Co-authored-by: Dominik Prokop <dominik.prokop@grafana.com> Co-authored-by: Alexa V <239999+axelavargas@users.noreply.github.com> Fix: DataLinks from data sources override user defined data link (#65996)	2023-04-05 16:53:05 +03:00
Grot (@grafanabot)	1dc26665f3	[v9.5.x] PluginExtensions: Adding full targets to the panel menu context (#66020 ) PluginExtensions: Adding full targets to the panel menu context (#65861) * Making sure we add the whole query to the dashboard panel context. * Adding some more tests. * Synced with main. (cherry picked from commit `c8ecd0679b`) Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>	2023-04-05 15:14:44 +02:00
Grot (@grafanabot)	b68716e9eb	[v9.5.x] Docs: Updated Grafana OSS Introduction (#66025 ) Docs: Updated Grafana OSS Introduction (#66004) * Added Phlare and added static data sources to intro instead of it just being TSDB sources * Update docs/sources/introduction/_index.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> * Update docs/sources/introduction/_index.md Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> --------- Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> (cherry picked from commit `e8813916c9`) Co-authored-by: Alex Close <alex.kirtley-close@grafana.com>	2023-04-05 08:14:16 -05:00
Grot (@grafanabot)	638a277364	[v9.5.x] PluginExtensions: Fixed issue in typings for the onClick link callback (#65979 ) PluginExtensions: Fixed issue in typings for the onClick link callback (#65978) * Fixed bug with event being forced. * Made onClick undefinable in the config as well. * Fixed some more type issues. (cherry picked from commit `9719ee9bd3`) Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>	2023-04-05 09:05:51 +03:00
Grot (@grafanabot)	c7cc68649d	[v9.5.x] Alerting: Use a completely isolated context for state history writes (#65969 ) Alerting: Use a completely isolated context for state history writes (#64989) * Add fresh context with timeout and same log properties, re-derive logger * Unify timeout constants * Move ctx after shortcut that got added through rebasing * Unify timeouts * Port opentracing's SpanFromContext and ContextFromSpan to the grafana tracing package * Support both opentracing and otel variants * Better document why we're creating a new ctx * Add new func to FakeSpan which was added after rebase * Support grafana-specific traceID key in both tracer implementations (cherry picked from commit `fb520edd72`) Co-authored-by: Alexander Weaver <weaver.alex.d@gmail.com>	2023-04-04 17:12:30 -05:00
Grot (@grafanabot)	119fb76938	[v9.5.x] Docs: Added note to contact Support (#65959 ) Docs: Added note to contact Support (#65235) * Added note to contact Support * Update docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md * Update docs/sources/setup-grafana/configure-security/configure-authentication/enhanced-ldap/index.md * makes prettier * Apply suggestions from code review --------- Co-authored-by: Christopher Moyer <35463610+chri2547@users.noreply.github.com> Co-authored-by: Chris Moyer <chris.moyer@grafana.com> (cherry picked from commit `445734888b`) Co-authored-by: melGL <81323402+melgl@users.noreply.github.com>	2023-04-04 13:41:24 -05:00
Grot (@grafanabot)	fbb66e6b9f	[v9.5.x] Loki Query Splitting: Fix bug for mixed split durations (#65928 ) Loki Query Splitting: Fix bug for mixed split durations (#65925) * Query splitting: fix next request group pointer calculation * Update unit test (cherry picked from commit `44beef2e41`) Co-authored-by: Matias Chomicki <matyax@gmail.com>	2023-04-04 16:28:03 +02:00
Grot (@grafanabot)	ea8d17009f	[v9.5.x] PluginExtensions: Fixed issue with incorrect type being exposed when configuring an extension (#65914 ) PluginExtensions: Fixed issue with incorrect type being exposed when configuring an extension (#65910) Fixed issue with wrong type required in configureExtensionLink (cherry picked from commit `68796a9f31`) Co-authored-by: Marcus Andersson <marcus.andersson@grafana.com>	2023-04-04 15:40:19 +03:00
Grot (@grafanabot)	f34d0df862	Release: Bump version to 9.5.0 (#65888 ) "Release: Updated versions in package to 9.5.0"	2023-04-04 09:43:02 +02:00